1 |
commit: e32db49b7a035c6794acab427c762a83a1ceaec9 |
2 |
Author: Sergey Ilinykh <rion4ik <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jul 31 19:29:40 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 31 21:19:06 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32db49b |
7 |
|
8 |
net-im/psi: 1.2 version bump, switch to Qt5 |
9 |
|
10 |
Gentoo-bug: 511462, 532170, 564446, 620772, 626216 |
11 |
|
12 |
Closes: https://github.com/gentoo/gentoo/pull/5219 |
13 |
|
14 |
net-im/psi/Manifest | 2 + |
15 |
net-im/psi/metadata.xml | 27 ++++-- |
16 |
net-im/psi/psi-1.2.ebuild | 107 ++++++++++++++++++++++ |
17 |
net-im/psi/psi-9999.ebuild | 222 ++++++++++++++++++++------------------------- |
18 |
4 files changed, 224 insertions(+), 134 deletions(-) |
19 |
|
20 |
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest |
21 |
index edd5f48f055..0657c8710cb 100644 |
22 |
--- a/net-im/psi/Manifest |
23 |
+++ b/net-im/psi/Manifest |
24 |
@@ -12,3 +12,5 @@ DIST psi-0.15_sl.qm 248478 SHA256 5be33716a12b297d609ec7493f9da21a23b3ab89303dc6 |
25 |
DIST psi-0.15_sv.qm 246214 SHA256 fc5822011ada2b7452c9d15baf74c90e1a58e05536e9a7cc1d81e163f44d3ca2 SHA512 b8dd5e7692512af5ec302b5fee562feb68292988160d1c9e4fac951562bd8b30bc1f67f4d39bbd437eee84b14f6aefd83a8666f0e77d02b539d65e89aee7c1aa WHIRLPOOL 6078437c20881babb731d8915952b40d415e5cc01ab7431be1930fbe887289988abc7ef9a76e09254ad8519146bd94633eba69872bee7cdb504dfc3237f1c1d0 |
26 |
DIST psi-0.15_ur_PK.qm 244903 SHA256 0101370007c9ce735c50dd9bf6dfd8680c5cd562a3213b960ee507367582b3e6 SHA512 df0786f1b625ecc3144bb9be0ce51558ae45901213405997b5f8ea3c791c64328b049a48a1b88372f7b0cb5bde3b795b306ad16847d91933eedc233f8dea8bc2 WHIRLPOOL 3dc2f807d5e1dce36609854e9360d9521a7fe36d61161a2c0cf195bf58e21a4efa9b8d977a6503f41588d8befb06ca678e6e629168c93f0ab90f0ec42ffe98a5 |
27 |
DIST psi-0.15_zh_TW.qm 171993 SHA256 a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa96ceae84a6cfbeed4187a SHA512 69b20e18f346af244f7cfd2bc447fcb934786f7ff3d85a16ac471e275c78fb36cfb2008368d81413dbfc6ed5bd4edba3c1ab8185dae72b8aeb9bfa29fde9c871 WHIRLPOOL 2dd1e8e724007248128d69ec9389014d482d38b64df3dbcb1a17c90b94d193d793b17769d78cd36fd15d8409f1eac44eca4a2d7739d885316754df5b557a7344 |
28 |
+DIST psi-1.2.tar.xz 2138940 SHA256 16ce1b767d40453032cd5d9ad5a9d4c6dba43989acc9a09538da3f74b7c614f5 SHA512 a486f6ee910cc17157849a68aa724608ddbeed319511646f6973a0789da192ec0fed7899024ad169c5b0e604372025dad7a58bacd223723d35ea490ec7f00b20 WHIRLPOOL 2a0f37067a085b3ce93864905367fa56584666bee6697bdae8f4eedd74cdf15f7be9eee85ba23440cb39a11e384e5ce7218a408042203fe70b398058a69b7867 |
29 |
+DIST psi-l10n-1.2.tar.gz 2992381 SHA256 8a16c2d67c0aafbaa296fe06cd6b7de5f32683487b10245b10e8baae63b8f789 SHA512 946b86d12e76fe9a44f1adc154140a02f3d575e57b5f67c8d95472241c6d4510d1b4be81d8914d5670b15ea8ad1b836aa63fc62c3de94e0091b39e2fb234a130 WHIRLPOOL 6cd52e0dcd76f7df3137055de9d9e4518b1adfb8d6f03e9af59e0a49b01933c400d15671b252ea529543eab8f14aae34be8432c43bb28d9233f57833c0517718 |
30 |
|
31 |
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml |
32 |
index ca58cd3e904..952c3d3370d 100644 |
33 |
--- a/net-im/psi/metadata.xml |
34 |
+++ b/net-im/psi/metadata.xml |
35 |
@@ -1,16 +1,25 @@ |
36 |
<?xml version='1.0' encoding='UTF-8'?> |
37 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
38 |
<pkgmetadata> |
39 |
- <!-- maintainer-needed --> |
40 |
- <longdescription>Psi is a very good jabber client that uses QT</longdescription> |
41 |
+ <maintainer type="person"> |
42 |
+ <email>rion4ik@×××××.com</email> |
43 |
+ <name>Sergey Ilinykh</name> |
44 |
+ </maintainer> |
45 |
+ <maintainer type="project"> |
46 |
+ <email>proxy-maint@g.o</email> |
47 |
+ <name>Proxy Maintainers</name> |
48 |
+ </maintainer> |
49 |
+ <longdescription>Psi is a very good XMPP client that uses QT</longdescription> |
50 |
<use> |
51 |
- <flag name="enchant">Use enchant spell engine instead of aspell</flag> |
52 |
- <flag name="extras">Enables extra non official patches</flag> |
53 |
- <flag name="iconsets">Install additional iconsets, some of them has not clear licensing</flag> |
54 |
- <flag name="plugins">Enable plugins support</flag> |
55 |
- <flag name="powersave">Disable some non critical timers for much less CPU usage</flag> |
56 |
- <flag name="whiteboarding">Enable experimental interactive SVG drawing</flag> |
57 |
- <flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag> |
58 |
+ <flag name='aspell'>Enable spellchecking using <pkg>app-text/aspell</pkg></flag> |
59 |
+ <flag name='enchant'>Enable spellchecking using <pkg>app-text/enchant</pkg></flag> |
60 |
+ <flag name='extras'>Enable Psi+ patcheset</flag> |
61 |
+ <flag name='hunspell'>Enable spellchecking using <pkg>app-text/hunspell</pkg></flag> |
62 |
+ <flag name='iconsets'>Install additional iconsets, some of them has not clear licensing</flag> |
63 |
+ <flag name='sql'>Enable psi-new-history extras patch</flag> |
64 |
+ <flag name='webengine'>Use <pkg>dev-qt/qtwebengine</pkg> instead of <pkg>dev-qt/qtwebkit</pkg></flag> |
65 |
+ <flag name='webkit'>Enable themed, html-based chatlogs</flag> |
66 |
+ <flag name='whiteboarding'>Enable experimental interactive SVG drawing</flag> |
67 |
</use> |
68 |
<upstream> |
69 |
<remote-id type="github">psi-im/psi</remote-id> |
70 |
|
71 |
diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild |
72 |
new file mode 100644 |
73 |
index 00000000000..b575139d37f |
74 |
--- /dev/null |
75 |
+++ b/net-im/psi/psi-1.2.ebuild |
76 |
@@ -0,0 +1,107 @@ |
77 |
+# Copyright 1999-2017 Gentoo Foundation |
78 |
+# Distributed under the terms of the GNU General Public License v2 |
79 |
+ |
80 |
+EAPI=6 |
81 |
+ |
82 |
+PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW" |
83 |
+PLOCALE_BACKUP="en" |
84 |
+ |
85 |
+inherit l10n qmake-utils |
86 |
+ |
87 |
+DESCRIPTION="Qt XMPP client" |
88 |
+HOMEPAGE="http://psi-im.org/" |
89 |
+ |
90 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz |
91 |
+ https://github.com/psi-im/psi-l10n/archive/1.2.tar.gz -> psi-l10n-${PV}.tar.gz" |
92 |
+LICENSE="GPL-2" |
93 |
+SLOT="0" |
94 |
+KEYWORDS="~amd64 ~x86" |
95 |
+IUSE="aspell crypt dbus debug doc enchant +hunspell ssl xscreensaver |
96 |
+whiteboarding webengine webkit" |
97 |
+ |
98 |
+# qconf generates not quite compatible configure scripts |
99 |
+QA_CONFIGURE_OPTIONS=".*" |
100 |
+ |
101 |
+REQUIRED_USE=" |
102 |
+ ?? ( aspell enchant hunspell ) |
103 |
+ webengine? ( !webkit ) |
104 |
+" |
105 |
+ |
106 |
+RDEPEND=" |
107 |
+ app-crypt/qca:2[qt5] |
108 |
+ dev-qt/qtgui:5 |
109 |
+ dev-qt/qtxml:5 |
110 |
+ dev-qt/qtconcurrent:5 |
111 |
+ dev-qt/qtmultimedia:5 |
112 |
+ dev-qt/qtx11extras:5 |
113 |
+ net-dns/libidn |
114 |
+ sys-libs/zlib[minizip] |
115 |
+ aspell? ( app-text/aspell ) |
116 |
+ dbus? ( dev-qt/qtdbus:5 ) |
117 |
+ enchant? ( >=app-text/enchant-1.3.0 ) |
118 |
+ hunspell? ( app-text/hunspell:= ) |
119 |
+ webengine? ( >=dev-qt/qtwebengine-5.7:5[widgets] ) |
120 |
+ webkit? ( dev-qt/qtwebkit:5 ) |
121 |
+ whiteboarding? ( dev-qt/qtsvg:5 ) |
122 |
+ xscreensaver? ( x11-libs/libXScrnSaver ) |
123 |
+" |
124 |
+DEPEND="${RDEPEND} |
125 |
+ dev-qt/linguist-tools |
126 |
+ virtual/pkgconfig |
127 |
+ doc? ( app-doc/doxygen ) |
128 |
+" |
129 |
+PDEPEND=" |
130 |
+ crypt? ( app-crypt/qca[gpg] ) |
131 |
+ ssl? ( app-crypt/qca:2[ssl] ) |
132 |
+" |
133 |
+RESTRICT="test" |
134 |
+ |
135 |
+src_configure() { |
136 |
+ CONF=( |
137 |
+ --no-separate-debug-info |
138 |
+ --qtdir="$(qt5_get_bindir)/.." |
139 |
+ $(use_enable aspell) |
140 |
+ $(use_enable dbus qdbus) |
141 |
+ $(use_enable enchant) |
142 |
+ $(use_enable hunspell) |
143 |
+ $(use_enable xscreensaver xss) |
144 |
+ $(use_enable whiteboarding) |
145 |
+ ) |
146 |
+ |
147 |
+ use debug && CONF+=("--debug") |
148 |
+ use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine") |
149 |
+ use webkit && CONF+=("--enable-webkit" "--with-webkit=qwebkit") |
150 |
+ |
151 |
+ econf "${CONF[@]}" |
152 |
+ |
153 |
+ eqmake5 psi.pro |
154 |
+} |
155 |
+ |
156 |
+src_compile() { |
157 |
+ emake |
158 |
+ use doc && emake -C doc api_public |
159 |
+} |
160 |
+ |
161 |
+src_install() { |
162 |
+ emake INSTALL_ROOT="${D}" install |
163 |
+ |
164 |
+ # this way the docs will be installed in the standard gentoo dir |
165 |
+ rm "${ED}"/usr/share/psi/{COPYING,README} || die "Installed file set seems to be changed by upstream" |
166 |
+ newdoc iconsets/roster/README README.roster |
167 |
+ newdoc iconsets/system/README README.system |
168 |
+ newdoc certs/README README.certs |
169 |
+ dodoc README |
170 |
+ |
171 |
+ local HTML_DOCS=( doc/api ) |
172 |
+ einstalldocs |
173 |
+ |
174 |
+ # install translations |
175 |
+ local mylrelease="$(qt5_get_bindir)"/lrelease |
176 |
+ cd "${WORKDIR}/psi-l10n-${PV}" || die |
177 |
+ insinto /usr/share/psi |
178 |
+ install_locale() { |
179 |
+ "${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease ${1} failed" |
180 |
+ doins "translations/${PN}_${1}.qm" |
181 |
+ } |
182 |
+ l10n_for_each_locale_do install_locale |
183 |
+} |
184 |
|
185 |
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild |
186 |
index 11222802e66..d08ddf5a62c 100644 |
187 |
--- a/net-im/psi/psi-9999.ebuild |
188 |
+++ b/net-im/psi/psi-9999.ebuild |
189 |
@@ -1,81 +1,81 @@ |
190 |
# Copyright 1999-2017 Gentoo Foundation |
191 |
# Distributed under the terms of the GNU General Public License v2 |
192 |
|
193 |
-EAPI="4" |
194 |
+EAPI=6 |
195 |
|
196 |
-LANGS="be bg ca cs de en eo es et fi fr hu it ja mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW" |
197 |
+PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW" |
198 |
+PLOCALE_BACKUP="en" |
199 |
|
200 |
-EGIT_REPO_URI="https://github.com/psi-im/${PN}.git" |
201 |
-EGIT_HAS_SUBMODULES=1 |
202 |
-LANGS_REPO_URI="https://github.com/psi-plus/psi-plus-l10n.git" |
203 |
+inherit l10n git-r3 qmake-utils |
204 |
|
205 |
-PSI_PLUS_URI="https://github.com/psi-plus/main.git" |
206 |
-PSI_PLUS_RESOURCES_URI="https://github.com/psi-plus/resources.git" |
207 |
- |
208 |
-inherit eutils gnome2-utils qt4-r2 multilib git-2 subversion |
209 |
- |
210 |
-DESCRIPTION="Qt4 Jabber client, with Licq-like interface" |
211 |
+DESCRIPTION="Qt XMPP client" |
212 |
HOMEPAGE="http://psi-im.org/" |
213 |
+ |
214 |
+PSI_URI="https://github.com/psi-im" |
215 |
+PSI_PLUS_URI="https://github.com/psi-plus" |
216 |
+EGIT_REPO_URI="${PSI_URI}/${PN}.git" |
217 |
+PSI_LANGS_URI="${PSI_URI}/psi-l10n.git" |
218 |
+PSI_PLUS_LANGS_URI="${PSI_PLUS_URI}/psi-plus-l10n.git" |
219 |
+EGIT_MIN_CLONE_TYPE="single" |
220 |
LICENSE="GPL-2" |
221 |
SLOT="0" |
222 |
KEYWORDS="" |
223 |
-IUSE="crypt dbus debug doc enchant extras jingle iconsets spell ssl xscreensaver powersave |
224 |
-plugins whiteboarding" |
225 |
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql ssl xscreensaver |
226 |
+whiteboarding webengine webkit" |
227 |
+ |
228 |
+# qconf generates not quite compatible configure scripts |
229 |
+QA_CONFIGURE_OPTIONS=".*" |
230 |
|
231 |
REQUIRED_USE=" |
232 |
+ ?? ( aspell enchant hunspell ) |
233 |
iconsets? ( extras ) |
234 |
- plugins? ( extras ) |
235 |
- powersave? ( extras ) |
236 |
+ sql? ( extras ) |
237 |
+ webengine? ( !webkit ) |
238 |
" |
239 |
|
240 |
RDEPEND=" |
241 |
- app-arch/unzip |
242 |
- >=app-crypt/qca-2.0.2:2[qt4(+)] |
243 |
- dev-qt/qtcore:4 |
244 |
- dev-qt/qtgui:4 |
245 |
- >=sys-libs/zlib-1.2.5.1-r2[minizip] |
246 |
- x11-libs/libX11 |
247 |
- dbus? ( dev-qt/qtdbus:4 ) |
248 |
- spell? ( |
249 |
- enchant? ( >=app-text/enchant-1.3.0 ) |
250 |
- !enchant? ( app-text/aspell ) |
251 |
+ app-crypt/qca:2[qt5] |
252 |
+ dev-qt/qtgui:5 |
253 |
+ dev-qt/qtxml:5 |
254 |
+ dev-qt/qtconcurrent:5 |
255 |
+ dev-qt/qtmultimedia:5 |
256 |
+ dev-qt/qtx11extras:5 |
257 |
+ net-dns/libidn |
258 |
+ sys-libs/zlib[minizip] |
259 |
+ aspell? ( app-text/aspell ) |
260 |
+ dbus? ( dev-qt/qtdbus:5 ) |
261 |
+ enchant? ( >=app-text/enchant-1.3.0 ) |
262 |
+ extras? ( |
263 |
+ sql? ( dev-qt/qtsql:5 ) |
264 |
) |
265 |
- whiteboarding? ( dev-qt/qtsvg:4 ) |
266 |
+ hunspell? ( app-text/hunspell:= ) |
267 |
+ webengine? ( >=dev-qt/qtwebengine-5.7:5[widgets] ) |
268 |
+ webkit? ( dev-qt/qtwebkit:5 ) |
269 |
+ whiteboarding? ( dev-qt/qtsvg:5 ) |
270 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
271 |
" |
272 |
DEPEND="${RDEPEND} |
273 |
+ dev-qt/linguist-tools |
274 |
+ virtual/pkgconfig |
275 |
+ doc? ( app-doc/doxygen ) |
276 |
extras? ( |
277 |
- ${SUBVERSION_DEPEND} |
278 |
- sys-devel/qconf[qt4(+)] |
279 |
+ >=sys-devel/qconf-2.3 |
280 |
) |
281 |
- doc? ( app-doc/doxygen ) |
282 |
- virtual/pkgconfig |
283 |
" |
284 |
PDEPEND=" |
285 |
- crypt? ( app-crypt/qca:2[gpg] ) |
286 |
- jingle? ( |
287 |
- net-im/psimedia |
288 |
- app-crypt/qca:2[ssl] |
289 |
- ) |
290 |
+ crypt? ( app-crypt/qca[gpg] ) |
291 |
ssl? ( app-crypt/qca:2[ssl] ) |
292 |
" |
293 |
-RESTRICT="test" |
294 |
+RESTRICT="test iconsets? ( bindist )" |
295 |
|
296 |
pkg_setup() { |
297 |
MY_PN=psi |
298 |
if use extras; then |
299 |
MY_PN=psi-plus |
300 |
echo |
301 |
- ewarn "You're about to build heavily patched version of Psi called Psi+." |
302 |
- ewarn "It has really nice features but still is under heavy development." |
303 |
- ewarn "Take a look at homepage for more info: https://code.google.com/p/psi-dev" |
304 |
- ewarn "If you wish to disable some patches just put" |
305 |
- ewarn "MY_EPATCH_EXCLUDE=\"list of patches\"" |
306 |
- ewarn "into /etc/portage/env/${CATEGORY}/${PN} file." |
307 |
- echo |
308 |
- ewarn "Note: some patches depend on other. So if you disabled some patch" |
309 |
- ewarn "and other started to fail to apply, you'll have to disable patches" |
310 |
- ewarn "that fail too." |
311 |
+ ewarn "You're about to build patched version of Psi called Psi+." |
312 |
+ ewarn "It has new nice features not yet included to Psi." |
313 |
+ ewarn "Take a look at homepage for more info: http://psi-plus.com/" |
314 |
echo |
315 |
|
316 |
if use iconsets; then |
317 |
@@ -88,124 +88,96 @@ pkg_setup() { |
318 |
} |
319 |
|
320 |
src_unpack() { |
321 |
- git-2_src_unpack |
322 |
- unset EGIT_HAS_SUBMODULES EGIT_NONBARE |
323 |
+ git-r3_src_unpack |
324 |
|
325 |
# fetch translations |
326 |
- mkdir "${WORKDIR}/psi-l10n" |
327 |
- unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT |
328 |
- EGIT_REPO_URI="${LANGS_REPO_URI}" \ |
329 |
- EGIT_SOURCEDIR="${WORKDIR}/psi-l10n" git-2_src_unpack |
330 |
+ unset EGIT_BRANCH EGIT_COMMIT |
331 |
+ EGIT_REPO_URI=$(usex extras "${PSI_PLUS_LANGS_URI}" "${PSI_LANGS_URI}") |
332 |
+ EGIT_CHECKOUT_DIR="${WORKDIR}/psi-l10n" |
333 |
+ git-r3_src_unpack |
334 |
|
335 |
if use extras; then |
336 |
- EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/main" \ |
337 |
- EGIT_SOURCEDIR="${WORKDIR}/psi-plus" \ |
338 |
- EGIT_REPO_URI="${PSI_PLUS_URI}" git-2_src_unpack |
339 |
+ unset EGIT_BRANCH EGIT_COMMIT |
340 |
+ EGIT_CHECKOUT_DIR="${WORKDIR}/psi-plus" \ |
341 |
+ EGIT_REPO_URI="${PSI_PLUS_URI}/main.git" \ |
342 |
+ git-r3_src_unpack |
343 |
+ |
344 |
if use iconsets; then |
345 |
- EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/resources" \ |
346 |
- EGIT_SOURCEDIR="${WORKDIR}/resources" \ |
347 |
- EGIT_REPO_URI="${PSI_PLUS_RESOURCES_URI}" git-2_src_unpack |
348 |
+ unset EGIT_BRANCH EGIT_COMMIT |
349 |
+ EGIT_CHECKOUT_DIR="${WORKDIR}/resources" \ |
350 |
+ EGIT_REPO_URI="${PSI_PLUS_URI}/resources.git" \ |
351 |
+ git-r3_src_unpack |
352 |
fi |
353 |
fi |
354 |
} |
355 |
|
356 |
src_prepare() { |
357 |
+ default |
358 |
if use extras; then |
359 |
cp -a "${WORKDIR}/psi-plus/iconsets" "${S}" || die "failed to copy iconsets" |
360 |
- use iconsets && { cp -a "${WORKDIR}/resources/iconsets" "${S}" || \ |
361 |
- die "failed to copy additional iconsets"; } |
362 |
- EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} " \ |
363 |
- EPATCH_SOURCE="${WORKDIR}/psi-plus/patches/" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch |
364 |
+ if use iconsets; then |
365 |
+ cp -a "${WORKDIR}/resources/iconsets" "${S}" || die "failed to copy additional iconsets" |
366 |
+ fi |
367 |
|
368 |
- use powersave && epatch "${WORKDIR}/psi-plus/patches/dev/psi-reduce-power-consumption.patch" |
369 |
+ eapply "${WORKDIR}/psi-plus/patches"/*.diff |
370 |
+ use sql && eapply "${PATCHES_DIR}/dev/psi-new-history.patch" |
371 |
|
372 |
- sed -e "s/.xxx/.$(cd "${WORKDIR}/psi-plus"; echo $((`git describe --tags | \ |
373 |
- cut -d - -f 2`+5000)))/" -i src/applicationinfo.cpp || die "sed failed" |
374 |
+ vergen="${WORKDIR}/psi-plus/admin/psi-plus-nightly-version" |
375 |
+ features="$(use webkit && echo '--webkit') $(use webengine && echo '--webengine') $(use sql && echo '--sql')" |
376 |
+ NIGHTLY_VER=$("${vergen}" ./ $features) |
377 |
+ elog "Prepared version: ${NIGHTLY_VER}" |
378 |
+ echo "${NIGHTLY_VER}" > version || die "Failed to write version file" |
379 |
|
380 |
qconf || die "Failed to create ./configure." |
381 |
fi |
382 |
} |
383 |
|
384 |
src_configure() { |
385 |
- # unable to use econf because of non-standard configure script |
386 |
- # disable growl as it is a MacOS X extension only |
387 |
- local myconf=" |
388 |
- --prefix="${EPREFIX}"/usr |
389 |
- --qtdir="${EPREFIX}"/usr |
390 |
- --disable-growl |
391 |
+ CONF=( |
392 |
--no-separate-debug-info |
393 |
- " |
394 |
- use dbus || myconf+=" --disable-qdbus" |
395 |
- use debug && myconf+=" --debug" |
396 |
- if use spell; then |
397 |
- use enchant && myconf+=" --disable-aspell" || myconf+=" --disable-enchant" |
398 |
- else |
399 |
- myconf+=" --disable-aspell --disable-enchant" |
400 |
- fi |
401 |
- use whiteboarding && myconf+=" --enable-whiteboarding" |
402 |
- use xscreensaver || myconf+=" --disable-xss" |
403 |
- if use extras; then |
404 |
- use plugins && myconf+=" --enable-plugins" |
405 |
- fi |
406 |
+ --qtdir="$(qt5_get_bindir)/.." |
407 |
+ $(use_enable aspell) |
408 |
+ $(use_enable dbus qdbus) |
409 |
+ $(use_enable enchant) |
410 |
+ $(use_enable hunspell) |
411 |
+ $(use_enable xscreensaver xss) |
412 |
+ $(use_enable whiteboarding) |
413 |
+ ) |
414 |
+ |
415 |
+ use debug && CONF+=("--debug") |
416 |
+ use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine") |
417 |
+ use webkit && CONF+=("--enable-webkit" "--with-webkit=qwebkit") |
418 |
|
419 |
- einfo "./configure ${myconf}" |
420 |
- ./configure ${myconf} || die |
421 |
+ econf "${CONF[@]}" |
422 |
|
423 |
- eqmake4 |
424 |
+ eqmake5 psi.pro |
425 |
} |
426 |
|
427 |
src_compile() { |
428 |
emake |
429 |
- |
430 |
- if use doc; then |
431 |
- cd doc |
432 |
- mkdir -p api # 259632 |
433 |
- make api_public || die "make api_public failed" |
434 |
- fi |
435 |
+ use doc && emake -C doc api_public |
436 |
} |
437 |
|
438 |
src_install() { |
439 |
emake INSTALL_ROOT="${D}" install |
440 |
|
441 |
# this way the docs will be installed in the standard gentoo dir |
442 |
- rm -f "${ED}"/usr/share/${MY_PN}/{COPYING,README} |
443 |
+ rm "${ED}"/usr/share/${MY_PN}/{COPYING,README} || die "Installed file set seems to be changed by upstream" |
444 |
newdoc iconsets/roster/README README.roster |
445 |
newdoc iconsets/system/README README.system |
446 |
newdoc certs/README README.certs |
447 |
dodoc README |
448 |
|
449 |
- if use extras && use plugins; then |
450 |
- insinto /usr/share/${MY_PN}/plugins |
451 |
- doins src/plugins/plugins.pri |
452 |
- doins src/plugins/psiplugin.pri |
453 |
- doins -r src/plugins/include |
454 |
- sed -i -e "s:target.path.*:target.path = /usr/$(get_libdir)/${MY_PN}/plugins:" \ |
455 |
- "${ED}"/usr/share/${MY_PN}/plugins/psiplugin.pri \ |
456 |
- || die "sed failed" |
457 |
- fi |
458 |
- |
459 |
- use doc && dohtml -r doc/api |
460 |
+ local HTML_DOCS=( doc/api ) |
461 |
+ einstalldocs |
462 |
|
463 |
# install translations |
464 |
- cd "${WORKDIR}/psi-l10n/translations" |
465 |
+ local mylrelease="$(qt5_get_bindir)"/lrelease |
466 |
+ cd "${WORKDIR}/psi-l10n" || die |
467 |
insinto /usr/share/${MY_PN} |
468 |
- for x in ${LANGS}; do |
469 |
- if use linguas_${x}; then |
470 |
- lrelease "${PN}_${x}.ts" || die "lrelease ${x} failed" |
471 |
- doins "${PN}_${x}.qm" |
472 |
- fi |
473 |
- done |
474 |
-} |
475 |
- |
476 |
-pkg_preinst() { |
477 |
- gnome2_icon_savelist |
478 |
-} |
479 |
- |
480 |
-pkg_postinst() { |
481 |
- readme.gentoo_pkg_postinst |
482 |
- gnome2_icon_cache_update |
483 |
-} |
484 |
- |
485 |
-pkg_postrm() { |
486 |
- gnome2_icon_cache_update |
487 |
+ install_locale() { |
488 |
+ "${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease ${1} failed" |
489 |
+ doins "translations/${PN}_${1}.qm" |
490 |
+ } |
491 |
+ l10n_for_each_locale_do install_locale |
492 |
} |