Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/mu-conference/, net-im/mu-conference/files/
Date: Thu, 25 Aug 2016 16:34:45
Message-Id: 1472142866.8f1f2f099ca5238ae3e12a9571833c90bcf7ce92.pacho@gentoo
1 commit: 8f1f2f099ca5238ae3e12a9571833c90bcf7ce92
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 25 16:34:26 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 25 16:34:26 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1f2f09
7
8 net-im/mu-conference: Drop old
9
10 Package-Manager: portage-2.3.0
11
12 net-im/mu-conference/Manifest | 2 -
13 net-im/mu-conference/files/README.Gentoo | 40 ----------
14 net-im/mu-conference/files/mu-conference-conf.d | 9 ---
15 .../files/mu-conference-makefile.patch | 11 ---
16 net-im/mu-conference/files/muc-transport.init | 26 -------
17 net-im/mu-conference/files/muc-transport.init-r2 | 33 --------
18 net-im/mu-conference/files/muctrans.xml | 37 ---------
19 net-im/mu-conference/mu-conference-0.7-r1.ebuild | 83 --------------------
20 net-im/mu-conference/mu-conference-0.8-r2.ebuild | 90 ----------------------
21 .../mu-conference/mu-conference-0.8.81-r1.ebuild | 88 ---------------------
22 10 files changed, 419 deletions(-)
23
24 diff --git a/net-im/mu-conference/Manifest b/net-im/mu-conference/Manifest
25 index 2a113bf..09fde34 100644
26 --- a/net-im/mu-conference/Manifest
27 +++ b/net-im/mu-conference/Manifest
28 @@ -1,3 +1 @@
29 DIST mu-conference-0.8.81.tar.gz 247649 SHA256 d3c8f2f0539b06e32b8bcd48dfae008c84961815ada0922ecf095be36b599862 SHA512 96bfafac726ebc8c1a7489f092e5a6d90df0aaff39a183aaa33847e12caf142fe64178d7041fff15115bb5d8116e69b7dce95cb4caf329a4187b5c35ceca28b1 WHIRLPOOL b6da089299d22b3b4e68d79f6451de981e5ccbd7144cf765c2a4073c6b7d58f276c687e4693ab34bbca57275b5b5e48886eded5adc3e5382c61add4d23b9467a
30 -DIST mu-conference_0.7.tar.gz 112381 SHA256 914d7e5cf45c50e3eaae77d03d895211d332f85469f4a70adaf7209917d27a35 SHA512 55efde6f7605b0d76038c9d67a3e0acb2f0041f896e9a70db0496dec4dbcb28a86539e9efc23df67c4b2eea64c221d1d7d99df2a02f212d46c5172da61d8d6a1 WHIRLPOOL cc9cfe32cff1b21ace94a55d8003038aa28df881b4aaf8759f9e53f53f76a5da4b4dbe7c27985ab2e638deafa4bb7a03cbaa3494c9387b56fb7204b073187f7e
31 -DIST mu-conference_0.8.tar.gz 110356 SHA256 d9f4399573a83f20c84af55cb56b405c706a943898cb14a5d220d35b89db429b SHA512 e5c410b77091d5fa4cba657a3362704fe1c148b9125984dc1cad832fd48ed343de78e044bafa10c8b8e38160406f4023444009281cb2236c300fbc17d4b85d7f WHIRLPOOL d49fe19bdd09081ba44b16126c9e71e1f9a07a285dea7efe64e487baeb0ac2d3eae04374c245b2451293805f60f935f9243d9e93f1df0f8de9cf98b54e42e53c
32
33 diff --git a/net-im/mu-conference/files/README.Gentoo b/net-im/mu-conference/files/README.Gentoo
34 deleted file mode 100644
35 index a478572..00000000
36 --- a/net-im/mu-conference/files/README.Gentoo
37 +++ /dev/null
38 @@ -1,40 +0,0 @@
39 -This is a small help to get you started with the MSN Jabberd transport in
40 -Gentoo.
41 -
42 -Edit /etc/jabber/muctrans.xml . This is the config file for MU-Conference.
43 -There change all references to localhost with the FQDN (Fully Qualified Domain
44 -Name) for your server.
45 -
46 -In the msnlinker section enter the IP of your main jabber server (normally
47 -127.0.0.1) and choose a port and secret (secret is the password the MSN
48 -transport will use to connect to the main jabber server).
49 -
50 -Now back to the multiple.xml to tell your main jabber server to listen to
51 -connections from the MU transport.
52 -Search for "<vcard2jud/>" and after that, and before the </jsm> add:
53 -
54 -<browse>
55 - <item category="conference" type="public" jid="conference.localhost" name="Public Conferencing" version="0.6.0">
56 - <ns>http://jabber.org/protocol/muc</ns>
57 - </item>
58 -</browse>
59 -
60 -Again here change localhost for your FQDN.
61 -
62 -Scrool down to the bottom of the file, and just before the </jabber> add:
63 -
64 -<service id="muclinker">
65 -<host>conference.localhost</host>
66 - <accept>
67 - <ip>127.0.0.1</ip>
68 - <port>31518</port>
69 - <secret>mymucsecret</secret>
70 - </accept>
71 -</service>
72 -(By know you know you have to change localhost for you FQDN).
73 -One very importante thing: even if it is the same machine the name's for the
74 -various services must be diferent, that means that there must be valid aliases
75 -for conference.FQDN .
76 -
77 -If you need help with configuration you can try the Jabber Admin Mailling list:
78 -http://mailman.jabber.org/listinfo/jadmin
79
80 diff --git a/net-im/mu-conference/files/mu-conference-conf.d b/net-im/mu-conference/files/mu-conference-conf.d
81 deleted file mode 100644
82 index 95e38ab..00000000
83 --- a/net-im/mu-conference/files/mu-conference-conf.d
84 +++ /dev/null
85 @@ -1,9 +0,0 @@
86 -# Copyright 1999-2004 Gentoo Foundation
87 -# Distributed under the terms of the GNU General Public License, v2 or later
88 -# $Id$
89 -
90 -CONFIG="/etc/jabber/muctrans.xml"
91 -
92 -#Need to find a way to fix the "double" expansion
93 -#PIDFILE= grep pid ${CONFIG} | sed -e 's/<[^>]*>//g' | sed s/' '//g
94 -PIDFILE="/var/log/jabber/muctrans.pid"
95
96 diff --git a/net-im/mu-conference/files/mu-conference-makefile.patch b/net-im/mu-conference/files/mu-conference-makefile.patch
97 deleted file mode 100644
98 index 2a00940..00000000
99 --- a/net-im/mu-conference/files/mu-conference-makefile.patch
100 +++ /dev/null
101 @@ -1,11 +0,0 @@
102 ---- Makefile 2003-11-15 04:19:44.000000000 +0000
103 -+++ Makefile.new 2004-01-10 02:20:28.753368424 +0000
104 -@@ -1,6 +1,6 @@
105 --include ../../platform-settings
106 -+include /usr/lib/jabberd/platform-settings
107 -
108 --CFLAGS:=$(CFLAGS) -I../../jabberd -I../include `pkg-config --cflags glib-2.0`
109 -+CFLAGS:=$(CFLAGS) -I/usr/include/jabberd -I../include `pkg-config --cflags glib-2.0`
110 - LIBS:=$(LIBS) `pkg-config --libs glib-2.0`
111 -
112 - # Debug/Experimental
113
114 diff --git a/net-im/mu-conference/files/muc-transport.init b/net-im/mu-conference/files/muc-transport.init
115 deleted file mode 100644
116 index c10c0ae..00000000
117 --- a/net-im/mu-conference/files/muc-transport.init
118 +++ /dev/null
119 @@ -1,26 +0,0 @@
120 -#!/sbin/openrc-run
121 -
122 -depend() {
123 - need net
124 - use jabber-server
125 -}
126 -
127 -start() {
128 - ebegin "Starting MUC Jabber Transport"
129 - jabberd -B -c /etc/jabber/muctrans.xml -H /var/spool/jabber >/dev/null 2>&1
130 - eend $?
131 -}
132 -
133 -stop() {
134 - ebegin "Stoping MUC Jabber Transport"
135 - if [ -f /var/log/jabber/muctrans.pid ]; then
136 - kill `cat /var/log/jabber/muctrans.pid`
137 - fi
138 - sleep 2
139 - if [ -f /var/log/jabber/muctrans.pid ]; then
140 - kill -9 `cat /var/log/jabber/muctrans.pid`
141 - rm -f /var/log/jabber/muctrans.pid
142 - fi
143 - rm -f /var/log/jabber/muctrans.pid
144 - eend $?
145 -}
146
147 diff --git a/net-im/mu-conference/files/muc-transport.init-r2 b/net-im/mu-conference/files/muc-transport.init-r2
148 deleted file mode 100644
149 index f1d5379..00000000
150 --- a/net-im/mu-conference/files/muc-transport.init-r2
151 +++ /dev/null
152 @@ -1,33 +0,0 @@
153 -#!/sbin/openrc-run
154 -
155 -depend() {
156 - need net
157 - use jabber-server
158 -}
159 -
160 -start() {
161 - ebegin "Starting MUC Jabber Transport"
162 - if [ -f ${PIDFILE} ]; then
163 - if [ -z $(ps ax | grep `cat ${PIDFILE}` | grep -v grep ) ]
164 - then
165 - rm -f ${PIDFILE}
166 - fi
167 - fi
168 -
169 - jabberd -B -c ${CONFIG} -H /var/spool/jabber >/dev/null 2>&1
170 - eend $?
171 -}
172 -
173 -stop() {
174 - ebegin "Stoping MUC Jabber Transport"
175 - if [ -f ${PIDFILE} ]; then
176 - kill `cat ${PIDFILE}`
177 - fi
178 - sleep 2
179 - if [ -f ${PIDFILE} ]; then
180 - kill -9 `cat ${PIDFILE}`
181 - rm -f ${PIDFILE}
182 - fi
183 - rm -f ${PIDFILE}
184 - eend $?
185 -}
186
187 diff --git a/net-im/mu-conference/files/muctrans.xml b/net-im/mu-conference/files/muctrans.xml
188 deleted file mode 100644
189 index 6fe5b21..00000000
190 --- a/net-im/mu-conference/files/muctrans.xml
191 +++ /dev/null
192 @@ -1,37 +0,0 @@
193 -<jabber>
194 -
195 - <service id="muclinker">
196 - <uplink/>
197 - <connect>
198 - <ip>127.0.0.1</ip>
199 - <port>31518</port>
200 - <secret>mymucsecret</secret>
201 - </connect>
202 - </service>
203 -
204 - <service id="conference.localhost">
205 - <load>
206 - <conference>/usr/lib/jabberd/mu-conference.so</conference>
207 - </load>
208 - <conference xmlns="jabber:config:conference">
209 - <public/>
210 - <vCard>
211 - <FN>Public Chatrooms</FN>
212 - <DESC>This service is for public chatrooms.</DESC>
213 - <URL>http://conference.localhost/logs/</URL>
214 - </vCard>
215 - <history>20</history>
216 - <logdir>/var/log/jabber/conference/</logdir>
217 - <sadmin>admin@localhost</sadmin>
218 - <notice>
219 - <join>has joined this session</join>
220 - <leave>has left</leave>
221 - <rename>is now known as</rename>
222 - </notice>
223 - </conference>
224 - </service>
225 -
226 - <pidfile>/var/log/jabber/muctrans.pid</pidfile>
227 -
228 -</jabber>
229 -
230
231 diff --git a/net-im/mu-conference/mu-conference-0.7-r1.ebuild b/net-im/mu-conference/mu-conference-0.7-r1.ebuild
232 deleted file mode 100644
233 index 9b37494..00000000
234 --- a/net-im/mu-conference/mu-conference-0.7-r1.ebuild
235 +++ /dev/null
236 @@ -1,83 +0,0 @@
237 -# Copyright 1999-2016 Gentoo Foundation
238 -# Distributed under the terms of the GNU General Public License v2
239 -# $Id$
240 -
241 -EAPI=6
242 -
243 -inherit eutils
244 -
245 -DESCRIPTION="Multi-User Chat for jabberd"
246 -HOMEPAGE="https://gna.org/projects/mu-conference/"
247 -SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"
248 -
249 -LICENSE="GPL-2"
250 -KEYWORDS="~amd64 ~ppc ~sparc x86"
251 -SLOT="0"
252 -
253 -DEPEND="
254 - dev-libs/expat
255 - >=dev-libs/glib-2
256 - net-dns/libidn
257 - net-im/jabberd2
258 - mysql? ( virtual/mysql )"
259 -RDEPEND="${DEPEND}"
260 -IUSE="mysql"
261 -
262 -S="${WORKDIR}/${PN}_${PV}"
263 -
264 -src_prepare() {
265 - # Fix missing header in src/conference_user.c in order to
266 - # make emerge happy and avoid QA notice.
267 - sed -i "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
268 -
269 - if use mysql; then
270 - sed -i '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' src/Makefile || die
271 - else
272 - # Makefile is broken. Should not always link against mysql
273 - sed -i 's/`mysql_config --libs`//' src/Makefile || die
274 - fi
275 -
276 - eapply_user
277 -}
278 -
279 -src_install() {
280 - dobin src/mu-conference
281 - fowners jabber:jabber /usr/bin/mu-conference
282 - fperms 750 /usr/bin/mu-conference
283 -
284 - newinitd "${FILESDIR}/${P}".init mu-conference
285 -
286 - dodoc ChangeLog FAQ mu-conference.sql README
287 - docinto scripts
288 - dodoc scripts/*
289 -
290 - for i in log spool; do
291 - dodir /var/${i}/jabber/mu-conference
292 - keepdir /var/${i}/jabber/mu-conference
293 - fowners jabber:jabber /var/${i}/jabber/mu-conference
294 - fperms 770 /var/${i}/jabber/mu-conference
295 - done
296 -
297 - insinto /etc/jabber
298 - newins muc-default.xml mu-conference.xml
299 - doins style.css
300 -
301 - cd "${D}/etc/jabber/" || die
302 - sed -i \
303 - -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
304 - -e 's,./syslogs,/var/log/jabber,g' \
305 - -e 's,./logs,/var/log/jabber/mu-conference,g' \
306 - -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
307 - -e "s,../style.css,/etc/jabber/style.css,g" \
308 - -e "s,7009,5347,g" \
309 - mu-conference.xml || die "sed failed"
310 -}
311 -
312 -pkg_postinst() {
313 - echo
314 - elog "For jabberd-2 connection:"
315 - elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
316 - elog " match the address of your jabberd router."
317 - elog "2. Set a common secret in mu-conference.xml and router.xml"
318 - echo
319 -}
320
321 diff --git a/net-im/mu-conference/mu-conference-0.8-r2.ebuild b/net-im/mu-conference/mu-conference-0.8-r2.ebuild
322 deleted file mode 100644
323 index fa352c9..00000000
324 --- a/net-im/mu-conference/mu-conference-0.8-r2.ebuild
325 +++ /dev/null
326 @@ -1,90 +0,0 @@
327 -# Copyright 1999-2016 Gentoo Foundation
328 -# Distributed under the terms of the GNU General Public License v2
329 -# $Id$
330 -
331 -EAPI=6
332 -
333 -inherit toolchain-funcs
334 -
335 -DESCRIPTION="Multi-User Chat for jabberd"
336 -HOMEPAGE="https://gna.org/projects/mu-conference/"
337 -SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"
338 -
339 -LICENSE="GPL-2"
340 -KEYWORDS="~amd64 ~ppc ~sparc ~x86"
341 -SLOT="0"
342 -IUSE="mysql"
343 -
344 -RDEPEND="
345 - dev-libs/expat
346 - >=dev-libs/glib-2:2
347 - net-dns/libidn
348 - net-im/jabberd2
349 - mysql? ( virtual/mysql )"
350 -DEPEND="${RDEPEND}
351 - virtual/pkgconfig"
352 -
353 -S=${WORKDIR}/${PN}_${PV}
354 -
355 -src_prepare() {
356 - # Fix missing header in src/conference_user.c in order to
357 - # make emerge happy and avoid QA notice.
358 - sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
359 -
360 - if use mysql; then
361 - sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
362 - -e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
363 - fi
364 - sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
365 - -e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
366 - -e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
367 - sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
368 - sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
369 - sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
370 - sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
371 - tc-export CC AR RANLIB
372 -
373 - eapply_user
374 -}
375 -
376 -src_install() {
377 - dobin src/mu-conference
378 - fowners jabber:jabber /usr/bin/mu-conference
379 - fperms 750 /usr/bin/mu-conference
380 -
381 - newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
382 -
383 - dodoc ChangeLog FAQ mu-conference.sql README README.sql
384 - docinto scripts
385 - dodoc scripts/*
386 -
387 - local i
388 - for i in log spool; do
389 - dodir /var/${i}/jabber/mu-conference
390 - keepdir /var/${i}/jabber/mu-conference
391 - fowners jabber:jabber /var/${i}/jabber/mu-conference
392 - fperms 770 /var/${i}/jabber/mu-conference
393 - done
394 -
395 - insinto /etc/jabber
396 - newins muc-default.xml mu-conference.xml
397 - doins style.css
398 -
399 - sed -i \
400 - -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
401 - -e 's,./syslogs,/var/log/jabber,g' \
402 - -e 's,./logs,/var/log/jabber/mu-conference,g' \
403 - -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
404 - -e "s,../style.css,/etc/jabber/style.css,g" \
405 - -e "s,7009,5347,g" \
406 - "${D}"/etc/jabber/mu-conference.xml || die "sed failed"
407 -}
408 -
409 -pkg_postinst() {
410 - echo
411 - elog "For jabberd-2 connection:"
412 - elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
413 - elog " match the address of your jabberd router."
414 - elog "2. Set a common secret in mu-conference.xml and router.xml"
415 - echo
416 -}
417
418 diff --git a/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild b/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild
419 deleted file mode 100644
420 index 8b00445..00000000
421 --- a/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild
422 +++ /dev/null
423 @@ -1,88 +0,0 @@
424 -# Copyright 1999-2016 Gentoo Foundation
425 -# Distributed under the terms of the GNU General Public License v2
426 -# $Id$
427 -
428 -EAPI=6
429 -
430 -inherit toolchain-funcs
431 -
432 -DESCRIPTION="Multi-User Chat for jabberd"
433 -HOMEPAGE="https://gna.org/projects/mu-conference/"
434 -SRC_URI="http://download.gna.org/mu-conference/${P}.tar.gz"
435 -
436 -LICENSE="GPL-2"
437 -KEYWORDS="~amd64 ~ppc ~sparc ~x86"
438 -SLOT="0"
439 -IUSE="mysql"
440 -
441 -RDEPEND="
442 - dev-libs/expat
443 - >=dev-libs/glib-2:2
444 - net-dns/libidn
445 - net-im/jabberd2
446 - mysql? ( virtual/mysql )"
447 -DEPEND="${RDEPEND}
448 - virtual/pkgconfig"
449 -
450 -src_prepare() {
451 - # Fix missing header in src/conference_user.c in order to
452 - # make emerge happy and avoid QA notice.
453 - sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
454 -
455 - if use mysql; then
456 - sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
457 - -e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
458 - fi
459 - sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
460 - -e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
461 - -e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
462 - sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
463 - sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
464 - sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
465 - sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
466 - tc-export CC AR RANLIB
467 -
468 - eapply_user
469 -}
470 -
471 -src_install() {
472 - dobin src/mu-conference
473 - fowners jabber:jabber /usr/bin/mu-conference
474 - fperms 750 /usr/bin/mu-conference
475 -
476 - newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
477 -
478 - dodoc ChangeLog FAQ mu-conference.sql README README.sql
479 - docinto scripts
480 - dodoc scripts/*
481 -
482 - local i
483 - for i in log spool; do
484 - dodir /var/${i}/jabber/mu-conference
485 - keepdir /var/${i}/jabber/mu-conference
486 - fowners jabber:jabber /var/${i}/jabber/mu-conference
487 - fperms 770 /var/${i}/jabber/mu-conference
488 - done
489 -
490 - insinto /etc/jabber
491 - newins muc-default.xml mu-conference.xml
492 - doins style.css
493 -
494 - sed -i \
495 - -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
496 - -e 's,./syslogs,/var/log/jabber,g' \
497 - -e 's,./logs,/var/log/jabber/mu-conference,g' \
498 - -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
499 - -e "s,../style.css,/etc/jabber/style.css,g" \
500 - -e "s,7009,5347,g" \
501 - "${D}"/etc/jabber/mu-conference.xml || die "sed failed"
502 -}
503 -
504 -pkg_postinst() {
505 - echo
506 - elog "For jabberd-2 connection:"
507 - elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
508 - elog " match the address of your jabberd router."
509 - elog "2. Set a common secret in mu-conference.xml and router.xml"
510 - echo
511 -}