1 |
commit: d55dce5c82eebff86058fda85075d6b16ec5b4fb |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 12 19:33:02 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 12 19:33:02 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/dev/johu.git/commit/?id=d55dce5c |
7 |
|
8 |
net-irc/quassel: Sync with gentoo main tree |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
net-irc/quassel/metadata.xml | 33 +++++---- |
13 |
net-irc/quassel/quassel-9999.ebuild | 134 +++++++++++++----------------------- |
14 |
2 files changed, 66 insertions(+), 101 deletions(-) |
15 |
|
16 |
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml |
17 |
index 66081eb..bb0defe 100644 |
18 |
--- a/net-irc/quassel/metadata.xml |
19 |
+++ b/net-irc/quassel/metadata.xml |
20 |
@@ -10,15 +10,25 @@ |
21 |
<name>Johannes Huber</name> |
22 |
</maintainer> |
23 |
<use> |
24 |
+ <flag name="breeze"> |
25 |
+ Support the Breeze and Breeze-Dark icon sets (default for Plasma 5). |
26 |
+ </flag> |
27 |
+ <flag name="crypt"> |
28 |
+ Support core->network per-channel and per-query blowfish |
29 |
+ encryption via <pkg>app-crypt/qca</pkg> SLOT 2. |
30 |
+ </flag> |
31 |
+ <flag name="dbus"> |
32 |
+ Support desktop notifications via the StatusNotifier D-Bus service |
33 |
+ (used by most modern desktop environments). |
34 |
+ </flag> |
35 |
<flag name="monolithic"> |
36 |
- Build Standalone client with integrated core, no external |
37 |
- quasselcore needed. Only useful if you don't want to use quassels |
38 |
+ Build standalone client with integrated core, no external |
39 |
+ quasselcore needed. Only useful if you don't want to use Quassel's |
40 |
client/server model. The server and X flags are not needed in this |
41 |
case but it is possible to enable them too. |
42 |
</flag> |
43 |
- <flag name="phonon"> |
44 |
- Build client with phonon backend support. This enables sound |
45 |
- playback in client. |
46 |
+ <flag name="oxygen"> |
47 |
+ Support the Oxygen icon set that was the default for KDE4. |
48 |
</flag> |
49 |
<flag name="server"> |
50 |
Build the server binary. If this USE flag is disabled, the |
51 |
@@ -27,21 +37,16 @@ |
52 |
disable it on the client. |
53 |
</flag> |
54 |
<flag name="snorenotify"> |
55 |
- Support for snore notification framework. |
56 |
+ Support for Snore notification framework. |
57 |
</flag> |
58 |
- <flag name="webkit"> |
59 |
- Use qt-webkit rendering engine for showing URL thumbnails and |
60 |
- for other things that need web browser integration. |
61 |
+ <flag name="urlpreview"> |
62 |
+ Use QtWebEngine rendering engine for showing URL thumbnails. |
63 |
</flag> |
64 |
<flag name="X"> |
65 |
- Build the Qt 4 GUI client for quassel. If this USE flag is |
66 |
+ Build the Qt5 GUI client for quassel. If this USE flag is |
67 |
disabled, the GUI is not built, and cannot be used. You might |
68 |
want to disable this on the server, but you need it enabled on |
69 |
the client. |
70 |
</flag> |
71 |
- <flag name="crypt"> |
72 |
- Support core->network per-channel and per-query blowfish |
73 |
- encryption via <pkg>app-crypt/qca</pkg> SLOT 2. |
74 |
- </flag> |
75 |
</use> |
76 |
</pkgmetadata> |
77 |
|
78 |
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild |
79 |
index bd6c558..3a862b1 100644 |
80 |
--- a/net-irc/quassel/quassel-9999.ebuild |
81 |
+++ b/net-irc/quassel/quassel-9999.ebuild |
82 |
@@ -4,7 +4,7 @@ |
83 |
|
84 |
EAPI=6 |
85 |
|
86 |
-inherit cmake-utils eutils pax-utils systemd user versionator |
87 |
+inherit cmake-utils eutils pax-utils systemd user |
88 |
|
89 |
EGIT_REPO_URI="git://git.quassel-irc.org/quassel" |
90 |
[[ "${PV}" == "9999" ]] && inherit git-r3 |
91 |
@@ -14,74 +14,46 @@ HOMEPAGE="http://quassel-irc.org/" |
92 |
[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2" |
93 |
|
94 |
LICENSE="GPL-3" |
95 |
-KEYWORDS="" |
96 |
SLOT="0" |
97 |
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server |
98 |
-snorenotify +ssl syslog webkit X" |
99 |
+KEYWORDS="" |
100 |
+IUSE="+breeze crypt +dbus debug kde monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X" |
101 |
|
102 |
SERVER_RDEPEND=" |
103 |
- qt5? ( |
104 |
- dev-qt/qtscript:5 |
105 |
- crypt? ( app-crypt/qca:2[openssl,qt5] ) |
106 |
- postgres? ( dev-qt/qtsql:5[postgres] ) |
107 |
- !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) |
108 |
- ) |
109 |
- !qt5? ( |
110 |
- dev-qt/qtscript:4 |
111 |
- crypt? ( app-crypt/qca:2[openssl,qt4(+)] ) |
112 |
- postgres? ( dev-qt/qtsql:4[postgres] ) |
113 |
- !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) |
114 |
- ) |
115 |
+ dev-qt/qtscript:5 |
116 |
+ crypt? ( app-crypt/qca:2[openssl,qt5] ) |
117 |
+ postgres? ( dev-qt/qtsql:5[postgres] ) |
118 |
+ !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) |
119 |
syslog? ( virtual/logger ) |
120 |
" |
121 |
|
122 |
GUI_RDEPEND=" |
123 |
- qt5? ( |
124 |
- dev-qt/qtgui:5 |
125 |
- dev-qt/qtwidgets:5 |
126 |
- dbus? ( |
127 |
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5] |
128 |
- dev-qt/qtdbus:5 |
129 |
- ) |
130 |
- kde? ( |
131 |
- kde-frameworks/kconfigwidgets:5 |
132 |
- kde-frameworks/kcoreaddons:5 |
133 |
- kde-frameworks/knotifications:5 |
134 |
- kde-frameworks/knotifyconfig:5 |
135 |
- kde-frameworks/ktextwidgets:5 |
136 |
- kde-frameworks/kwidgetsaddons:5 |
137 |
- kde-frameworks/kxmlgui:5 |
138 |
- kde-frameworks/sonnet:5 |
139 |
- ) |
140 |
- phonon? ( media-libs/phonon[qt5] ) |
141 |
- !phonon? ( dev-qt/qtmultimedia:5 ) |
142 |
- snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) |
143 |
- webkit? ( dev-qt/qtwebkit:5 ) |
144 |
+ dev-qt/qtgui:5 |
145 |
+ dev-qt/qtmultimedia:5 |
146 |
+ dev-qt/qtwidgets:5 |
147 |
+ breeze? ( kde-frameworks/breeze-icons:5 ) |
148 |
+ dbus? ( |
149 |
+ >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5] |
150 |
+ dev-qt/qtdbus:5 |
151 |
) |
152 |
- !qt5? ( |
153 |
- dev-qt/qtgui:4 |
154 |
- ayatana? ( dev-libs/libindicate-qt ) |
155 |
- dbus? ( |
156 |
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4(+)] |
157 |
- dev-qt/qtdbus:4 |
158 |
- kde? ( |
159 |
- kde-base/kdelibs:4 |
160 |
- kde-frameworks/oxygen-icons:* |
161 |
- ayatana? ( kde-misc/plasma-widget-message-indicator ) |
162 |
- ) |
163 |
- ) |
164 |
- phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) |
165 |
- webkit? ( dev-qt/qtwebkit:4 ) |
166 |
+ kde? ( |
167 |
+ kde-frameworks/kconfigwidgets:5 |
168 |
+ kde-frameworks/kcoreaddons:5 |
169 |
+ kde-frameworks/knotifications:5 |
170 |
+ kde-frameworks/knotifyconfig:5 |
171 |
+ kde-frameworks/ktextwidgets:5 |
172 |
+ kde-frameworks/kwidgetsaddons:5 |
173 |
+ kde-frameworks/kxmlgui:5 |
174 |
+ kde-frameworks/sonnet:5 |
175 |
) |
176 |
+ oxygen? ( kde-frameworks/oxygen-icons:5 ) |
177 |
+ snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) |
178 |
+ urlpreview? ( dev-qt/qtwebengine:5[widgets] ) |
179 |
" |
180 |
|
181 |
RDEPEND=" |
182 |
sys-libs/zlib |
183 |
- qt5? ( |
184 |
- dev-qt/qtcore:5 |
185 |
- dev-qt/qtnetwork:5[ssl?] |
186 |
- ) |
187 |
- !qt5? ( dev-qt/qtcore:4[ssl?] ) |
188 |
+ dev-qt/qtcore:5 |
189 |
+ dev-qt/qtnetwork:5[ssl?] |
190 |
monolithic? ( |
191 |
${SERVER_RDEPEND} |
192 |
${GUI_RDEPEND} |
193 |
@@ -92,26 +64,21 @@ RDEPEND=" |
194 |
) |
195 |
" |
196 |
DEPEND="${RDEPEND} |
197 |
- qt5? ( |
198 |
- dev-qt/linguist-tools:5 |
199 |
- kde-frameworks/extra-cmake-modules |
200 |
- ) |
201 |
+ dev-qt/linguist-tools:5 |
202 |
+ kde-frameworks/extra-cmake-modules |
203 |
" |
204 |
|
205 |
-DOCS=( AUTHORS ChangeLog README ) |
206 |
+DOCS=( AUTHORS ChangeLog README.md ) |
207 |
|
208 |
REQUIRED_USE=" |
209 |
|| ( X server monolithic ) |
210 |
- ayatana? ( || ( X monolithic ) ) |
211 |
crypt? ( || ( server monolithic ) ) |
212 |
- dbus? ( || ( X monolithic ) ) |
213 |
kde? ( || ( X monolithic ) ) |
214 |
- phonon? ( || ( X monolithic ) ) |
215 |
+ monolithic? ( || ( breeze oxygen ) ) |
216 |
postgres? ( || ( server monolithic ) ) |
217 |
- qt5? ( !ayatana ) |
218 |
- snorenotify? ( qt5 || ( X monolithic ) ) |
219 |
+ snorenotify? ( || ( X monolithic ) ) |
220 |
syslog? ( || ( server monolithic ) ) |
221 |
- webkit? ( || ( X monolithic ) ) |
222 |
+ X? ( || ( breeze oxygen ) ) |
223 |
" |
224 |
|
225 |
pkg_setup() { |
226 |
@@ -126,31 +93,24 @@ pkg_setup() { |
227 |
|
228 |
src_configure() { |
229 |
local mycmakeargs=( |
230 |
- $(cmake-utils_use_find_package ayatana IndicateQt) |
231 |
- $(cmake-utils_use_find_package crypt QCA2) |
232 |
- $(cmake-utils_use_find_package crypt QCA2-QT5) |
233 |
- $(cmake-utils_use_find_package dbus dbusmenu-qt) |
234 |
- $(cmake-utils_use_find_package dbus dbusmenu-qt5) |
235 |
- -DWITH_KDE=$(usex kde) |
236 |
- -DWITH_OXYGEN=$(usex !kde) |
237 |
- -DWANT_MONO=$(usex monolithic) |
238 |
- $(cmake-utils_use_find_package phonon Phonon) |
239 |
- $(cmake-utils_use_find_package phonon Phonon4Qt5) |
240 |
- $(cmake-utils_use_find_package !phonon Qt5Multimedia) |
241 |
- -DUSE_QT5=$(usex qt5) |
242 |
+ -DUSE_QT4=OFF |
243 |
+ -DUSE_QT5=ON |
244 |
-DWANT_CORE=$(usex server) |
245 |
- $(cmake-utils_use_find_package snorenotify LibsnoreQt5) |
246 |
- -DWITH_WEBKIT=$(usex webkit) |
247 |
+ -DWANT_MONO=$(usex monolithic) |
248 |
-DWANT_QTCLIENT=$(usex X) |
249 |
+ -DWITH_KDE=$(usex kde) |
250 |
+ -DWITH_WEBKIT=OFF |
251 |
+ -DWITH_WEBENGINE=$(usex urlpreview) |
252 |
+ -DWITH_BREEZE=OFF |
253 |
+ -DWITH_BREEZE_DARK=OFF |
254 |
+ -DWITH_OXYGEN=OFF |
255 |
-DEMBED_DATA=OFF |
256 |
-DCMAKE_SKIP_RPATH=ON |
257 |
+ $(cmake-utils_use_find_package crypt QCA2-QT5) |
258 |
+ $(cmake-utils_use_find_package dbus dbusmenu-qt5) |
259 |
+ $(cmake-utils_use_find_package snorenotify LibsnoreQt5) |
260 |
) |
261 |
|
262 |
- # Something broke upstream detection since Qt 5.5 |
263 |
- if use ssl ; then |
264 |
- mycmakeargs+=("-DHAVE_SSL=TRUE") |
265 |
- fi |
266 |
- |
267 |
cmake-utils_src_configure |
268 |
} |
269 |
|
270 |
@@ -179,7 +139,7 @@ src_install() { |
271 |
pkg_postinst() { |
272 |
if use monolithic && use ssl ; then |
273 |
elog "Information on how to enable SSL support for client/core connections" |
274 |
- elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc." |
275 |
+ elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support." |
276 |
fi |
277 |
|
278 |
if use server; then |