1 |
pva 10/11/30 19:24:56 |
2 |
|
3 |
Modified: psi-9999.ebuild ChangeLog |
4 |
Log: |
5 |
Style fixes, wrt Nikoli. |
6 |
|
7 |
(Portage version: 2.1.9.25/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.10 net-im/psi/psi-9999.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.10&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.10&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?r1=1.9&r2=1.10 |
15 |
|
16 |
Index: psi-9999.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v |
19 |
retrieving revision 1.9 |
20 |
retrieving revision 1.10 |
21 |
diff -u -r1.9 -r1.10 |
22 |
--- psi-9999.ebuild 28 Nov 2010 18:41:26 -0000 1.9 |
23 |
+++ psi-9999.ebuild 30 Nov 2010 19:24:56 -0000 1.10 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.9 2010/11/28 18:41:26 pva Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.10 2010/11/30 19:24:56 pva Exp $ |
29 |
|
30 |
EAPI="2" |
31 |
|
32 |
@@ -24,7 +24,8 @@ |
33 |
IUSE="crypt dbus debug doc enchant extras jingle iconsets spell ssl xscreensaver powersave |
34 |
plugins -whiteboarding webkit" |
35 |
|
36 |
-RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?] |
37 |
+RDEPEND=" |
38 |
+ >=x11-libs/qt-gui-4.4:4[qt3support,dbus?] |
39 |
>=x11-libs/qt-qt3support-4.4:4 |
40 |
>=app-crypt/qca-2.0.2:2 |
41 |
whiteboarding? ( x11-libs/qt-svg:4 ) |
42 |
@@ -34,8 +35,8 @@ |
43 |
) |
44 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
45 |
extras? ( webkit? ( x11-libs/qt-webkit ) ) |
46 |
- app-arch/unzip" |
47 |
- |
48 |
+ app-arch/unzip |
49 |
+" |
50 |
DEPEND="${RDEPEND} |
51 |
extras? ( |
52 |
${SUBVERSION_DEPEND} |
53 |
@@ -44,18 +45,19 @@ |
54 |
doc? ( app-doc/doxygen ) |
55 |
dev-util/pkgconfig |
56 |
" |
57 |
-PDEPEND="crypt? ( app-crypt/qca-gnupg:2 ) |
58 |
+PDEPEND=" |
59 |
+ crypt? ( app-crypt/qca-gnupg:2 ) |
60 |
jingle? ( |
61 |
net-im/psimedia |
62 |
app-crypt/qca-ossl:2 |
63 |
) |
64 |
- ssl? ( app-crypt/qca-ossl:2 )" |
65 |
- |
66 |
+ ssl? ( app-crypt/qca-ossl:2 ) |
67 |
+" |
68 |
RESTRICT="test" |
69 |
|
70 |
pkg_setup() { |
71 |
- for x in iconsets plugins powersave webkit whiteboarding;do |
72 |
- use ${x} && use !extras && \ |
73 |
+ for x in iconsets plugins powersave webkit whiteboarding; do |
74 |
+ use ${x} && use !extras && \ |
75 |
ewarn "USE=${x} is only available in Psi+ and requires USE=extras, ${x} will be disabled." |
76 |
done |
77 |
|
78 |
@@ -115,7 +117,7 @@ |
79 |
src_prepare() { |
80 |
if use extras; then |
81 |
EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} |
82 |
- " \ |
83 |
+ " \ |
84 |
EPATCH_SOURCE="${WORKDIR}/patches/" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch |
85 |
|
86 |
use powersave && epatch "${WORKDIR}/patches/dev/psi-reduce-power-consumption.patch" |
87 |
@@ -141,25 +143,32 @@ |
88 |
src_configure() { |
89 |
# unable to use econf because of non-standard configure script |
90 |
# disable growl as it is a MacOS X extension only |
91 |
- local confcmd="./configure |
92 |
- --prefix=/usr |
93 |
- --qtdir=/usr |
94 |
- --disable-bundled-qca |
95 |
- --disable-growl |
96 |
- --no-separate-debug-info |
97 |
- $(use dbus || echo '--disable-qdbus') |
98 |
- $(use debug && echo '--debug') |
99 |
- $(use spell && { |
100 |
- use enchant && echo '--disable-aspell' || echo '--disable-enchant' |
101 |
- } || echo '--disable-aspell --disable-enchant') |
102 |
- $(use xscreensaver || echo '--disable-xss') |
103 |
- $(use extras && { |
104 |
- use plugins && echo '--enable-plugins' |
105 |
- use webkit && echo '--enable-webkit' |
106 |
- } )" |
107 |
+ local myconf=" |
108 |
+ --prefix=/usr |
109 |
+ --qtdir=/usr |
110 |
+ --disable-bundled-qca |
111 |
+ --disable-growl |
112 |
+ --no-separate-debug-info |
113 |
+ " |
114 |
+ use dbus || myconf+=" --disable-qdbus" |
115 |
+ use debug && myconf+=" --debug" |
116 |
+ if use spell; then |
117 |
+ if use enchant; then |
118 |
+ myconf+=" --disable-aspell" |
119 |
+ else |
120 |
+ myconf+=" --disable-enchant" |
121 |
+ fi |
122 |
+ else |
123 |
+ myconf+=" --disable-aspell --disable-enchant" |
124 |
+ fi |
125 |
+ use xscreensaver || myconf+=" --disable-xss" |
126 |
+ if use extras; then |
127 |
+ use plugins && myconf+=" --enable-plugins" |
128 |
+ use webkit && myconf+=" --enable-webkit" |
129 |
+ fi |
130 |
|
131 |
- echo "${confcmd}" |
132 |
- ${confcmd} || die "configure failed" |
133 |
+ einfo "./configure ${myconf}" |
134 |
+ ./configure ${myconf} || die "configure failed" |
135 |
|
136 |
eqmake4 |
137 |
} |
138 |
@@ -176,9 +185,9 @@ |
139 |
|
140 |
src_install() { |
141 |
emake INSTALL_ROOT="${D}" install || die "emake install failed" |
142 |
- rm -f "${D}"/usr/share/psi/{COPYING,README} |
143 |
|
144 |
# this way the docs will be installed in the standard gentoo dir |
145 |
+ rm -f "${D}"/usr/share/psi/{COPYING,README} |
146 |
newdoc iconsets/roster/README README.roster || die |
147 |
newdoc iconsets/system/README README.system || die |
148 |
newdoc certs/README README.certs || die |
149 |
@@ -195,8 +204,7 @@ |
150 |
fi |
151 |
|
152 |
if use doc; then |
153 |
- cd doc |
154 |
- dohtml -r api || die "dohtml failed" |
155 |
+ dohtml -r doc/api || die "dohtml failed" |
156 |
fi |
157 |
|
158 |
# install translations |
159 |
@@ -206,7 +214,7 @@ |
160 |
if use linguas_${x}; then |
161 |
lrelease "${x}/${PN}_${x}.ts" || die "lrelease ${x} failed" |
162 |
doins "${x}/${PN}_${x}.qm" || die |
163 |
- newins "${x}/INFO" "INFO.${x}" |
164 |
+ newins "${x}/INFO" "${PN}_${x}.INFO" |
165 |
fi |
166 |
done |
167 |
} |
168 |
|
169 |
|
170 |
|
171 |
1.204 net-im/psi/ChangeLog |
172 |
|
173 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.204&view=markup |
174 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.204&content-type=text/plain |
175 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?r1=1.203&r2=1.204 |
176 |
|
177 |
Index: ChangeLog |
178 |
=================================================================== |
179 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v |
180 |
retrieving revision 1.203 |
181 |
retrieving revision 1.204 |
182 |
diff -u -r1.203 -r1.204 |
183 |
--- ChangeLog 28 Nov 2010 18:41:26 -0000 1.203 |
184 |
+++ ChangeLog 30 Nov 2010 19:24:56 -0000 1.204 |
185 |
@@ -1,6 +1,9 @@ |
186 |
# ChangeLog for net-im/psi |
187 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
188 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.203 2010/11/28 18:41:26 pva Exp $ |
189 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.204 2010/11/30 19:24:56 pva Exp $ |
190 |
+ |
191 |
+ 30 Nov 2010; Peter Volkov <pva@g.o> psi-9999.ebuild: |
192 |
+ Style fixes, wrt Nikoli. |
193 |
|
194 |
28 Nov 2010; Peter Volkov <pva@g.o> psi-9999.ebuild, metadata.xml: |
195 |
Fixed debug USE flag, update svn paths, thank Nikoli for this job. |