Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jason Donenfeld (zx2c4)" <zx2c4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-im/prosody: prosody-0.9.2.ebuild prosody-0.9.1-r1.ebuild metadata.xml prosody-0.8.2.ebuild prosody-0.9.1.ebuild prosody-0.8.2-r1.ebuild prosody-0.8.1.ebuild ChangeLog
Date: Mon, 27 Jan 2014 02:21:55
Message-Id: 20140127022151.4F74B2004E@flycatcher.gentoo.org
1 zx2c4 14/01/27 02:21:51
2
3 Modified: prosody-0.9.1-r1.ebuild metadata.xml
4 prosody-0.8.2.ebuild prosody-0.9.1.ebuild
5 prosody-0.8.2-r1.ebuild prosody-0.8.1.ebuild
6 ChangeLog
7 Added: prosody-0.9.2.ebuild
8 Log:
9 Version bump and rework init system.
10
11 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE)
12
13 Revision Changes Path
14 1.3 net-im/prosody/prosody-0.9.1-r1.ebuild
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.9.1-r1.ebuild?rev=1.3&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.9.1-r1.ebuild?rev=1.3&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.9.1-r1.ebuild?r1=1.2&r2=1.3
19
20 Index: prosody-0.9.1-r1.ebuild
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.1-r1.ebuild,v
23 retrieving revision 1.2
24 retrieving revision 1.3
25 diff -u -r1.2 -r1.3
26 --- prosody-0.9.1-r1.ebuild 1 Nov 2013 20:33:25 -0000 1.2
27 +++ prosody-0.9.1-r1.ebuild 27 Jan 2014 02:21:51 -0000 1.3
28 @@ -1,6 +1,6 @@
29 -# Copyright 1999-2013 Gentoo Foundation
30 +# Copyright 1999-2014 Gentoo Foundation
31 # Distributed under the terms of the GNU General Public License v2
32 -# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.1-r1.ebuild,v 1.2 2013/11/01 20:33:25 hasufell Exp $
33 +# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.1-r1.ebuild,v 1.3 2014/01/27 02:21:51 zx2c4 Exp $
34
35 EAPI=5
36
37 @@ -66,7 +66,7 @@
38
39 src_install() {
40 emake DESTDIR="${D}" install
41 - newinitd "${FILESDIR}/${PN}".initd ${PN}
42 + newinitd "${FILESDIR}/${PN}".initd.old ${PN}
43 }
44
45 src_test() {
46
47
48
49 1.11 net-im/prosody/metadata.xml
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/metadata.xml?rev=1.11&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/metadata.xml?rev=1.11&content-type=text/plain
53 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/metadata.xml?r1=1.10&r2=1.11
54
55 Index: metadata.xml
56 ===================================================================
57 RCS file: /var/cvsroot/gentoo-x86/net-im/prosody/metadata.xml,v
58 retrieving revision 1.10
59 retrieving revision 1.11
60 diff -u -r1.10 -r1.11
61 --- metadata.xml 31 Dec 2012 10:00:53 -0000 1.10
62 +++ metadata.xml 27 Jan 2014 02:21:51 -0000 1.11
63 @@ -7,8 +7,12 @@
64 <maintainer>
65 <email>klausman@g.o</email>
66 </maintainer>
67 + <maintainer>
68 + <email>zx2c4@g.o</email>
69 + </maintainer>
70 <use>
71 <flag name="libevent">Use libevent for event handling</flag>
72 <flag name="zlib">Support for compressing XMPP streams with mod_compression</flag>
73 + <flag name="jit">Use LuaJIT instead of vanilla Lua</flag>
74 </use>
75 </pkgmetadata>
76
77
78
79 1.6 net-im/prosody/prosody-0.8.2.ebuild
80
81 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.8.2.ebuild?rev=1.6&view=markup
82 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.8.2.ebuild?rev=1.6&content-type=text/plain
83 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.8.2.ebuild?r1=1.5&r2=1.6
84
85 Index: prosody-0.8.2.ebuild
86 ===================================================================
87 RCS file: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.2.ebuild,v
88 retrieving revision 1.5
89 retrieving revision 1.6
90 diff -u -r1.5 -r1.6
91 --- prosody-0.8.2.ebuild 13 Jul 2013 05:46:32 -0000 1.5
92 +++ prosody-0.8.2.ebuild 27 Jan 2014 02:21:51 -0000 1.6
93 @@ -1,6 +1,6 @@
94 -# Copyright 1999-2013 Gentoo Foundation
95 +# Copyright 1999-2014 Gentoo Foundation
96 # Distributed under the terms of the GNU General Public License v2
97 -# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.2.ebuild,v 1.5 2013/07/13 05:46:32 ago Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.2.ebuild,v 1.6 2014/01/27 02:21:51 zx2c4 Exp $
99
100 EAPI="2"
101
102 @@ -59,7 +59,7 @@
103
104 src_install() {
105 DESTDIR="${D}" emake install || die "make failed"
106 - newinitd "${FILESDIR}/${PN}".initd ${PN}
107 + newinitd "${FILESDIR}/${PN}".initd.old ${PN}
108 }
109
110 src_test() {
111
112
113
114 1.5 net-im/prosody/prosody-0.9.1.ebuild
115
116 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.9.1.ebuild?rev=1.5&view=markup
117 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.9.1.ebuild?rev=1.5&content-type=text/plain
118 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.9.1.ebuild?r1=1.4&r2=1.5
119
120 Index: prosody-0.9.1.ebuild
121 ===================================================================
122 RCS file: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.1.ebuild,v
123 retrieving revision 1.4
124 retrieving revision 1.5
125 diff -u -r1.4 -r1.5
126 --- prosody-0.9.1.ebuild 1 Nov 2013 20:33:25 -0000 1.4
127 +++ prosody-0.9.1.ebuild 27 Jan 2014 02:21:51 -0000 1.5
128 @@ -1,6 +1,6 @@
129 -# Copyright 1999-2013 Gentoo Foundation
130 +# Copyright 1999-2014 Gentoo Foundation
131 # Distributed under the terms of the GNU General Public License v2
132 -# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.1.ebuild,v 1.4 2013/11/01 20:33:25 hasufell Exp $
133 +# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.1.ebuild,v 1.5 2014/01/27 02:21:51 zx2c4 Exp $
134
135 EAPI="5"
136
137 @@ -58,7 +58,7 @@
138
139 src_install() {
140 emake DESTDIR="${D}" install
141 - newinitd "${FILESDIR}/${PN}".initd ${PN}
142 + newinitd "${FILESDIR}/${PN}".initd.old ${PN}
143 }
144
145 src_test() {
146
147
148
149 1.5 net-im/prosody/prosody-0.8.2-r1.ebuild
150
151 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.8.2-r1.ebuild?rev=1.5&view=markup
152 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.8.2-r1.ebuild?rev=1.5&content-type=text/plain
153 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.8.2-r1.ebuild?r1=1.4&r2=1.5
154
155 Index: prosody-0.8.2-r1.ebuild
156 ===================================================================
157 RCS file: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.2-r1.ebuild,v
158 retrieving revision 1.4
159 retrieving revision 1.5
160 diff -u -r1.4 -r1.5
161 --- prosody-0.8.2-r1.ebuild 22 Sep 2013 06:50:14 -0000 1.4
162 +++ prosody-0.8.2-r1.ebuild 27 Jan 2014 02:21:51 -0000 1.5
163 @@ -1,6 +1,6 @@
164 -# Copyright 1999-2013 Gentoo Foundation
165 +# Copyright 1999-2014 Gentoo Foundation
166 # Distributed under the terms of the GNU General Public License v2
167 -# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.2-r1.ebuild,v 1.4 2013/09/22 06:50:14 ago Exp $
168 +# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.2-r1.ebuild,v 1.5 2014/01/27 02:21:51 zx2c4 Exp $
169
170 EAPI="5"
171
172 @@ -63,7 +63,7 @@
173
174 src_install() {
175 DESTDIR="${D}" emake install
176 - newinitd "${FILESDIR}/${PN}".initd ${PN}
177 + newinitd "${FILESDIR}/${PN}".initd.old ${PN}
178 systemd_dounit "${FILESDIR}/${PN}".service
179 systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
180 }
181
182
183
184 1.4 net-im/prosody/prosody-0.8.1.ebuild
185
186 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.8.1.ebuild?rev=1.4&view=markup
187 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.8.1.ebuild?rev=1.4&content-type=text/plain
188 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.8.1.ebuild?r1=1.3&r2=1.4
189
190 Index: prosody-0.8.1.ebuild
191 ===================================================================
192 RCS file: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.1.ebuild,v
193 retrieving revision 1.3
194 retrieving revision 1.4
195 diff -u -r1.3 -r1.4
196 --- prosody-0.8.1.ebuild 6 Mar 2012 11:06:26 -0000 1.3
197 +++ prosody-0.8.1.ebuild 27 Jan 2014 02:21:51 -0000 1.4
198 @@ -1,6 +1,6 @@
199 -# Copyright 1999-2012 Gentoo Foundation
200 +# Copyright 1999-2014 Gentoo Foundation
201 # Distributed under the terms of the GNU General Public License v2
202 -# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.1.ebuild,v 1.3 2012/03/06 11:06:26 klausman Exp $
203 +# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.1.ebuild,v 1.4 2014/01/27 02:21:51 zx2c4 Exp $
204
205 EAPI="2"
206
207 @@ -59,7 +59,7 @@
208
209 src_install() {
210 DESTDIR="${D}" emake install || die "make failed"
211 - newinitd "${FILESDIR}/${PN}".initd ${PN}
212 + newinitd "${FILESDIR}/${PN}".initd.old ${PN}
213 }
214
215 src_test() {
216
217
218
219 1.33 net-im/prosody/ChangeLog
220
221 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/ChangeLog?rev=1.33&view=markup
222 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/ChangeLog?rev=1.33&content-type=text/plain
223 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/ChangeLog?r1=1.32&r2=1.33
224
225 Index: ChangeLog
226 ===================================================================
227 RCS file: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v
228 retrieving revision 1.32
229 retrieving revision 1.33
230 diff -u -r1.32 -r1.33
231 --- ChangeLog 1 Nov 2013 20:33:25 -0000 1.32
232 +++ ChangeLog 27 Jan 2014 02:21:51 -0000 1.33
233 @@ -1,6 +1,15 @@
234 # ChangeLog for net-im/prosody
235 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
236 -# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.32 2013/11/01 20:33:25 hasufell Exp $
237 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
238 +# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.33 2014/01/27 02:21:51 zx2c4 Exp $
239 +
240 +*prosody-0.9.2 (27 Jan 2014)
241 +
242 + 27 Jan 2014; Jason A. Donenfeld <zx2c4@g.o>
243 + +files/prosody-0.9.2-cfg.lua.patch, +files/prosody.initd.old,
244 + +prosody-0.9.2.ebuild, files/prosody.initd, metadata.xml,
245 + prosody-0.8.1.ebuild, prosody-0.8.2-r1.ebuild, prosody-0.8.2.ebuild,
246 + prosody-0.9.1-r1.ebuild, prosody-0.9.1.ebuild:
247 + Version bump and rework init system.
248
249 01 Nov 2013; Julian Ospald <hasufell@g.o> prosody-0.9.1.ebuild,
250 prosody-0.9.1-r1.ebuild:
251
252
253
254 1.1 net-im/prosody/prosody-0.9.2.ebuild
255
256 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.9.2.ebuild?rev=1.1&view=markup
257 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/prosody-0.9.2.ebuild?rev=1.1&content-type=text/plain
258
259 Index: prosody-0.9.2.ebuild
260 ===================================================================
261 # Copyright 1999-2014 Gentoo Foundation
262 # Distributed under the terms of the GNU General Public License v2
263 # $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.2.ebuild,v 1.1 2014/01/27 02:21:51 zx2c4 Exp $
264
265 EAPI=5
266
267 inherit flag-o-matic multilib versionator
268
269 MY_PV=$(replace_version_separator 3 '')
270 MY_P="${PN}-${MY_PV}"
271 DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua."
272 HOMEPAGE="http://prosody.im/"
273 SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
274
275 LICENSE="MIT"
276 SLOT="0"
277 KEYWORDS="~amd64 ~arm ~x86"
278 IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit"
279
280 DEPEND="net-im/jabber-base
281 !jit? ( >=dev-lang/lua-5.1 )
282 jit? ( dev-lang/luajit )
283 >=net-dns/libidn-1.1
284 >=dev-libs/openssl-0.9.8"
285 RDEPEND="${DEPEND}
286 dev-lua/luaexpat
287 dev-lua/luafilesystem
288 ipv6? ( >=dev-lua/luasocket-3 )
289 !ipv6? ( dev-lua/luasocket )
290 libevent? ( >=dev-lua/luaevent-0.4.3 )
291 mysql? ( dev-lua/luadbi[mysql] )
292 postgres? ( dev-lua/luadbi[postgres] )
293 sqlite? ( dev-lua/luadbi[sqlite] )
294 ssl? ( dev-lua/luasec )
295 zlib? ( dev-lua/lua-zlib )"
296
297 S=${WORKDIR}/${MY_P}
298
299 JABBER_ETC="/etc/jabber"
300 JABBER_SPOOL="/var/spool/jabber"
301
302 src_prepare() {
303 epatch "${FILESDIR}/${PN}-0.9.2-cfg.lua.patch"
304 sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
305 -e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
306 -e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
307 -e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
308 Makefile || die
309 }
310
311 src_configure() {
312 # the configure script is handcrafted (and yells at unknown options)
313 # hence do not use 'econf'
314 append-cflags -D_GNU_SOURCE
315 luajit=""
316 if use jit; then
317 luajit="--runwith=luajit"
318 fi
319 ./configure \
320 --ostype=linux $luajit \
321 --prefix="/usr" \
322 --sysconfdir="${JABBER_ETC}" \
323 --datadir="${JABBER_SPOOL}" \
324 --with-lua-include=/usr/include \
325 --with-lua-lib=/usr/$(get_libdir)/lua \
326 --cflags="${CFLAGS} -Wall -fPIC" \
327 --ldflags="${LDFLAGS} -shared" \
328 --c-compiler="$(tc-getCC)" \
329 --linker="$(tc-getCC)" \
330 --require-config || die "configure failed"
331 }
332
333 src_install() {
334 emake DESTDIR="${D}" install
335 newinitd "${FILESDIR}/${PN}".initd ${PN}
336 }
337
338 src_test() {
339 cd tests || die
340 ./run_tests.sh || die
341 }
Report Message
Find on MARC Find on Google Groups