Version bump, bug #265341 thank candrews for report and Vadim Efimov for this work.

(Portage version: 2.2_rc28/cvs/Linux i686)

19 files changed, 200 insertions, 341 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 6dc7b7ca7e85..96d7993469ff 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.54 2009/03/28 08:16:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.55 2009/04/09 05:40:39 pva Exp $
+
+*ejabberd-2.0.5 (09 Apr 2009)
+
+  09 Apr 2009; Peter Volkov <pva@gentoo.org> -files/ejabberd-2.0.1.confd,
+  -files/ejabberd-2.0.1.initd, -files/ejabberd-wrapper-2.0.1.template,
+  -files/ejabberdctl-wrapper-2.0.1.template, -files/ejabberd-2.0.2.confd,
+  -files/ejabberd-2.0.2.initd, -files/ejabberd-wrapper-2.0.2.template,
+  -files/ejabberdctl-wrapper-2.0.2.template, -files/ejabberd-2.0.4.confd,
+  -files/ejabberd-2.0.4.initd, -files/ejabberd-wrapper-2.0.4.template,
+  -files/ejabberdctl-wrapper-2.0.4.template, +files/ejabberd-2.confd,
+  +files/ejabberd-2.initd, +files/ejabberd-wrapper-2.template,
+  +files/ejabberdctl-wrapper-2.template, ejabberd-2.0.1_p2-r1.ebuild,
+  ejabberd-2.0.2.ebuild, ejabberd-2.0.2-r1.ebuild, ejabberd-2.0.4.ebuild,
+  ejabberd-2.0.4-r1.ebuild, +ejabberd-2.0.5.ebuild:
+  Version bump, bug #265341 thank candrews for report and Vadim Efimov for
+  this work.
 
 *ejabberd-2.0.4-r1 (28 Mar 2009)
 
diff --git a/net-im/ejabberd/ejabberd-2.0.1_p2-r1.ebuild b/net-im/ejabberd/ejabberd-2.0.1_p2-r1.ebuild
index 32b39ce36f21..44e77f741e9a 100644
--- a/net-im/ejabberd/ejabberd-2.0.1_p2-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-2.0.1_p2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.1_p2-r1.ebuild,v 1.4 2008/07/27 22:51:49 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.1_p2-r1.ebuild,v 1.5 2009/04/09 05:40:39 pva Exp $
 
 inherit eutils multilib
 
@@ -103,21 +103,21 @@ src_install() {
 	dohtml *.{html,png}
 
 	# set up /usr/sbin/ejabberd wrapper
-	cat "${FILESDIR}/ejabberd-wrapper-${MY_PV}.template" \
+	cat "${FILESDIR}/ejabberd-wrapper-2.template" \
 		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
 		> "${T}/ejabberd"
 	exeinto /usr/sbin
 	doexe "${T}/ejabberd"
 
 	# set up /usr/sbin/ejabberdctl wrapper
-	cat "${FILESDIR}/ejabberdctl-wrapper-${MY_PV}.template" \
+	cat "${FILESDIR}/ejabberdctl-wrapper-2.template" \
 		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
 		> "${T}/ejabberdctl"
 	doexe "${T}/ejabberdctl"
 
 	dodir /var/lib/ejabberd
-	newinitd "${FILESDIR}/${MY_P}.initd" ${PN}
-	newconfd "${FILESDIR}/${MY_P}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-2.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}-2.confd" ${PN}
 
 	# fix up the ssl cert paths in /etc/jabber/ejabberd.cfg to use the cert
 	# that would be generated by /etc/jabber/self-cert.sh
diff --git a/net-im/ejabberd/ejabberd-2.0.2-r1.ebuild b/net-im/ejabberd/ejabberd-2.0.2-r1.ebuild
index ed482d456c94..4857fc50ac7f 100644
--- a/net-im/ejabberd/ejabberd-2.0.2-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2-r1.ebuild,v 1.1 2009/02/01 09:47:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2-r1.ebuild,v 1.2 2009/04/09 05:40:39 pva Exp $
 
 inherit eutils multilib
 
@@ -101,21 +101,21 @@ src_install() {
 	dohtml *.{html,png}
 
 	# set up /usr/sbin/ejabberd wrapper
-	cat "${FILESDIR}/ejabberd-wrapper-${MY_PV}.template" \
+	cat "${FILESDIR}/ejabberd-wrapper-2.template" \
 		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
 		> "${T}/ejabberd"
 	exeinto /usr/sbin
 	doexe "${T}/ejabberd"
 
 	# set up /usr/sbin/ejabberdctl wrapper
-	cat "${FILESDIR}/ejabberdctl-wrapper-${MY_PV}.template" \
+	cat "${FILESDIR}/ejabberdctl-wrapper-2.template" \
 		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
 		> "${T}/ejabberdctl"
 	doexe "${T}/ejabberdctl"
 
 	dodir /var/lib/ejabberd
-	newinitd "${FILESDIR}/${MY_P}.initd" ${PN}
-	newconfd "${FILESDIR}/${MY_P}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-2.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}-2.confd" ${PN}
 
 	# fix up the ssl cert paths in /etc/jabber/ejabberd.cfg to use the cert
 	# that would be generated by /etc/jabber/self-cert.sh
diff --git a/net-im/ejabberd/ejabberd-2.0.2.ebuild b/net-im/ejabberd/ejabberd-2.0.2.ebuild
index 5e78cce53609..78b593e2d219 100644
--- a/net-im/ejabberd/ejabberd-2.0.2.ebuild
+++ b/net-im/ejabberd/ejabberd-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild,v 1.3 2009/02/01 09:47:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild,v 1.4 2009/04/09 05:40:39 pva Exp $
 
 inherit eutils multilib
 
@@ -101,21 +101,21 @@ src_install() {
 	dohtml *.{html,png}
 
 	# set up /usr/sbin/ejabberd wrapper
-	cat "${FILESDIR}/ejabberd-wrapper-${MY_PV}.template" \
+	cat "${FILESDIR}/ejabberd-wrapper-2.template" \
 		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
 		> "${T}/ejabberd"
 	exeinto /usr/sbin
 	doexe "${T}/ejabberd"
 
 	# set up /usr/sbin/ejabberdctl wrapper
-	cat "${FILESDIR}/ejabberdctl-wrapper-${MY_PV}.template" \
+	cat "${FILESDIR}/ejabberdctl-wrapper-2.template" \
 		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
 		> "${T}/ejabberdctl"
 	doexe "${T}/ejabberdctl"
 
 	dodir /var/lib/ejabberd
-	newinitd "${FILESDIR}/${MY_P}.initd" ${PN}
-	newconfd "${FILESDIR}/${MY_P}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-2.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}-2.confd" ${PN}
 
 	# fix up the ssl cert paths in /etc/jabber/ejabberd.cfg to use the cert
 	# that would be generated by /etc/jabber/self-cert.sh
diff --git a/net-im/ejabberd/ejabberd-2.0.4-r1.ebuild b/net-im/ejabberd/ejabberd-2.0.4-r1.ebuild
index 3a918707fbf1..760cb591466e 100644
--- a/net-im/ejabberd/ejabberd-2.0.4-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-2.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.4-r1.ebuild,v 1.1 2009/03/28 08:16:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.4-r1.ebuild,v 1.2 2009/04/09 05:40:39 pva Exp $
 
 inherit eutils multilib
 
@@ -103,21 +103,21 @@ src_install() {
 	dohtml *.{html,png}
 
 	# set up /usr/sbin/ejabberd wrapper
-	cat "${FILESDIR}/ejabberd-wrapper-${MY_PV}.template" \
+	cat "${FILESDIR}/ejabberd-wrapper-2.template" \
 		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
 		> "${T}/ejabberd"
 	exeinto /usr/sbin
 	doexe "${T}/ejabberd"
 
 	# set up /usr/sbin/ejabberdctl wrapper
-	cat "${FILESDIR}/ejabberdctl-wrapper-${MY_PV}.template" \
+	cat "${FILESDIR}/ejabberdctl-wrapper-2.template" \
 		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
 		> "${T}/ejabberdctl"
 	doexe "${T}/ejabberdctl"
 
 	dodir /var/lib/ejabberd
-	newinitd "${FILESDIR}/${MY_P}.initd" ${PN}
-	newconfd "${FILESDIR}/${MY_P}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-2.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}-2.confd" ${PN}
 
 	# fix up the ssl cert paths in /etc/jabber/ejabberd.cfg to use the cert
 	# that would be generated by /etc/jabber/self-cert.sh
diff --git a/net-im/ejabberd/ejabberd-2.0.4.ebuild b/net-im/ejabberd/ejabberd-2.0.4.ebuild
index bf1fe1a3d97c..6777ecffb130 100644
--- a/net-im/ejabberd/ejabberd-2.0.4.ebuild
+++ b/net-im/ejabberd/ejabberd-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.4.ebuild,v 1.2 2009/03/23 21:25:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.4.ebuild,v 1.3 2009/04/09 05:40:39 pva Exp $
 
 inherit eutils multilib
 
@@ -102,21 +102,21 @@ src_install() {
 	dohtml *.{html,png}
 
 	# set up /usr/sbin/ejabberd wrapper
-	cat "${FILESDIR}/ejabberd-wrapper-${MY_PV}.template" \
+	cat "${FILESDIR}/ejabberd-wrapper-2.template" \
 		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
 		> "${T}/ejabberd"
 	exeinto /usr/sbin
 	doexe "${T}/ejabberd"
 
 	# set up /usr/sbin/ejabberdctl wrapper
-	cat "${FILESDIR}/ejabberdctl-wrapper-${MY_PV}.template" \
+	cat "${FILESDIR}/ejabberdctl-wrapper-2.template" \
 		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
 		> "${T}/ejabberdctl"
 	doexe "${T}/ejabberdctl"
 
 	dodir /var/lib/ejabberd
-	newinitd "${FILESDIR}/${MY_P}.initd" ${PN}
-	newconfd "${FILESDIR}/${MY_P}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-2.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}-2.confd" ${PN}
 
 	# fix up the ssl cert paths in /etc/jabber/ejabberd.cfg to use the cert
 	# that would be generated by /etc/jabber/self-cert.sh
diff --git a/net-im/ejabberd/ejabberd-2.0.5.ebuild b/net-im/ejabberd/ejabberd-2.0.5.ebuild
new file mode 100644
index 000000000000..0abc37923863
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-2.0.5.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.5.ebuild,v 1.1 2009/04/09 05:40:39 pva Exp $
+
+inherit eutils multilib
+
+JABBER_ETC="/etc/jabber"
+JABBER_RUN="/var/run/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+JABBER_LOG="/var/log/jabber"
+
+MY_PV=${PV}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://www.ejabberd.im/"
+SRC_URI="http://www.process-one.net/downloads/ejabberd/${PV}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug mod_irc mod_muc mod_pubsub ldap odbc pam ssl web zlib"
+
+DEPEND=">=net-im/jabber-base-0.01
+	>=dev-libs/expat-1.95
+	>=dev-lang/erlang-11.2.5
+	odbc? ( dev-db/unixODBC )
+	ldap? ( =net-nds/openldap-2* )
+	ssl? ( >=dev-libs/openssl-0.9.8e )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+PROVIDE="virtual/jabber-server"
+
+S=${WORKDIR}/${MY_P}/src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# get rid of the prefix
+	sed -i -e "s/\\@prefix\\@//" "${S}/Makefile.in" \
+		|| die "cannot sed Makefile.in"
+	# we want ejabberdctl in /usr/sbin not /sbin !!!
+	sed -i -e "s/\\/sbin/\\/usr\\/sbin/" "${S}/Makefile.in" \
+		|| die "cannot sed Makefile.in"
+}
+
+src_compile() {
+		econf --prefix=/ \
+		$(use_enable mod_irc) \
+		$(use_enable ldap eldap) \
+		$(use_enable mod_muc) \
+		$(use_enable mod_pubsub) \
+		$(use_enable ssl tls) \
+		$(use_enable web) \
+		$(use_enable odbc) \
+		$(use_enable zlib ejabberd_zlib) \
+		$(use_enable pam) \
+		|| die "econf failed"
+
+	if useq debug; then
+		emake ejabberd_debug=true || die "compiling ejabberd core failed"
+	else
+		emake || die "compiling ejabberd core failed"
+	fi
+}
+
+src_install() {
+	make \
+		DESTDIR="${D}" \
+		EJABBERDDIR="${D}/usr/$(get_libdir)/erlang/lib/${P}" \
+		ETCDIR="${D}${JABBER_ETC}" \
+		LOGDIR="${D}${JABBER_LOG}" \
+		install || die "install failed"
+
+	# remove the default ejabberdctl as we use our own
+	rm "${D}/sbin/ejabberdctl"
+
+	insinto ${JABBER_ETC}
+
+	chown -R jabber:jabber "${D}${JABBER_ETC}"
+	chown -R jabber:jabber "${D}${JABBER_LOG}"
+	chown -R jabber:jabber "${D}/usr/$(get_libdir)/erlang/lib/${P}"
+
+	if useq ssl ; then
+		doins "${FILESDIR}/ssl.cnf"
+		newins "${FILESDIR}/self-cert-v2.sh" self-cert.sh
+	fi
+
+	# Pam helper module permissions
+	# http://www.process-one.net/docs/ejabberd/guide_en.html
+	if useq pam; then
+		chown root:jabber "${D}"/usr/lib/erlang/lib/${P}/priv/bin/epam
+		chmod 4750 "${D}"/usr/lib/erlang/lib/${P}/priv/bin/epam
+	fi
+
+	cd "${WORKDIR}/${MY_P}/doc"
+	dodoc "release_notes_${MY_PV}.txt"
+	dohtml *.{html,png}
+
+	# set up /usr/sbin/ejabberd wrapper
+	cat "${FILESDIR}/ejabberd-wrapper-2.template" \
+		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
+		> "${T}/ejabberd"
+	exeinto /usr/sbin
+	doexe "${T}/ejabberd"
+
+	# set up /usr/sbin/ejabberdctl wrapper
+	cat "${FILESDIR}/ejabberdctl-wrapper-2.template" \
+		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
+		> "${T}/ejabberdctl"
+	doexe "${T}/ejabberdctl"
+
+	dodir /var/lib/ejabberd
+	newinitd "${FILESDIR}/${PN}-2.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}-2.confd" ${PN}
+
+	# fix up the ssl cert paths in /etc/jabber/ejabberd.cfg to use the cert
+	# that would be generated by /etc/jabber/self-cert.sh
+	sed -i -e "s/\/path\/to\/ssl.pem/\/etc\/jabber\/ssl.pem/g" \
+		"${D}${JABBER_ETC}/ejabberd.cfg" || die "Cannot sed ejabberd.cfg"
+
+	# if mod_irc is not enabled, comment out the mod_irc in the default
+	# ejabberd.cfg
+	if ! use mod_irc; then
+		sed -i -e "s/{mod_irc,/%{mod_irc,/" \
+			"${D}${JABBER_ETC}/ejabberd.cfg" || die "Cannot sed ejabberd.cfg"
+	fi
+}
+
+pkg_postinst() {
+	elog "For configuration instructions, please see"
+	elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
+	elog "http://www.process-one.net/en/projects/ejabberd/docs/guide_en.html"
+	if useq ssl ; then
+		if [ ! -e /etc/jabber/ssl.pem ]; then
+			elog "Please edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh"
+			elog "Ejabberd may refuse to start without an SSL certificate"
+		fi
+	fi
+	if ! useq web ; then
+		elog "The web USE flag is off, this has disabled the web admin interface."
+	fi
+	elog "===================================================================="
+	elog 'Quick Start Guide:'
+	elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 89'
+	elog '   {hosts, ["localhost", "thehost"]}.'
+	elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 324'
+	elog '   {acl, admin, {user, "theadmin", "thehost"}}.'
+	elog '3) Start the server'
+	elog '   # /etc/init.d/ejabberd start'
+	elog '4) Register the admin user'
+	elog '   # /usr/sbin/ejabberdctl register theadmin thehost thepassword'
+	elog '5) Log in with your favourite jabber client or using the web admin'
+}
diff --git a/net-im/ejabberd/files/ejabberd-2.0.1.initd b/net-im/ejabberd/files/ejabberd-2.0.1.initd
deleted file mode 100644
index 3a1905ae2056..000000000000
--- a/net-im/ejabberd/files/ejabberd-2.0.1.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.1.initd,v 1.3 2009/03/27 19:40:57 hanno Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use dns
-	need net
-	provide jabber-server
-}
-
-checkconfig() {
-	if [ ! -e /etc/jabber/ejabberd.cfg ] ; then
-		eerror "You need a /etc/jabber/ejabberd.cfg file to run ejabberd"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ejabberd"
-	# the process name of beam is different depending whether smp is used.
-	# set it explicitly so start-stop-daemon works
-	case "$HAVE_SMP" in
-		"1"|"true"|"yes")
-			BEAMNAME="beam.smp"
-			SMPOPT="auto"
-		;;
-		*)
-			BEAMNAME="beam"
-			SMPOPT="disable"
-		;;
-	esac
-	cd /var/lib/ejabberd
-	start-stop-daemon --start --quiet --chuid jabber:jabber \
-		--name $BEAMNAME \
-		--exec /usr/sbin/ejabberd -- -detached -noinput -smp $SMPOPT
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ejabberd"
-	/usr/sbin/ejabberdctl stop
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ejabberd"
-	/usr/sbin/ejabberdctl reopen-log
-	eend $?
-}
-
diff --git a/net-im/ejabberd/files/ejabberd-2.0.2.confd b/net-im/ejabberd/files/ejabberd-2.0.2.confd
deleted file mode 100644
index ce9211beebd8..000000000000
--- a/net-im/ejabberd/files/ejabberd-2.0.2.confd
+++ /dev/null
@@ -1,23 +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/ejabberd/files/ejabberd-2.0.2.confd,v 1.1 2008/08/03 16:19:05 caleb Exp $
-
-# Name of your ejabberd node. Used by ejabberdctl to determine which
-# node to communicate with.
-EJABBERD_NODE="ejabberd@`hostname -s`"
-
-# Max number of open network connections. Default is 1024. Increasing
-# this will slightly increase memory usage.
-#ERL_MAX_PORTS=1024
-
-# Return memory to the system after using it, instead of keeping it
-# allocated for future use. Decreases the memory required by ejabberd,
-# but makes it run slower.  Default is unset, set to any value to
-# activate.
-#ERL_FULLSWEEP_AFTER=0
-
-# set to 1, "true" or "yes" if you have a symmetric-multi-processor
-# default is non smp
-#HAVE_SMP=0
-
-
diff --git a/net-im/ejabberd/files/ejabberd-2.0.2.initd b/net-im/ejabberd/files/ejabberd-2.0.2.initd
deleted file mode 100644
index 38c5e575712b..000000000000
--- a/net-im/ejabberd/files/ejabberd-2.0.2.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.2.initd,v 1.2 2009/03/27 19:40:57 hanno Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use dns
-	need net
-	provide jabber-server
-}
-
-checkconfig() {
-	if [ ! -e /etc/jabber/ejabberd.cfg ] ; then
-		eerror "You need a /etc/jabber/ejabberd.cfg file to run ejabberd"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ejabberd"
-	# the process name of beam is different depending whether smp is used.
-	# set it explicitly so start-stop-daemon works
-	case "$HAVE_SMP" in
-		"1"|"true"|"yes")
-			BEAMNAME="beam.smp"
-			SMPOPT="auto"
-		;;
-		*)
-			BEAMNAME="beam"
-			SMPOPT="disable"
-		;;
-	esac
-	cd /var/lib/ejabberd
-	start-stop-daemon --start --quiet --chuid jabber:jabber \
-		--name $BEAMNAME \
-		--exec /usr/sbin/ejabberd -- -detached -noinput -smp $SMPOPT
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ejabberd"
-	/usr/sbin/ejabberdctl stop
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ejabberd"
-	/usr/sbin/ejabberdctl reopen-log
-	eend $?
-}
-
diff --git a/net-im/ejabberd/files/ejabberd-2.0.4.confd b/net-im/ejabberd/files/ejabberd-2.0.4.confd
deleted file mode 100644
index 8638792423cd..000000000000
--- a/net-im/ejabberd/files/ejabberd-2.0.4.confd
+++ /dev/null
@@ -1,23 +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/ejabberd/files/ejabberd-2.0.4.confd,v 1.1 2009/03/21 12:29:53 caleb Exp $
-
-# Name of your ejabberd node. Used by ejabberdctl to determine which
-# node to communicate with.
-EJABBERD_NODE="ejabberd@`hostname -s`"
-
-# Max number of open network connections. Default is 1024. Increasing
-# this will slightly increase memory usage.
-#ERL_MAX_PORTS=1024
-
-# Return memory to the system after using it, instead of keeping it
-# allocated for future use. Decreases the memory required by ejabberd,
-# but makes it run slower.  Default is unset, set to any value to
-# activate.
-#ERL_FULLSWEEP_AFTER=0
-
-# set to 1, "true" or "yes" if you have a symmetric-multi-processor
-# default is non smp
-#HAVE_SMP=0
-
-
diff --git a/net-im/ejabberd/files/ejabberd-2.0.1.confd b/net-im/ejabberd/files/ejabberd-2.confd
index 792bf6894fbd..0312ae7f3df2 100644
--- a/net-im/ejabberd/files/ejabberd-2.0.1.confd
+++ b/net-im/ejabberd/files/ejabberd-2.confd
@@ -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/ejabberd/files/ejabberd-2.0.1.confd,v 1.1 2008/05/22 11:43:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.confd,v 1.1 2009/04/09 05:40:39 pva Exp $
 
 # Name of your ejabberd node. Used by ejabberdctl to determine which
 # node to communicate with.
diff --git a/net-im/ejabberd/files/ejabberd-2.0.4.initd b/net-im/ejabberd/files/ejabberd-2.initd
index 2ca2820c0664..8a150dc8eefb 100644
--- a/net-im/ejabberd/files/ejabberd-2.0.4.initd
+++ b/net-im/ejabberd/files/ejabberd-2.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.4.initd,v 1.2 2009/03/27 19:40:57 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.initd,v 1.1 2009/04/09 05:40:39 pva Exp $
 
 opts="${opts} reload"
 
diff --git a/net-im/ejabberd/files/ejabberd-wrapper-2.0.2.template b/net-im/ejabberd/files/ejabberd-wrapper-2.0.2.template
deleted file mode 100644
index 89f3ff4824e3..000000000000
--- a/net-im/ejabberd/files/ejabberd-wrapper-2.0.2.template
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-[ -f /etc/conf.d/ejabberd ] && . /etc/conf.d/ejabberd
-
-# provide some default configuration
-ERL=/usr/bin/erl
-CONFIG=/etc/jabber/ejabberd.cfg
-INETRC=/etc/jabber/inetrc
-LOG_PATH=/var/log/jabber/ejabberd.log
-SASL_LOG=/var/log/jabber/sasl.log
-SPOOL=/var/spool/jabber
-
-ARGS=
-while [ $# -ne 0 ] ; do
-    PARAM=$1
-    shift
-    case $PARAM in
-	--) break ;;
-	--node) EJABBERD_NODE=$1; shift ;;
-	--config) CONFIG=$1 ; shift ;;
-	--log) LOG_PATH=$1 ; shift ;;
-	--sasl-log) SASL_LOG=$1 ; shift ;;
-	--spool) SPOOL=$1 ; shift ;;
-	*) ARGS="$ARGS $PARAM" ;;
-    esac
-done
-
-if [ "$EJABBERD_NODE" = "${EJABBERD_NODE%.*}" ] ; then
-    SNAME=-sname
-else
-    SNAME=-name
-fi
-
-# export ejabberd configuration environment variables
-export HOME=/var/run/jabber
-export EJABBERD_EBIN=/usr/@libdir@/erlang/lib/ejabberd-@version@/ebin
-export EJABBERD_MSGS_PATH=/usr/@libdir@/erlang/lib/ejabberd-@version@/priv/msgs
-export EJABBERD_SO_PATH=/usr/@libdir@/erlang/lib/ejabberd-@version@/priv/lib
-export EJABBERD_LOG_PATH=$LOG_PATH
-export EJABBERD_CONFIG_PATH=$CONFIG
-
-exec $ERL $SNAME $EJABBERD_NODE \
-    -s ejabberd \
-    -kernel inetrc \"$INETRC\" \
-    -sasl sasl_error_logger \{file,\"$SASL_LOG\"\} \
-    -mnesia dir \"$SPOOL\" \
-    $ERL_OPTIONS $ARGS "$@"
-
-
diff --git a/net-im/ejabberd/files/ejabberd-wrapper-2.0.4.template b/net-im/ejabberd/files/ejabberd-wrapper-2.0.4.template
deleted file mode 100644
index 89f3ff4824e3..000000000000
--- a/net-im/ejabberd/files/ejabberd-wrapper-2.0.4.template
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-[ -f /etc/conf.d/ejabberd ] && . /etc/conf.d/ejabberd
-
-# provide some default configuration
-ERL=/usr/bin/erl
-CONFIG=/etc/jabber/ejabberd.cfg
-INETRC=/etc/jabber/inetrc
-LOG_PATH=/var/log/jabber/ejabberd.log
-SASL_LOG=/var/log/jabber/sasl.log
-SPOOL=/var/spool/jabber
-
-ARGS=
-while [ $# -ne 0 ] ; do
-    PARAM=$1
-    shift
-    case $PARAM in
-	--) break ;;
-	--node) EJABBERD_NODE=$1; shift ;;
-	--config) CONFIG=$1 ; shift ;;
-	--log) LOG_PATH=$1 ; shift ;;
-	--sasl-log) SASL_LOG=$1 ; shift ;;
-	--spool) SPOOL=$1 ; shift ;;
-	*) ARGS="$ARGS $PARAM" ;;
-    esac
-done
-
-if [ "$EJABBERD_NODE" = "${EJABBERD_NODE%.*}" ] ; then
-    SNAME=-sname
-else
-    SNAME=-name
-fi
-
-# export ejabberd configuration environment variables
-export HOME=/var/run/jabber
-export EJABBERD_EBIN=/usr/@libdir@/erlang/lib/ejabberd-@version@/ebin
-export EJABBERD_MSGS_PATH=/usr/@libdir@/erlang/lib/ejabberd-@version@/priv/msgs
-export EJABBERD_SO_PATH=/usr/@libdir@/erlang/lib/ejabberd-@version@/priv/lib
-export EJABBERD_LOG_PATH=$LOG_PATH
-export EJABBERD_CONFIG_PATH=$CONFIG
-
-exec $ERL $SNAME $EJABBERD_NODE \
-    -s ejabberd \
-    -kernel inetrc \"$INETRC\" \
-    -sasl sasl_error_logger \{file,\"$SASL_LOG\"\} \
-    -mnesia dir \"$SPOOL\" \
-    $ERL_OPTIONS $ARGS "$@"
-
-
diff --git a/net-im/ejabberd/files/ejabberd-wrapper-2.0.1.template b/net-im/ejabberd/files/ejabberd-wrapper-2.template
index 89f3ff4824e3..89f3ff4824e3 100644
--- a/net-im/ejabberd/files/ejabberd-wrapper-2.0.1.template
+++ b/net-im/ejabberd/files/ejabberd-wrapper-2.template
diff --git a/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.2.template b/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.2.template
deleted file mode 100644
index 6443678cf9b2..000000000000
--- a/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.2.template
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-[ -f /etc/conf.d/ejabberd ] && . /etc/conf.d/ejabberd
-
-if [ -r /var/run/jabber/.erlang.cookie ] ; then
-    HOME=/var/run/jabber
-    export HOME
-fi
-
-ERL=/usr/bin/erl
-
-if [ $# -ne 0 ] ; then
-    case $1 in
-	--node) shift ; EJABBERD_NODE=$1 ; shift ;;
-    esac
-fi
-
-if [ "$EJABBERD_NODE" = "${EJABBERD_NODE%.*}" ] ; then
-    SNAME=-sname
-else
-    SNAME=-name
-fi
-
-exec $ERL $SNAME ejabberdctl \
-    -pa /usr/@libdir@/erlang/lib/ejabberd-@version@/ebin \
-    -s ejabberd_ctl \
-    -noinput \
-    -extra $EJABBERD_NODE "$@"
-
-
diff --git a/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.4.template b/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.4.template
deleted file mode 100644
index 6443678cf9b2..000000000000
--- a/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.4.template
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-[ -f /etc/conf.d/ejabberd ] && . /etc/conf.d/ejabberd
-
-if [ -r /var/run/jabber/.erlang.cookie ] ; then
-    HOME=/var/run/jabber
-    export HOME
-fi
-
-ERL=/usr/bin/erl
-
-if [ $# -ne 0 ] ; then
-    case $1 in
-	--node) shift ; EJABBERD_NODE=$1 ; shift ;;
-    esac
-fi
-
-if [ "$EJABBERD_NODE" = "${EJABBERD_NODE%.*}" ] ; then
-    SNAME=-sname
-else
-    SNAME=-name
-fi
-
-exec $ERL $SNAME ejabberdctl \
-    -pa /usr/@libdir@/erlang/lib/ejabberd-@version@/ebin \
-    -s ejabberd_ctl \
-    -noinput \
-    -extra $EJABBERD_NODE "$@"
-
-
diff --git a/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.1.template b/net-im/ejabberd/files/ejabberdctl-wrapper-2.template
index 6443678cf9b2..6443678cf9b2 100644
--- a/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.1.template
+++ b/net-im/ejabberd/files/ejabberdctl-wrapper-2.template