diff -uNr /usr/portage/net-im/mu-conference/Manifest /usr/local/portage/net-im/mu-conference/Manifest
--- /usr/portage/net-im/mu-conference/Manifest	2004-07-08 19:36:15.000000000 +0200
+++ /usr/local/portage/net-im/mu-conference/Manifest	2004-08-31 22:53:58.000000000 +0200
@@ -1,12 +1,12 @@
+MD5 fe89e429e85eeb6c28d3fd2e76fcd82f mu-conference-0.6.0-r2.ebuild 1324
+MD5 fd5e5272dca1912c7caab94b217d27a8 mu-conference-0.6.0-r1.ebuild 1362
 MD5 efea36a1a1c1e12ae46249b75711fe9b ChangeLog 2906
 MD5 5d032797cb26e7105194d6156f0dae09 metadata.xml 327
-MD5 fd5e5272dca1912c7caab94b217d27a8 mu-conference-0.6.0-r1.ebuild 1362
-MD5 63d5ac8cd8b654555a7be33f16a5be0f mu-conference-0.6.0-r2.ebuild 1449
-MD5 95d0e1126a3c7d35a21f43cd01095323 files/README.Gentoo 1483
-MD5 48afbfebeba7df894e0b4fed629e22eb files/muc-transport.init-r2 532
+MD5 fe7a249c39d9046180aee62459ed6c82 files/mu-conference-conf.d 435
 MD5 f88abce484cd1607dc473ea266ea57f9 files/digest-mu-conference-0.6.0-r1 70
+MD5 eaf08596bf13d647d0bfe12ce36318c4 files/digest-mu-conference-0.6.0-r2 131
+MD5 48afbfebeba7df894e0b4fed629e22eb files/muc-transport.init-r2 532
+MD5 5d92cc782339ac08100c8a4068f24b92 files/muctrans.xml 908
 MD5 34c298326722258d9f0ad798afb32cb1 files/mu-conference-makefile.patch 430
+MD5 95d0e1126a3c7d35a21f43cd01095323 files/README.Gentoo 1483
 MD5 34f38216da5355bb7d24145b50d39bfd files/muc-transport.init 529
-MD5 5d92cc782339ac08100c8a4068f24b92 files/muctrans.xml 908
-MD5 fe7a249c39d9046180aee62459ed6c82 files/mu-conference-conf.d 435
-MD5 f88abce484cd1607dc473ea266ea57f9 files/digest-mu-conference-0.6.0-r2 70
diff -uNr /usr/portage/net-im/mu-conference/files/digest-mu-conference-0.6.0-r2 /usr/local/portage/net-im/mu-conference/files/digest-mu-conference-0.6.0-r2
--- /usr/portage/net-im/mu-conference/files/digest-mu-conference-0.6.0-r2	2004-07-08 18:31:40.000000000 +0200
+++ /usr/local/portage/net-im/mu-conference/files/digest-mu-conference-0.6.0-r2	2004-08-31 22:53:58.000000000 +0200
@@ -1 +1,2 @@
 MD5 e97433bf4a978329d639ce872bee3223 mu-conference-0.6.0.tar.gz 56272
+MD5 f88bcc4a8347fd1dd8ca50dff50341f3 jcr-0.2.4.tar.gz 128939
diff -uNr /usr/portage/net-im/mu-conference/files/mu-conference-conf.d /usr/local/portage/net-im/mu-conference/files/mu-conference-conf.d
--- /usr/portage/net-im/mu-conference/files/mu-conference-conf.d	2004-07-08 19:36:16.000000000 +0200
+++ /usr/local/portage/net-im/mu-conference/files/mu-conference-conf.d	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/files/mu-conference-conf.d,v 1.4 2004/07/08 17:35:01 humpback Exp $
-
-CONFIG="/etc/jabber/muctrans.xml"
-
-#Need to find a way to fix the "double" expansion 
-#PIDFILE= grep pid ${CONFIG} | sed -e 's/<[^>]*>//g' | sed s/' '//g
-PIDFILE="/var/log/jabber/muctrans.pid"
diff -uNr /usr/portage/net-im/mu-conference/files/mu-conference-conf.d-jabber14 /usr/local/portage/net-im/mu-conference/files/mu-conference-conf.d-jabber14
--- /usr/portage/net-im/mu-conference/files/mu-conference-conf.d-jabber14	1970-01-01 01:00:00.000000000 +0100
+++ /usr/local/portage/net-im/mu-conference/files/mu-conference-conf.d-jabber14	2004-07-08 19:36:16.000000000 +0200
@@ -0,0 +1,9 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/files/mu-conference-conf.d,v 1.4 2004/07/08 17:35:01 humpback Exp $
+
+CONFIG="/etc/jabber/muctrans.xml"
+
+#Need to find a way to fix the "double" expansion 
+#PIDFILE= grep pid ${CONFIG} | sed -e 's/<[^>]*>//g' | sed s/' '//g
+PIDFILE="/var/log/jabber/muctrans.pid"
diff -uNr /usr/portage/net-im/mu-conference/files/mu-conference-conf.d-jabber2 /usr/local/portage/net-im/mu-conference/files/mu-conference-conf.d-jabber2
--- /usr/portage/net-im/mu-conference/files/mu-conference-conf.d-jabber2	1970-01-01 01:00:00.000000000 +0100
+++ /usr/local/portage/net-im/mu-conference/files/mu-conference-conf.d-jabber2	2004-09-08 13:25:05.000000000 +0200
@@ -0,0 +1,8 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+CONFIG="/etc/jabberd/muc-jcr.xml"
+
+#Need to find a way to fix the "double" expansion 
+#PIDFILE= grep pid ${CONFIG} | sed -e 's/<[^>]*>//g' | sed s/' '//g
+PIDFILE="/var/jabberd/pid/muctrans.pid"
diff -uNr /usr/portage/net-im/mu-conference/files/muc-jcr.xml /usr/local/portage/net-im/mu-conference/files/muc-jcr.xml
--- /usr/portage/net-im/mu-conference/files/muc-jcr.xml	1970-01-01 01:00:00.000000000 +0100
+++ /usr/local/portage/net-im/mu-conference/files/muc-jcr.xml	2004-09-01 00:15:33.000000000 +0200
@@ -0,0 +1,44 @@
+<jcr>
+  <!--
+       This is a config file for a copy of MU-Conference, compiled against
+       the Jabber Component Runtime (JCR). This is the same file that I use
+       to connect to my development server, running jabberd2 beta2
+
+       In order to connect to a jabberd v1.4 server, simply change the
+       <name> value to muclinker, and make sure the muclinker section is in
+       your main jabber.xml file, as per the MU-Conference README file.
+  -->
+
+  <name>conference.localhost</name>
+  <host>conference.localhost</host>
+  <ip>localhost</ip>
+  <port>5347</port>
+  <secret>s621!asd</secret>
+
+  <spool>/var/jabberd/spool/conference</spool>
+  <logdir>/var/jabberd/log/conference</logdir>
+  <pidfile>/var/jabberd/pid/muctrans.pid</pidfile>
+  <!--
+     <logstderr/>
+  -->
+  <loglevel>124</loglevel>
+
+    <conference xmlns="jabber:config:conference">
+      <public/>
+      <vCard>
+        <FN>Public Chatrooms</FN>
+        <DESC>This service is for public chatrooms.</DESC>
+        <URL>http://conferece.localhost/</URL>
+      </vCard>
+      <history>40</history>
+      <logdir>/var/jabberd/log/conference/</logdir>
+      <notice>
+        <join>has become available</join>
+        <leave>has left</leave>
+        <rename>is now known as</rename>
+      </notice>
+      <sadmin>
+        <user>admin@jabber.localhost</user>
+      </sadmin>
+    </conference>
+</jcr>
diff -uNr /usr/portage/net-im/mu-conference/files/muc-transport-jcr.init /usr/local/portage/net-im/mu-conference/files/muc-transport-jcr.init
--- /usr/portage/net-im/mu-conference/files/muc-transport-jcr.init	1970-01-01 01:00:00.000000000 +0100
+++ /usr/local/portage/net-im/mu-conference/files/muc-transport-jcr.init	2004-09-01 00:12:51.000000000 +0200
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting MUC Jabber Transport"
+	mu-conference -c /etc/jabberd/muc-jcr.xml &>/dev/null 2>&1 &
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping MUC Jabber Transport"
+	if [ -f /var/jabberd/pid/muctrans.pid ]; then
+		kill `cat /var/jabberd/pid/muctrans.pid`
+	fi
+	sleep 2
+	if [ -f /var/jabberd/pid/muctrans.pid ]; then
+		kill -9 `cat /var/jabberd/pid/muctrans.pid`
+		rm -f /var/jabberd/pid/muctrans.pid
+	fi
+	rm -f /var/jabberd/pid/muctrans.pid
+	eend $?
+}
diff -uNr /usr/portage/net-im/mu-conference/files/muc-transport.init-r3 /usr/local/portage/net-im/mu-conference/files/muc-transport.init-r3
--- /usr/portage/net-im/mu-conference/files/muc-transport.init-r3	1970-01-01 01:00:00.000000000 +0100
+++ /usr/local/portage/net-im/mu-conference/files/muc-transport.init-r3	2004-09-08 13:20:32.000000000 +0200
@@ -0,0 +1,57 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting MUC Jabber Transport"
+	
+	if [ "${JABBERD}" = "jabberd14" ]
+		then
+		if [ -f ${PIDFILE} ]; then
+			if [ -z $(ps ax | grep `cat ${PIDFILE}` | grep -v grep ) ]
+			then
+				rm -f ${PIDFILE}
+			fi
+		fi
+	
+		jabberd -B -c ${CONFIG} -H /var/spool/jabber >/dev/null 2>&1
+	else
+		mu-conference -c ${CONFIG} &>/dev/null 2>&1 &
+	fi
+	
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping MUC Jabber Transport"
+	
+	if [ "${JABBERD}" = "jabberd14" ]
+	then
+		if [ -f ${PIDFILE} ]; then
+			kill `cat ${PIDFILE}`
+		fi
+		sleep 2
+		if [ -f ${PIDFILE} ]; then
+			kill -9 `cat ${PIDFILE}`
+			rm -f ${PIDFILE}
+		fi
+		rm -f ${PIDFILE}
+	else
+		if [ -f ${PIDFILE} ]; then
+			kill `cat ${PIDFILE}`
+		fi
+		sleep 2
+		if [ -f ${PIDFILE} ]; then
+			kill -9 `cat ${PIDFILE}`
+			rm -f ${PIDFILE}
+		fi
+		rm -f ${PIDFILE}	
+	fi
+	
+	eend $?
+}
diff -uNr /usr/portage/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild /usr/local/portage/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild
--- /usr/portage/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild	2004-07-08 18:31:40.000000000 +0200
+++ /usr/local/portage/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild	2004-09-08 13:24:16.000000000 +0200
@@ -1,54 +1,103 @@
-# Copyright 1999-2004 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.6.0-r2.ebuild,v 1.5 2004/07/08 16:31:40 humpback Exp $
 
 inherit eutils
 
+JCR_VERSION="0.2.4"
+
 DESCRIPTION="Multi-User Chat for jabberd"
 HOMEPAGE="http://mu-conference.jabberstudio.org/"
-SRC_URI="http://www.jabberstudio.org/files/mu-conference/${P}.tar.gz"
+SRC_URI="http://www.jabberstudio.org/files/mu-conference/${P}.tar.gz
+		jabber2? http://jabber.terrapin.com/JCR/jcr-${JCR_VERSION}.tar.gz
+		"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 ~sparc ~ppc"
 SLOT="0"
 
-DEPEND="=net-im/jabberd-1.4*
+IUSE="jabber2"
+
+DEPEND="jabber2? ( >=net-im/jabberd-2* )
+		!jabber2? ( >=net-im/jabberd-1.4* )
 		>=dev-libs/glib-2.2.1"
 
-IUSE=""
+if use jabber2; then
+	S=${WORKDIR}/jcr-${JCR_VERSION}
+else
+	S=${WORKDIR}/${P}
+fi
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	epatch ${FILESDIR}/mu-conference-makefile.patch
+	if use jabber2; then
+		unpack jcr-${JCR_VERSION}.tar.gz
+		cd jcr-${JCR_VERSION}
+		unpack ${P}.tar.gz
+	else
+		unpack ${A}
+		cd ${S}/src
+		epatch ${FILESDIR}/mu-conference-makefile.patch
+	fi
 }
 
 src_compile() {
-	emake || die
+	if use jabber2; then
+		emake || die
+		cp src/main.c src/jcomp.mk ${P}/src || die
+		cd ${P}/src
+		emake -f jcomp.mk || die
+	else
+		emake || die
+	fi
+	
 }
 
 src_install() {
-	dodir /etc/jabber /usr/lib/jabberd /var/log/jabber/conference
-	keepdir /var/log/jabber/conference/
-
-	insinto /usr/lib/jabberd
-	doins src/mu-conference.so
-
-	insinto /etc/jabber
-	doins  ${FILESDIR}/muctrans.xml
 
-	insinto /etc/conf.d ; newins ${FILESDIR}/mu-conference-conf.d muc-transport
+	if use jabber2; then
+		dodir /etc/jabberd /usr/bin
+		
+		exeinto /usr/bin
+		doexe ${P}/src/mu-conference
+		
+		dodir  /var/jabberd/log/conference
+		keepdir /var/jabberd/log/conference/
+
+		fowners jabber:jabber /var/jabberd/log/conference
+		fperms g-x /var/jabberd/log/conference
+		fperms g+rw /var/jabberd/log/conference
+		
+		dodir  /var/jabberd/spool/conference
+		keepdir /var/jabberd/spool/conference/
+
+		insinto /etc/jabberd
+		doins  ${FILESDIR}/muc-jcr.xml || die		
+		
+		dodoc README.jcr
+		
+		insinto /etc/conf.d 
+		newins ${FILESDIR}/mu-conference-conf.d-jabber14 muc-transport || die
+	else
+		dodir /etc/jabber /usr/lib/jabberd
+		
+		insinto /usr/lib/jabberd
+		doins src/mu-conference.so || die
+		
+		dodir  /var/log/jabber/conference
+		keepdir /var/log/jabber/conference/
+
+		fowners jabber:jabber /var/log/jabber/conference
+		fperms g-x /var/log/jabber/conference
+		fperms g+rw /var/log/jabber/conference
+		
+		insinto /etc/jabber
+		doins  ${FILESDIR}/muctrans.xml || die		
+		
+		insinto /etc/conf.d 
+		newins ${FILESDIR}/mu-conference-conf.d-jabber2 muc-transport || die		
+	fi
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/muc-transport.init-r2 muc-transport
-
-	dodoc README FAQ README.jcr ${FILESDIR}/README.Gentoo
-
-	fowners jabber:jabber /var/log/jabber/conference
-
-	fperms g-x /var/log/jabber/conference
-
-	fperms g+rw /var/log/jabber/conference
+	newexe ${FILESDIR}/muc-transport.init-r3 muc-transport
+	
+	dodoc README FAQ ${FILESDIR}/README.Gentoo
 }
 
 pkg_postinst() {