8 files changed, 9 insertions, 390 deletions
diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 2d859c75124b..5649761215ef 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.8 2008/01/09 07:43:59 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.9 2008/03/08 15:03:33 nelchael Exp $
+
+  08 Mar 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/jabberd2-2.1.19.init, -files/jabberd2-2.1.19.pamd,
+  -files/jabberd2-2.1.20.init, -files/jabberd2-2.1.20.pamd,
+  -jabberd2-2.1.19.ebuild, -jabberd2-2.1.20.ebuild, jabberd2-2.1.21.ebuild:
+  Depend on libidn-0.6.
 
 *jabberd2-2.1.21 (09 Jan 2008)
 
diff --git a/net-im/jabberd2/files/jabberd2-2.1.19.init b/net-im/jabberd2/files/jabberd2-2.1.19.init
deleted file mode 100644
index 701fea590b72..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.1.19.init
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.1.19.init,v 1.1 2007/11/06 19:24:44 nelchael Exp $
-
-depend() {
-	need net
-	use mysql postgresql slapd
-	provide jabber-server
-}
-
-stopJabberServices() {
-
-	eindent
-	for pidfile in /var/run/jabber/*.pid; do
-		if [ -f "${pidfile}" ]; then
-			service=$(basename ${pidfile} .pid)
-			ebegin "Stopping ${service}"
-			start-stop-daemon \
-				--stop \
-				--pidfile ${pidfile}
-			eend $?
-		fi
-	done
-	eoutdent
-
-}
-
-start() {
-
-	einfo "Starting Jabber Server ..."
-	local services
-	services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
-	eindent
-	for service in ${services}; do
-
-		cfgfile=$(echo ${service} | cut -d ':' -f 2)
-		service=$(echo ${service} | cut -d ':' -f 1)
-		if [ ! -f "${cfgfile}" ]; then
-			if [ -f "/etc/jabber/${service}.xml" ]; then
-				cfgfile="/etc/jabber/${service}.xml"
-			else
-				eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
-				stopJabberServices
-				return 1
-			fi
-		fi
-
-		executable=/usr/bin/${service}
-
-		if [ ! -f "${executable}" ]; then
-			eerror "Can't find executable: ${executable}"
-			stopJabberServices
-			return 1
-		fi
-
-		ebegin "Starting ${service} (${cfgfile})"
-		start-stop-daemon \
-			--background \
-			--start  \
-			--chuid jabber:jabber \
-			--exec /usr/bin/${service} \
-			--pid /var/run/jabber/$(basename ${cfgfile%.xml}).pid \
-			-- -c ${cfgfile}
-		eend $?
-
-	done
-	eoutdent
-
-}
-
-stop() {
-
-	einfo "Stopping Jabber Server"
-	stopJabberServices
-
-}
diff --git a/net-im/jabberd2/files/jabberd2-2.1.19.pamd b/net-im/jabberd2/files/jabberd2-2.1.19.pamd
deleted file mode 100644
index 2c5a5347ad6a..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.1.19.pamd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth       required     pam_nologin.so
-auth       include      system-auth
-account    include      system-auth
-session    include      system-auth
diff --git a/net-im/jabberd2/files/jabberd2-2.1.20.init b/net-im/jabberd2/files/jabberd2-2.1.20.init
deleted file mode 100644
index 2fd4a71d5ca7..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.1.20.init
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.1.20.init,v 1.1 2008/01/08 10:26:08 nelchael Exp $
-
-depend() {
-	need net
-	use mysql postgresql slapd
-	provide jabber-server
-}
-
-stopJabberServices() {
-
-	eindent
-	for pidfile in /var/run/jabber/*.pid; do
-		if [ -f "${pidfile}" ]; then
-			service=$(basename ${pidfile} .pid)
-			ebegin "Stopping ${service}"
-			start-stop-daemon \
-				--stop \
-				--pidfile ${pidfile}
-			eend $?
-		fi
-	done
-	eoutdent
-
-}
-
-start() {
-
-	einfo "Starting Jabber Server ..."
-	local services
-	services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
-	eindent
-	for service in ${services}; do
-
-		cfgfile=$(echo ${service} | cut -d ':' -f 2)
-		service=$(echo ${service} | cut -d ':' -f 1)
-		if [ ! -f "${cfgfile}" ]; then
-			if [ -f "/etc/jabber/${service}.xml" ]; then
-				cfgfile="/etc/jabber/${service}.xml"
-			else
-				eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
-				stopJabberServices
-				return 1
-			fi
-		fi
-
-		executable=/usr/bin/${service}
-
-		if [ ! -f "${executable}" ]; then
-			eerror "Can't find executable: ${executable}"
-			stopJabberServices
-			return 1
-		fi
-
-		ebegin "Starting ${service} (${cfgfile})"
-		start-stop-daemon \
-			--background \
-			--start  \
-			--chuid jabber:jabber \
-			--exec /usr/bin/${service} \
-			--pid /var/run/jabber/$(basename ${cfgfile%.xml}).pid \
-			-- -c ${cfgfile}
-		eend $?
-
-	done
-	eoutdent
-
-}
-
-stop() {
-
-	einfo "Stopping Jabber Server"
-	stopJabberServices
-
-}
diff --git a/net-im/jabberd2/files/jabberd2-2.1.20.pamd b/net-im/jabberd2/files/jabberd2-2.1.20.pamd
deleted file mode 100644
index 2c5a5347ad6a..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.1.20.pamd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth       required     pam_nologin.so
-auth       include      system-auth
-account    include      system-auth
-session    include      system-auth
diff --git a/net-im/jabberd2/jabberd2-2.1.19.ebuild b/net-im/jabberd2/jabberd2-2.1.19.ebuild
deleted file mode 100644
index 18c81904caa1..000000000000
--- a/net-im/jabberd2/jabberd2-2.1.19.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.1.19.ebuild,v 1.2 2007/11/10 14:04:33 nelchael Exp $
-
-inherit db-use eutils pam
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd2.xiaoka.com/"
-SRC_URI="http://ftp.xiaoka.com/${PN}/releases/jabberd-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug memdebug ipv6 ldap mysql pam pipe postgres sqlite"
-
-DEPEND=">=net-im/jabber-base-0.01
-	dev-libs/expat
-	dev-libs/openssl
-	dev-libs/cyrus-sasl
-	net-dns/libidn
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-4.1.24
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( >=dev-db/sqlite-3 )
-	!net-im/jabberd"
-
-S="${WORKDIR}/jabberd-${PV}"
-
-src_compile() {
-
-	local localconf="--enable-sasl=cyrus"
-
-	# Note: no gsasl support for now, since
-	#		gsasl-0.2.14 not in portage tree.
-	#
-	#if use !gsasl; then
-	#	localconf="--enable-sasl=gsasl"
-	#fi
-
-	if use debug; then
-		localconf="${localconf} --enable-debug"
-		# --enable-pool-debug is currently broken
-		use memdebug && localconf="${localconf} --enable-nad-debug"
-	else
-		if use memdebug; then
-			ewarn
-			ewarn '"memdebug" requires "debug" enabled.'
-			ewarn
-		fi
-	fi
-
-	econf \
-		--sysconfdir=/etc/jabber \
-		--enable-db \
-		--with-extra-include-path=$(db_includedir) \
-		${localconf} \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_enable mysql) \
-		$(use_enable pam) \
-		$(use_enable pipe) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite) \
-		|| die "econf failed"
-	emake || die "make failed"
-
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	fowners jabber:jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-	fperms 750 /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-
-	newinitd "${FILESDIR}/jabberd2-${PV}.init" jabberd || die "newinitd failed"
-	newpamd "${FILESDIR}/jabberd2-${PV}.pamd" jabberd || die "newpamd failed"
-
-	dodoc AUTHORS BUGS PROTOCOL README UPGRADE
-	docinto tools
-	dodoc tools/db-setup{.mysql,-status.mysql,.pgsql,.sqlite}
-	dodoc tools/{migrate.pl,pipe-auth.pl}
-
-	cd "${D}/etc/jabber/"
-	sed -i \
-		-e 's,/var/lib/jabberd/pid/,/var/run/jabber/,g' \
-		-e 's,/var/lib/jabberd/log/,/var/log/jabber/,g' \
-		-e 's,/var/lib/jabberd/db,/var/spool/jabber/,g' \
-		*.xml *.xml.dist || die "sed failed"
-	sed -i \
-		-e 's,<module>mysql</module>,<module>db</module>,' \
-		c2s.xml* || die "sed failed"
-	sed -i \
-		-e 's,<driver>mysql</driver>,<driver>db</driver>,' \
-		sm.xml* || die "sed failed"
-
-}
-
-pkg_postinst() {
-
-	if use pam; then
-		echo
-		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
-		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
-		ewarn 'is likely to change in future versions of jabberd-2. It may'
-		ewarn 'be advisable to avoid PAM authentication for the time being.'
-		echo
-		ebeep
-	fi
-
-}
diff --git a/net-im/jabberd2/jabberd2-2.1.20.ebuild b/net-im/jabberd2/jabberd2-2.1.20.ebuild
deleted file mode 100644
index 4c44a9d1e9a6..000000000000
--- a/net-im/jabberd2/jabberd2-2.1.20.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.1.20.ebuild,v 1.1 2008/01/08 08:20:12 nelchael Exp $
-
-inherit db-use eutils pam
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd2.xiaoka.com/"
-SRC_URI="http://ftp.xiaoka.com/${PN}/releases/jabberd-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug memdebug ipv6 ldap mysql pam pipe sasl postgres sqlite"
-
-DEPEND=">=net-im/jabber-base-0.01
-	dev-libs/expat
-	dev-libs/openssl
-	>=net-misc/gsasl-0.2.14
-	net-dns/libidn
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-4.1.24
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( >=dev-db/sqlite-3 )
-	!net-im/jabberd"
-
-S="${WORKDIR}/jabberd-${PV}"
-
-src_compile() {
-
-	if use sasl; then
-		localconf="--enable-sasl=gsasl"
-	fi
-
-	if use debug; then
-		localconf="${localconf} --enable-debug"
-		# --enable-pool-debug is currently broken
-		use memdebug && localconf="${localconf} --enable-nad-debug"
-	else
-		if use memdebug; then
-			ewarn
-			ewarn '"memdebug" requires "debug" enabled.'
-			ewarn
-		fi
-	fi
-
-	econf \
-		--sysconfdir=/etc/jabber \
-		--enable-db \
-		--with-extra-include-path=$(db_includedir) \
-		${localconf} \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_enable mysql) \
-		$(use_enable pam) \
-		$(use_enable pipe) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite) \
-		|| die "econf failed"
-	emake || die "make failed"
-
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	fowners jabber:jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-	fperms 750 /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-
-	newinitd "${FILESDIR}/jabberd2-${PV}.init" jabberd || die "newinitd failed"
-	newpamd "${FILESDIR}/jabberd2-${PV}.pamd" jabberd || die "newpamd failed"
-
-	dodoc AUTHORS BUGS PROTOCOL README UPGRADE
-	docinto tools
-	dodoc tools/db-setup{.mysql,-status.mysql,.pgsql,.sqlite}
-	dodoc tools/{migrate.pl,pipe-auth.pl}
-
-	cd "${D}/etc/jabber/"
-	sed -i \
-		-e 's,/var/lib/jabberd/pid/,/var/run/jabber/,g' \
-		-e 's,/var/lib/jabberd/log/,/var/log/jabber/,g' \
-		-e 's,/var/lib/jabberd/db,/var/spool/jabber/,g' \
-		*.xml *.xml.dist || die "sed failed"
-	sed -i \
-		-e 's,<module>mysql</module>,<module>db</module>,' \
-		c2s.xml* || die "sed failed"
-	sed -i \
-		-e 's,<driver>mysql</driver>,<driver>db</driver>,' \
-		sm.xml* || die "sed failed"
-
-}
-
-pkg_postinst() {
-
-	if use pam; then
-		echo
-		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
-		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
-		ewarn 'is likely to change in future versions of jabberd-2. It may'
-		ewarn 'be advisable to avoid PAM authentication for the time being.'
-		echo
-		ebeep
-	fi
-
-}
diff --git a/net-im/jabberd2/jabberd2-2.1.21.ebuild b/net-im/jabberd2/jabberd2-2.1.21.ebuild
index 34f381040793..b48c7ffed96d 100644
--- a/net-im/jabberd2/jabberd2-2.1.21.ebuild
+++ b/net-im/jabberd2/jabberd2-2.1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.1.21.ebuild,v 1.1 2008/01/09 07:43:59 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.1.21.ebuild,v 1.2 2008/03/08 15:03:33 nelchael Exp $
 
 inherit db-use eutils pam
 
@@ -17,7 +17,7 @@ DEPEND=">=net-im/jabber-base-0.01
 	dev-libs/expat
 	dev-libs/openssl
 	>=net-misc/gsasl-0.2.14
-	net-dns/libidn
+	=net-dns/libidn-0.6*
 	ldap? ( net-nds/openldap )
 	>=sys-libs/db-4.1.24
 	pam? ( virtual/pam )