Bump to 0.7. Fixes #118113. Added ~sparc and ~amd64 keywords. Ebuild modifications by Marko Durkovic and Aiko Barz.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 122 insertions, 2 deletions

diff --git a/net-im/mu-conference/ChangeLog b/net-im/mu-conference/ChangeLog
index c6485549ac24..ecad57a5e538 100644
--- a/net-im/mu-conference/ChangeLog
+++ b/net-im/mu-conference/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/mu-conference
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v 1.21 2008/01/08 08:30:42 nelchael Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v 1.22 2009/03/01 12:17:45 patrick Exp $
+
+*mu-conference-0.7 (01 Mar 2009)
+
+  01 Mar 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/mu-conference-0.7.init, +mu-conference-0.7.ebuild:
+  Bump to 0.7. Fixes #118113. Added ~sparc and ~amd64 keywords. Ebuild
+  modifications by Marko Durkovic and Aiko Barz.
 
   08 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org>
   mu-conference-0.6.0-r1.ebuild, mu-conference-0.6.0-r2.ebuild:
diff --git a/net-im/mu-conference/files/mu-conference-0.7.init b/net-im/mu-conference/files/mu-conference-0.7.init
new file mode 100644
index 000000000000..0ac2f6357913
--- /dev/null
+++ b/net-im/mu-conference/files/mu-conference-0.7.init
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting MUC Jabber Transport"
+	start-stop-daemon \
+		--background \
+		--start  \
+		--chuid jabber:jabber \
+		--exec /usr/bin/mu-conference \
+		-- -c /etc/jabber/mu-conference.xml
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping MUC Jabber Transport"
+	start-stop-daemon \
+		--stop \
+		--pidfile /var/run/jabber/mu-conference.pid
+	eend $?
+}
diff --git a/net-im/mu-conference/mu-conference-0.7.ebuild b/net-im/mu-conference/mu-conference-0.7.ebuild
new file mode 100644
index 000000000000..c0fd9378848d
--- /dev/null
+++ b/net-im/mu-conference/mu-conference-0.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.7.ebuild,v 1.1 2009/03/01 12:17:46 patrick Exp $
+
+inherit eutils
+
+DESCRIPTION="Multi-User Chat for jabberd"
+HOMEPAGE="https://gna.org/projects/mu-conference/"
+SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+
+DEPEND="dev-libs/expat
+	>=dev-libs/glib-2
+	net-dns/libidn
+	|| ( net-im/jabberd net-im/jabberd2 )
+	mysql? ( virtual/mysql )"
+RDEPEND="${DEPEND}"
+IUSE="mysql"
+
+
+S="${WORKDIR}/${PN}_${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix missing header in src/conference_user.c in order to
+	# make emerge happy and avoid QA notice.
+	sed -i "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c
+
+	if use mysql; then
+		sed -i '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' src/Makefile
+	else
+		# Makefile is broken. Should not always link against mysql
+		sed -i 's/`mysql_config --libs`//' src/Makefile
+	fi
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe src/mu-conference
+	fowners jabber:jabber /usr/bin/mu-conference
+	fperms 750 /usr/bin/mu-conference
+
+	newinitd "${FILESDIR}/${P}".init mu-conference
+
+	dodoc ChangeLog FAQ mu-conference.sql README
+	docinto scripts
+	dodoc scripts/*
+
+	for i in log spool; do
+		dodir /var/${i}/jabber/mu-conference
+		keepdir /var/${i}/jabber/mu-conference
+		fowners jabber:jabber /var/${i}/jabber/mu-conference
+		fperms 770 /var/${i}/jabber/mu-conference
+	done
+
+	insinto /etc/jabber
+	newins muc-default.xml mu-conference.xml
+	doins style.css
+
+	cd "${D}/etc/jabber/"
+	sed -i \
+		-e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
+		-e 's,./syslogs,/var/log/jabber,g' \
+		-e 's,./logs,/var/log/jabber/mu-conference,g' \
+		-e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
+		-e "s,../style.css,/etc/jabber/style.css,g" \
+		-e "s,7009,5347,g" \
+		mu-conference.xml || die "sed failed"
+}
+
+pkg_postinst() {
+	elog
+	elog "For jabberd-2 connection:"
+	elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
+	elog "   match the address of your jabberd router."
+	elog "2. Set a common secret in mu-conference.xml and router.xml"
+	elog
+}
+