1 |
commit: 518d94844deed8e77f6365724d73a3f76f7256ad |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 28 17:24:43 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 29 20:45:41 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518d9484 |
7 |
|
8 |
x11-wm/lumina: EAPI-7 bump, sort deps |
9 |
|
10 |
9999 ebuild looks to be out of sync, but is not for me to fix. |
11 |
|
12 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
x11-wm/lumina/lumina-1.6.0.ebuild | 44 +++++++++++++++++++++------------------ |
16 |
x11-wm/lumina/lumina-9999.ebuild | 40 +++++++++++++++++++---------------- |
17 |
2 files changed, 46 insertions(+), 38 deletions(-) |
18 |
|
19 |
diff --git a/x11-wm/lumina/lumina-1.6.0.ebuild b/x11-wm/lumina/lumina-1.6.0.ebuild |
20 |
index a55056735a3..1c86507bdd9 100644 |
21 |
--- a/x11-wm/lumina/lumina-1.6.0.ebuild |
22 |
+++ b/x11-wm/lumina/lumina-1.6.0.ebuild |
23 |
@@ -1,10 +1,11 @@ |
24 |
# Copyright 1999-2020 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
-EAPI=6 |
28 |
-PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu" |
29 |
+EAPI=7 |
30 |
|
31 |
+PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu" |
32 |
inherit qmake-utils l10n xdg-utils |
33 |
+ |
34 |
DESCRIPTION="Lumina desktop environment" |
35 |
HOMEPAGE="https://lumina-desktop.org/" |
36 |
SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" |
37 |
@@ -14,35 +15,38 @@ SLOT="0" |
38 |
KEYWORDS="amd64 x86" |
39 |
IUSE="desktop-utils" |
40 |
|
41 |
-COMMON_DEPEND="dev-qt/qtcore:5 |
42 |
+DEPEND=" |
43 |
dev-qt/qtconcurrent:5 |
44 |
+ dev-qt/qtcore:5 |
45 |
+ dev-qt/qtdbus:5 |
46 |
+ dev-qt/qtdeclarative:5 |
47 |
+ dev-qt/qtgui:5 |
48 |
dev-qt/qtmultimedia:5[widgets] |
49 |
- dev-qt/qtsvg:5 |
50 |
dev-qt/qtnetwork:5[ssl] |
51 |
+ dev-qt/qtprintsupport:5 |
52 |
+ dev-qt/qtsvg:5 |
53 |
dev-qt/qtwidgets:5 |
54 |
dev-qt/qtx11extras:5 |
55 |
- dev-qt/qtgui:5 |
56 |
- dev-qt/qtdeclarative:5 |
57 |
- dev-qt/qtprintsupport:5 |
58 |
- dev-qt/qtdbus:5 |
59 |
x11-libs/libxcb:0 |
60 |
x11-libs/xcb-util |
61 |
x11-libs/xcb-util-image |
62 |
x11-libs/xcb-util-wm |
63 |
desktop-utils? ( app-text/poppler[qt5] )" |
64 |
|
65 |
-DEPEND="$COMMON_DEPEND |
66 |
- dev-qt/linguist-tools:5" |
67 |
- |
68 |
-RDEPEND="$COMMON_DEPEND |
69 |
- sys-fs/inotify-tools |
70 |
- x11-misc/numlockx |
71 |
- x11-wm/fluxbox |
72 |
- || ( x11-apps/xbacklight |
73 |
- sys-power/acpilight ) |
74 |
+RDEPEND="${DEPEND} |
75 |
+ app-admin/sysstat |
76 |
media-sound/alsa-utils |
77 |
+ sys-fs/inotify-tools |
78 |
sys-power/acpi |
79 |
- app-admin/sysstat" |
80 |
+ || ( |
81 |
+ x11-apps/xbacklight |
82 |
+ sys-power/acpilight |
83 |
+ ) |
84 |
+ x11-misc/numlockx |
85 |
+ x11-wm/fluxbox" |
86 |
+ |
87 |
+BDEPEND=" |
88 |
+ dev-qt/linguist-tools:5" |
89 |
|
90 |
S="${WORKDIR}/${P/_/-}" |
91 |
|
92 |
@@ -55,7 +59,7 @@ DOCS=( README.md ) |
93 |
src_prepare() { |
94 |
default |
95 |
|
96 |
- if use !desktop-utils ; then |
97 |
+ if ! use desktop-utils ; then |
98 |
rm -rf src-qt5/desktop-utils || die |
99 |
sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die |
100 |
fi |
101 |
@@ -77,7 +81,7 @@ src_install() { |
102 |
newexe "${FILESDIR}/lumina-session" lumina ||die |
103 |
|
104 |
remove_locale() { |
105 |
- rm -f "${ED%/}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm |
106 |
+ rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm |
107 |
|
108 |
} |
109 |
l10n_for_each_disabled_locale_do remove_locale |
110 |
|
111 |
diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild |
112 |
index 6881413499c..8e1fb965a9a 100644 |
113 |
--- a/x11-wm/lumina/lumina-9999.ebuild |
114 |
+++ b/x11-wm/lumina/lumina-9999.ebuild |
115 |
@@ -1,9 +1,10 @@ |
116 |
# Copyright 1999-2020 Gentoo Authors |
117 |
# Distributed under the terms of the GNU General Public License v2 |
118 |
|
119 |
-EAPI=6 |
120 |
+EAPI=7 |
121 |
|
122 |
inherit git-r3 qmake-utils |
123 |
+ |
124 |
DESCRIPTION="Lumina desktop environment" |
125 |
HOMEPAGE="https://lumina-desktop.org/" |
126 |
EGIT_REPO_URI="https://github.com/trueos/lumina" |
127 |
@@ -13,32 +14,35 @@ SLOT="0" |
128 |
KEYWORDS="" |
129 |
IUSE="desktop-utils" |
130 |
|
131 |
-COMMON_DEPEND="dev-qt/qtcore:5 |
132 |
+DEPEND=" |
133 |
dev-qt/qtconcurrent:5 |
134 |
+ dev-qt/qtcore:5 |
135 |
+ dev-qt/qtdeclarative:5 |
136 |
+ dev-qt/qtgui:5 |
137 |
dev-qt/qtmultimedia:5[widgets] |
138 |
- dev-qt/qtsvg:5 |
139 |
dev-qt/qtnetwork:5 |
140 |
+ dev-qt/qtsvg:5 |
141 |
dev-qt/qtwidgets:5 |
142 |
dev-qt/qtx11extras:5 |
143 |
- dev-qt/qtgui:5 |
144 |
- dev-qt/qtdeclarative:5 |
145 |
x11-libs/libxcb:0 |
146 |
x11-libs/xcb-util |
147 |
x11-libs/xcb-util-image |
148 |
x11-libs/xcb-util-wm" |
149 |
|
150 |
-DEPEND="$COMMON_DEPEND |
151 |
- dev-qt/linguist-tools:5" |
152 |
- |
153 |
-RDEPEND="$COMMON_DEPEND |
154 |
- sys-fs/inotify-tools |
155 |
- x11-misc/numlockx |
156 |
- x11-wm/fluxbox |
157 |
- || ( x11-apps/xbacklight |
158 |
- sys-power/acpilight ) |
159 |
+RDEPEND="${DEPEND} |
160 |
+ app-admin/sysstat |
161 |
media-sound/alsa-utils |
162 |
+ sys-fs/inotify-tools |
163 |
sys-power/acpi |
164 |
- app-admin/sysstat" |
165 |
+ || ( |
166 |
+ x11-apps/xbacklight |
167 |
+ sys-power/acpilight |
168 |
+ ) |
169 |
+ x11-misc/numlockx |
170 |
+ x11-wm/fluxbox" |
171 |
+ |
172 |
+BDEPEND=" |
173 |
+ dev-qt/linguist-tools:5" |
174 |
|
175 |
S="${WORKDIR}/${P/_/-}" |
176 |
|
177 |
@@ -49,7 +53,7 @@ PATCHES=( |
178 |
src_prepare() { |
179 |
default |
180 |
|
181 |
- if use !desktop-utils ; then |
182 |
+ if ! use desktop-utils ; then |
183 |
rm -rf src-qt5/desktop-utils || die |
184 |
sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die |
185 |
fi |
186 |
@@ -62,6 +66,6 @@ src_configure() { |
187 |
|
188 |
src_install() { |
189 |
default |
190 |
- mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die |
191 |
- rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die |
192 |
+ mv "${ED}"/etc/luminaDesktop.conf{.dist,} || die |
193 |
+ rm "${ED}"/${PN}-* "${ED}"/start-${PN}-desktop || die |
194 |
} |