Gentoo Archives: gentoo-commits

From: Austin English <wizardedit@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: Mon, 02 May 2016 22:24:11
Message-Id: 1462227707.0e5dbc45bad9c39c64887428201e9e4c78d0f29c.wizardedit@gentoo
1 commit: 0e5dbc45bad9c39c64887428201e9e4c78d0f29c
2 Author: Austin English <wizardedit <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 2 19:18:30 2016 +0000
4 Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
5 CommitDate: Mon May 2 22:21:47 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5dbc45
7
8 net-im/mu-conference: #!/sbin/openrc-run instead of #!/sbin/runscript
9
10 Gentoo-Bug: https://bugs.gentoo.org/573846
11
12 Package-Manager: portage-2.2.26
13
14 net-im/mu-conference/files/mu-conference-0.7.init | 2 +-
15 net-im/mu-conference/files/muc-transport.init | 2 +-
16 net-im/mu-conference/files/muc-transport.init-r2 | 2 +-
17 net-im/mu-conference/mu-conference-0.7-r1.ebuild | 83 ++++++++++++++++++++
18 net-im/mu-conference/mu-conference-0.8-r2.ebuild | 90 ++++++++++++++++++++++
19 .../mu-conference/mu-conference-0.8.81-r1.ebuild | 88 +++++++++++++++++++++
20 6 files changed, 264 insertions(+), 3 deletions(-)
21
22 diff --git a/net-im/mu-conference/files/mu-conference-0.7.init b/net-im/mu-conference/files/mu-conference-0.7.init
23 index 20400ac..a41c470 100644
24 --- a/net-im/mu-conference/files/mu-conference-0.7.init
25 +++ b/net-im/mu-conference/files/mu-conference-0.7.init
26 @@ -1,4 +1,4 @@
27 -#!/sbin/runscript
28 +#!/sbin/openrc-run
29
30 depend() {
31 need net
32
33 diff --git a/net-im/mu-conference/files/muc-transport.init b/net-im/mu-conference/files/muc-transport.init
34 index 39f6115..c10c0ae 100644
35 --- a/net-im/mu-conference/files/muc-transport.init
36 +++ b/net-im/mu-conference/files/muc-transport.init
37 @@ -1,4 +1,4 @@
38 -#!/sbin/runscript
39 +#!/sbin/openrc-run
40
41 depend() {
42 need net
43
44 diff --git a/net-im/mu-conference/files/muc-transport.init-r2 b/net-im/mu-conference/files/muc-transport.init-r2
45 index 03978bd..f1d5379 100644
46 --- a/net-im/mu-conference/files/muc-transport.init-r2
47 +++ b/net-im/mu-conference/files/muc-transport.init-r2
48 @@ -1,4 +1,4 @@
49 -#!/sbin/runscript
50 +#!/sbin/openrc-run
51
52 depend() {
53 need net
54
55 diff --git a/net-im/mu-conference/mu-conference-0.7-r1.ebuild b/net-im/mu-conference/mu-conference-0.7-r1.ebuild
56 new file mode 100644
57 index 0000000..9b37494
58 --- /dev/null
59 +++ b/net-im/mu-conference/mu-conference-0.7-r1.ebuild
60 @@ -0,0 +1,83 @@
61 +# Copyright 1999-2016 Gentoo Foundation
62 +# Distributed under the terms of the GNU General Public License v2
63 +# $Id$
64 +
65 +EAPI=6
66 +
67 +inherit eutils
68 +
69 +DESCRIPTION="Multi-User Chat for jabberd"
70 +HOMEPAGE="https://gna.org/projects/mu-conference/"
71 +SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"
72 +
73 +LICENSE="GPL-2"
74 +KEYWORDS="~amd64 ~ppc ~sparc x86"
75 +SLOT="0"
76 +
77 +DEPEND="
78 + dev-libs/expat
79 + >=dev-libs/glib-2
80 + net-dns/libidn
81 + net-im/jabberd2
82 + mysql? ( virtual/mysql )"
83 +RDEPEND="${DEPEND}"
84 +IUSE="mysql"
85 +
86 +S="${WORKDIR}/${PN}_${PV}"
87 +
88 +src_prepare() {
89 + # Fix missing header in src/conference_user.c in order to
90 + # make emerge happy and avoid QA notice.
91 + sed -i "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
92 +
93 + if use mysql; then
94 + sed -i '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' src/Makefile || die
95 + else
96 + # Makefile is broken. Should not always link against mysql
97 + sed -i 's/`mysql_config --libs`//' src/Makefile || die
98 + fi
99 +
100 + eapply_user
101 +}
102 +
103 +src_install() {
104 + dobin src/mu-conference
105 + fowners jabber:jabber /usr/bin/mu-conference
106 + fperms 750 /usr/bin/mu-conference
107 +
108 + newinitd "${FILESDIR}/${P}".init mu-conference
109 +
110 + dodoc ChangeLog FAQ mu-conference.sql README
111 + docinto scripts
112 + dodoc scripts/*
113 +
114 + for i in log spool; do
115 + dodir /var/${i}/jabber/mu-conference
116 + keepdir /var/${i}/jabber/mu-conference
117 + fowners jabber:jabber /var/${i}/jabber/mu-conference
118 + fperms 770 /var/${i}/jabber/mu-conference
119 + done
120 +
121 + insinto /etc/jabber
122 + newins muc-default.xml mu-conference.xml
123 + doins style.css
124 +
125 + cd "${D}/etc/jabber/" || die
126 + sed -i \
127 + -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
128 + -e 's,./syslogs,/var/log/jabber,g' \
129 + -e 's,./logs,/var/log/jabber/mu-conference,g' \
130 + -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
131 + -e "s,../style.css,/etc/jabber/style.css,g" \
132 + -e "s,7009,5347,g" \
133 + mu-conference.xml || die "sed failed"
134 +}
135 +
136 +pkg_postinst() {
137 + echo
138 + elog "For jabberd-2 connection:"
139 + elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
140 + elog " match the address of your jabberd router."
141 + elog "2. Set a common secret in mu-conference.xml and router.xml"
142 + echo
143 +}
144
145 diff --git a/net-im/mu-conference/mu-conference-0.8-r2.ebuild b/net-im/mu-conference/mu-conference-0.8-r2.ebuild
146 new file mode 100644
147 index 0000000..fa352c9
148 --- /dev/null
149 +++ b/net-im/mu-conference/mu-conference-0.8-r2.ebuild
150 @@ -0,0 +1,90 @@
151 +# Copyright 1999-2016 Gentoo Foundation
152 +# Distributed under the terms of the GNU General Public License v2
153 +# $Id$
154 +
155 +EAPI=6
156 +
157 +inherit toolchain-funcs
158 +
159 +DESCRIPTION="Multi-User Chat for jabberd"
160 +HOMEPAGE="https://gna.org/projects/mu-conference/"
161 +SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"
162 +
163 +LICENSE="GPL-2"
164 +KEYWORDS="~amd64 ~ppc ~sparc ~x86"
165 +SLOT="0"
166 +IUSE="mysql"
167 +
168 +RDEPEND="
169 + dev-libs/expat
170 + >=dev-libs/glib-2:2
171 + net-dns/libidn
172 + net-im/jabberd2
173 + mysql? ( virtual/mysql )"
174 +DEPEND="${RDEPEND}
175 + virtual/pkgconfig"
176 +
177 +S=${WORKDIR}/${PN}_${PV}
178 +
179 +src_prepare() {
180 + # Fix missing header in src/conference_user.c in order to
181 + # make emerge happy and avoid QA notice.
182 + sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
183 +
184 + if use mysql; then
185 + sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
186 + -e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
187 + fi
188 + sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
189 + -e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
190 + -e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
191 + sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
192 + sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
193 + sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
194 + sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
195 + tc-export CC AR RANLIB
196 +
197 + eapply_user
198 +}
199 +
200 +src_install() {
201 + dobin src/mu-conference
202 + fowners jabber:jabber /usr/bin/mu-conference
203 + fperms 750 /usr/bin/mu-conference
204 +
205 + newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
206 +
207 + dodoc ChangeLog FAQ mu-conference.sql README README.sql
208 + docinto scripts
209 + dodoc scripts/*
210 +
211 + local i
212 + for i in log spool; do
213 + dodir /var/${i}/jabber/mu-conference
214 + keepdir /var/${i}/jabber/mu-conference
215 + fowners jabber:jabber /var/${i}/jabber/mu-conference
216 + fperms 770 /var/${i}/jabber/mu-conference
217 + done
218 +
219 + insinto /etc/jabber
220 + newins muc-default.xml mu-conference.xml
221 + doins style.css
222 +
223 + sed -i \
224 + -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
225 + -e 's,./syslogs,/var/log/jabber,g' \
226 + -e 's,./logs,/var/log/jabber/mu-conference,g' \
227 + -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
228 + -e "s,../style.css,/etc/jabber/style.css,g" \
229 + -e "s,7009,5347,g" \
230 + "${D}"/etc/jabber/mu-conference.xml || die "sed failed"
231 +}
232 +
233 +pkg_postinst() {
234 + echo
235 + elog "For jabberd-2 connection:"
236 + elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
237 + elog " match the address of your jabberd router."
238 + elog "2. Set a common secret in mu-conference.xml and router.xml"
239 + echo
240 +}
241
242 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
243 new file mode 100644
244 index 0000000..8b00445
245 --- /dev/null
246 +++ b/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild
247 @@ -0,0 +1,88 @@
248 +# Copyright 1999-2016 Gentoo Foundation
249 +# Distributed under the terms of the GNU General Public License v2
250 +# $Id$
251 +
252 +EAPI=6
253 +
254 +inherit toolchain-funcs
255 +
256 +DESCRIPTION="Multi-User Chat for jabberd"
257 +HOMEPAGE="https://gna.org/projects/mu-conference/"
258 +SRC_URI="http://download.gna.org/mu-conference/${P}.tar.gz"
259 +
260 +LICENSE="GPL-2"
261 +KEYWORDS="~amd64 ~ppc ~sparc ~x86"
262 +SLOT="0"
263 +IUSE="mysql"
264 +
265 +RDEPEND="
266 + dev-libs/expat
267 + >=dev-libs/glib-2:2
268 + net-dns/libidn
269 + net-im/jabberd2
270 + mysql? ( virtual/mysql )"
271 +DEPEND="${RDEPEND}
272 + virtual/pkgconfig"
273 +
274 +src_prepare() {
275 + # Fix missing header in src/conference_user.c in order to
276 + # make emerge happy and avoid QA notice.
277 + sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
278 +
279 + if use mysql; then
280 + sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
281 + -e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
282 + fi
283 + sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
284 + -e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
285 + -e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
286 + sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
287 + sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
288 + sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
289 + sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
290 + tc-export CC AR RANLIB
291 +
292 + eapply_user
293 +}
294 +
295 +src_install() {
296 + dobin src/mu-conference
297 + fowners jabber:jabber /usr/bin/mu-conference
298 + fperms 750 /usr/bin/mu-conference
299 +
300 + newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
301 +
302 + dodoc ChangeLog FAQ mu-conference.sql README README.sql
303 + docinto scripts
304 + dodoc scripts/*
305 +
306 + local i
307 + for i in log spool; do
308 + dodir /var/${i}/jabber/mu-conference
309 + keepdir /var/${i}/jabber/mu-conference
310 + fowners jabber:jabber /var/${i}/jabber/mu-conference
311 + fperms 770 /var/${i}/jabber/mu-conference
312 + done
313 +
314 + insinto /etc/jabber
315 + newins muc-default.xml mu-conference.xml
316 + doins style.css
317 +
318 + sed -i \
319 + -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
320 + -e 's,./syslogs,/var/log/jabber,g' \
321 + -e 's,./logs,/var/log/jabber/mu-conference,g' \
322 + -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
323 + -e "s,../style.css,/etc/jabber/style.css,g" \
324 + -e "s,7009,5347,g" \
325 + "${D}"/etc/jabber/mu-conference.xml || die "sed failed"
326 +}
327 +
328 +pkg_postinst() {
329 + echo
330 + elog "For jabberd-2 connection:"
331 + elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
332 + elog " match the address of your jabberd router."
333 + elog "2. Set a common secret in mu-conference.xml and router.xml"
334 + echo
335 +}