1 |
commit: 925440347629e9917a75cd44f0829c856cadf28c |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 31 20:22:41 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 31 21:19:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92544034 |
7 |
|
8 |
net-im/psi: Sort IUSE, fix (R)DEPENDs, fix USE=-doc |
9 |
|
10 |
metadata.xml: QT -> Qt |
11 |
Fix typo configuring USE=webkit |
12 |
|
13 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
14 |
|
15 |
net-im/psi/metadata.xml | 2 +- |
16 |
net-im/psi/psi-1.2.ebuild | 26 +++++++++++++++++--------- |
17 |
net-im/psi/psi-9999.ebuild | 28 +++++++++++++++++----------- |
18 |
3 files changed, 35 insertions(+), 21 deletions(-) |
19 |
|
20 |
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml |
21 |
index 952c3d3370d..96ff1512239 100644 |
22 |
--- a/net-im/psi/metadata.xml |
23 |
+++ b/net-im/psi/metadata.xml |
24 |
@@ -9,7 +9,7 @@ |
25 |
<email>proxy-maint@g.o</email> |
26 |
<name>Proxy Maintainers</name> |
27 |
</maintainer> |
28 |
- <longdescription>Psi is a very good XMPP client that uses QT</longdescription> |
29 |
+ <longdescription>Psi is a very good XMPP client that uses Qt</longdescription> |
30 |
<use> |
31 |
<flag name='aspell'>Enable spellchecking using <pkg>app-text/aspell</pkg></flag> |
32 |
<flag name='enchant'>Enable spellchecking using <pkg>app-text/enchant</pkg></flag> |
33 |
|
34 |
diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild |
35 |
index b575139d37f..aaf4448da8a 100644 |
36 |
--- a/net-im/psi/psi-1.2.ebuild |
37 |
+++ b/net-im/psi/psi-1.2.ebuild |
38 |
@@ -10,14 +10,13 @@ inherit l10n qmake-utils |
39 |
|
40 |
DESCRIPTION="Qt XMPP client" |
41 |
HOMEPAGE="http://psi-im.org/" |
42 |
- |
43 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz |
44 |
https://github.com/psi-im/psi-l10n/archive/1.2.tar.gz -> psi-l10n-${PV}.tar.gz" |
45 |
+ |
46 |
LICENSE="GPL-2" |
47 |
SLOT="0" |
48 |
KEYWORDS="~amd64 ~x86" |
49 |
-IUSE="aspell crypt dbus debug doc enchant +hunspell ssl xscreensaver |
50 |
-whiteboarding webengine webkit" |
51 |
+IUSE="aspell crypt dbus debug doc enchant +hunspell ssl webengine webkit whiteboarding xscreensaver" |
52 |
|
53 |
# qconf generates not quite compatible configure scripts |
54 |
QA_CONFIGURE_OPTIONS=".*" |
55 |
@@ -29,24 +28,32 @@ REQUIRED_USE=" |
56 |
|
57 |
RDEPEND=" |
58 |
app-crypt/qca:2[qt5] |
59 |
- dev-qt/qtgui:5 |
60 |
- dev-qt/qtxml:5 |
61 |
dev-qt/qtconcurrent:5 |
62 |
+ dev-qt/qtcore:5 |
63 |
+ dev-qt/qtgui:5 |
64 |
dev-qt/qtmultimedia:5 |
65 |
+ dev-qt/qtnetwork:5 |
66 |
+ dev-qt/qtwidgets:5 |
67 |
dev-qt/qtx11extras:5 |
68 |
+ dev-qt/qtxml:5 |
69 |
net-dns/libidn |
70 |
sys-libs/zlib[minizip] |
71 |
+ x11-libs/libX11 |
72 |
+ x11-libs/libxcb |
73 |
aspell? ( app-text/aspell ) |
74 |
dbus? ( dev-qt/qtdbus:5 ) |
75 |
enchant? ( >=app-text/enchant-1.3.0 ) |
76 |
hunspell? ( app-text/hunspell:= ) |
77 |
- webengine? ( >=dev-qt/qtwebengine-5.7:5[widgets] ) |
78 |
+ webengine? ( |
79 |
+ >=dev-qt/qtwebchannel-5.7:5[widgets] |
80 |
+ >=dev-qt/qtwebengine-5.7:5[widgets] |
81 |
+ ) |
82 |
webkit? ( dev-qt/qtwebkit:5 ) |
83 |
whiteboarding? ( dev-qt/qtsvg:5 ) |
84 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
85 |
" |
86 |
DEPEND="${RDEPEND} |
87 |
- dev-qt/linguist-tools |
88 |
+ dev-qt/linguist-tools:5 |
89 |
virtual/pkgconfig |
90 |
doc? ( app-doc/doxygen ) |
91 |
" |
92 |
@@ -54,6 +61,7 @@ PDEPEND=" |
93 |
crypt? ( app-crypt/qca[gpg] ) |
94 |
ssl? ( app-crypt/qca:2[ssl] ) |
95 |
" |
96 |
+ |
97 |
RESTRICT="test" |
98 |
|
99 |
src_configure() { |
100 |
@@ -70,7 +78,7 @@ src_configure() { |
101 |
|
102 |
use debug && CONF+=("--debug") |
103 |
use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine") |
104 |
- use webkit && CONF+=("--enable-webkit" "--with-webkit=qwebkit") |
105 |
+ use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit") |
106 |
|
107 |
econf "${CONF[@]}" |
108 |
|
109 |
@@ -92,7 +100,7 @@ src_install() { |
110 |
newdoc certs/README README.certs |
111 |
dodoc README |
112 |
|
113 |
- local HTML_DOCS=( doc/api ) |
114 |
+ use doc && HTML_DOCS=( doc/api/. ) |
115 |
einstalldocs |
116 |
|
117 |
# install translations |
118 |
|
119 |
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild |
120 |
index d08ddf5a62c..13d5a8e30df 100644 |
121 |
--- a/net-im/psi/psi-9999.ebuild |
122 |
+++ b/net-im/psi/psi-9999.ebuild |
123 |
@@ -20,8 +20,7 @@ EGIT_MIN_CLONE_TYPE="single" |
124 |
LICENSE="GPL-2" |
125 |
SLOT="0" |
126 |
KEYWORDS="" |
127 |
-IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql ssl xscreensaver |
128 |
-whiteboarding webengine webkit" |
129 |
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql ssl webengine webkit whiteboarding xscreensaver" |
130 |
|
131 |
# qconf generates not quite compatible configure scripts |
132 |
QA_CONFIGURE_OPTIONS=".*" |
133 |
@@ -35,13 +34,18 @@ REQUIRED_USE=" |
134 |
|
135 |
RDEPEND=" |
136 |
app-crypt/qca:2[qt5] |
137 |
- dev-qt/qtgui:5 |
138 |
- dev-qt/qtxml:5 |
139 |
dev-qt/qtconcurrent:5 |
140 |
+ dev-qt/qtcore:5 |
141 |
+ dev-qt/qtgui:5 |
142 |
dev-qt/qtmultimedia:5 |
143 |
+ dev-qt/qtnetwork:5 |
144 |
+ dev-qt/qtwidgets:5 |
145 |
dev-qt/qtx11extras:5 |
146 |
+ dev-qt/qtxml:5 |
147 |
net-dns/libidn |
148 |
sys-libs/zlib[minizip] |
149 |
+ x11-libs/libX11 |
150 |
+ x11-libs/libxcb |
151 |
aspell? ( app-text/aspell ) |
152 |
dbus? ( dev-qt/qtdbus:5 ) |
153 |
enchant? ( >=app-text/enchant-1.3.0 ) |
154 |
@@ -49,23 +53,25 @@ RDEPEND=" |
155 |
sql? ( dev-qt/qtsql:5 ) |
156 |
) |
157 |
hunspell? ( app-text/hunspell:= ) |
158 |
- webengine? ( >=dev-qt/qtwebengine-5.7:5[widgets] ) |
159 |
+ webengine? ( |
160 |
+ >=dev-qt/qtwebchannel-5.7:5[widgets] |
161 |
+ >=dev-qt/qtwebengine-5.7:5[widgets] |
162 |
+ ) |
163 |
webkit? ( dev-qt/qtwebkit:5 ) |
164 |
whiteboarding? ( dev-qt/qtsvg:5 ) |
165 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
166 |
" |
167 |
DEPEND="${RDEPEND} |
168 |
- dev-qt/linguist-tools |
169 |
+ dev-qt/linguist-tools:5 |
170 |
virtual/pkgconfig |
171 |
doc? ( app-doc/doxygen ) |
172 |
- extras? ( |
173 |
- >=sys-devel/qconf-2.3 |
174 |
- ) |
175 |
+ extras? ( >=sys-devel/qconf-2.3 ) |
176 |
" |
177 |
PDEPEND=" |
178 |
crypt? ( app-crypt/qca[gpg] ) |
179 |
ssl? ( app-crypt/qca:2[ssl] ) |
180 |
" |
181 |
+ |
182 |
RESTRICT="test iconsets? ( bindist )" |
183 |
|
184 |
pkg_setup() { |
185 |
@@ -146,7 +152,7 @@ src_configure() { |
186 |
|
187 |
use debug && CONF+=("--debug") |
188 |
use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine") |
189 |
- use webkit && CONF+=("--enable-webkit" "--with-webkit=qwebkit") |
190 |
+ use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit") |
191 |
|
192 |
econf "${CONF[@]}" |
193 |
|
194 |
@@ -168,7 +174,7 @@ src_install() { |
195 |
newdoc certs/README README.certs |
196 |
dodoc README |
197 |
|
198 |
- local HTML_DOCS=( doc/api ) |
199 |
+ use doc && HTML_DOCS=( doc/api/. ) |
200 |
einstalldocs |
201 |
|
202 |
# install translations |