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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 126 insertions, 3 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/Manifest b/net-im/mu-conference/Manifest
index 7f03617afad6..52d11a315cdb 100644
--- a/net-im/mu-conference/Manifest
+++ b/net-im/mu-conference/Manifest
@@ -1,11 +1,14 @@
 AUX README.Gentoo 1483 RMD160 f3f059fc9789e4b162485f72f43dd788418cdb24 SHA1 6131ff6d57cff11ae1d875bf983d71decbf74ebc SHA256 36efdb71c2d68941fe1d26c5989064a9ed18d91e6bfd83ae884e9088a17b6159
+AUX mu-conference-0.7.init 410 RMD160 56d96e68d1715beecf6e695f8a1d9d484291cd65 SHA1 8e5c152ba6afd1138ecc208f0de96232c28e3e1a SHA256 ab08f29e14514d3705c83a7149629b2081140d7ef2f27ff49e4ca58c94742c07
 AUX mu-conference-conf.d 435 RMD160 e195766105473e83969bd9ed9de4e37dacc19baa SHA1 b77c8b806a882df5a58c26804848a9a927aae77c SHA256 d1c13df4fe3be4cb15b830f4b5935fc51d0a09e827e99225ae189fafdbc7e741
 AUX mu-conference-makefile.patch 430 RMD160 ca5d8b9b8a12616c1b35dae285367e99d982e9aa SHA1 d7ad1db101b9b014e33511be7c84e697a6052841 SHA256 58e36385215a1da9278a914939e807c5379b0960cae645ac8f288e9d29dd93d3
 AUX muc-transport.init 529 RMD160 b9b4f46012ee5e83a4772666432ec884ce14361c SHA1 d70825a0c1397dc2877f633d496b1fbcc74be6e1 SHA256 d4f772a6c94bc19ea45b3cb6e6a92f9ac26ccddb344112053485fb0db606e9bf
 AUX muc-transport.init-r2 532 RMD160 8cfa94e0e0510044bddd07bcabcac979d45735e0 SHA1 cd6424c1a2bf8c7a1e636ba0cb9a7ff482bedb15 SHA256 359b28c8218c5f26154d2ca051031c1d37cfb36e55de8a3d71f67d66893bdab2
 AUX muctrans.xml 908 RMD160 b2ddb59e7a85651b2478b717cf5182d326f2d857 SHA1 581cdb5badb9652d99b9717b034e2a4afa534599 SHA256 66b653cc18a1738520cd012e2d71079724a34d1f84e4c3aad5e9b84d485fc6aa
 DIST mu-conference-0.6.0.tar.gz 56272 RMD160 58b9bf9354a67dda3b8f5569dfb15f47d9509f14 SHA1 cc81619378a86c6c449c4122586c353102d4876e SHA256 9cc4d95f9dd8f658f174a156b768c64e0b2f30646acdd1915e97e3d1ac8c1466
+DIST mu-conference_0.7.tar.gz 112381 RMD160 82a02434414ec3eb925959401b5c847912088e6b SHA1 eb8e21f708587a02042f425a814db6fff6e0ba7e SHA256 914d7e5cf45c50e3eaae77d03d895211d332f85469f4a70adaf7209917d27a35
 EBUILD mu-conference-0.6.0-r1.ebuild 1333 RMD160 1973b6dba5309d95f1c0e8f0a6e75720d3a7a49a SHA1 3e7f8cf1fee43d83838729bfe15a1b60d3c8b679 SHA256 092df382428a16a33807d975905fe70544dbfbd90024cd6a5eba433e831ec297
 EBUILD mu-conference-0.6.0-r2.ebuild 1400 RMD160 ca6c3a87f539960dc264c702c73d5f07dcc9ea57 SHA1 ece455610b9a053cffe3f59ca396e877a2c663a3 SHA256 9b5580969e1d0c938617f0a507f3e6c17de0106486e68b5649d15b6f5ca53905
-MISC ChangeLog 3633 RMD160 3309f38773497a867499027e04bb34bdfe58ea1e SHA1 39d3a184422d2eb8f4bd82b1e6512b544186e15f SHA256 c868663bcaea9dfa6a91e1ede053c329e2e6a1006050bba6037b4d71013eb95e
+EBUILD mu-conference-0.7.ebuild 2305 RMD160 a8ad1feaab64a7feb75b0465915997131c874a5b SHA1 143832648815a33625a09ad926e61a4da950d48c SHA256 4906cdc5106290864376c74d8c38a0e9c66b4570ed8cef8e06754a852a1bf39d
+MISC ChangeLog 3897 RMD160 7201468932448b3055e8e2a42cded389f1497d9f SHA1 4930be04db224d22b3e7d80d58f0413b923cf1e3 SHA256 ed8924d41864905265213860ad7aa02c275b7fb087a7ce7512fcbda291e0aa28
 MISC metadata.xml 327 RMD160 90686b32e6e8835705fe333f2533c8e15c9c1930 SHA1 99b87664ee46ceb893992ed226fd3cc20af79474 SHA256 a03303ac64697f0f97f778659abc42c14916aa3c9aae9282d5415c98373f4b97
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
+}
+