clean up

Package-Manager: portage-2.1.6.13/cvs/Linux i686

22 files changed, 18 insertions, 1506 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 865cc10bc53a..b41624e9c01a 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,19 @@
 # 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.68 2009/11/25 11:20:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.69 2009/12/30 11:35:42 fauli Exp $
+
+  30 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+  -files/1.1.4-missing-declaration.patch, -ejabberd-1.1.4-r1.ebuild,
+  -ejabberd-1.1.4-r2.ebuild, -files/ejabberd-1.1.4-erlang-12.patch,
+  -files/2.0.0-erlang12-s2s-in.patch, -files/ejabberd-1.1.4.confd,
+  -ejabberd-2.0.4.ebuild, -files/2.0.1-parallel-make.patch,
+  -files/ejabberd-1.1.4.initd, -files/ejabberd-2.0.4-fix-EJAB-890.patch,
+  -ejabberd-2.0.5.ebuild, -ejabberd-2.0.5-r1.ebuild,
+  -ejabberd-2.0.5-r2.ebuild, -files/ejabberdctl-wrapper-2.template,
+  -files/2.0.0-ejab-542-mod_proxy65.patch,
+  -files/2.0.0-missing-declaration.patch, -files/ejabberd,
+  -files/ejabberdctl, -files/inetrc, -files/self-cert.sh:
+  clean up
 
   25 Nov 2009; Markus Meier <maekke@gentoo.org> ejabberd-2.0.5-r3.ebuild:
   amd64 stable, bug #291744
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 07f498fdfca3..fd2f39877618 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,43 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.1.4-missing-declaration.patch 411 RMD160 f314900dd00fd23c9043cb5a60982448c39d2fa9 SHA1 687066247c9ad74c4e9ec869a9f4f0d9e80bae6d SHA256 1c32a57f4f187d55b28b240820875fcd3e731f6d91cd9429d14c318222f07e7b
-AUX 2.0.0-ejab-542-mod_proxy65.patch 598 RMD160 bfe11518b5dbfcfb64c7bb04be965d2e383c2d90 SHA1 9161450bf883209f4c2ff2c061f94ef401e4fa51 SHA256 80ce546763de423430efcb60376ff2fda1fcd15ab7b80003ef5d7380a1a4caa3
-AUX 2.0.0-erlang12-s2s-in.patch 1164 RMD160 5bcb04354c02749cdec302dc30354a49872ef2f5 SHA1 c27402b062b58ecf74c9e8c0cf2e879dbe600656 SHA256 ebc66c2a507e39f7f794b32f91148ea5e8c34e46ad41b4b876983da4aa9c1342
-AUX 2.0.0-missing-declaration.patch 411 RMD160 f314900dd00fd23c9043cb5a60982448c39d2fa9 SHA1 687066247c9ad74c4e9ec869a9f4f0d9e80bae6d SHA256 1c32a57f4f187d55b28b240820875fcd3e731f6d91cd9429d14c318222f07e7b
-AUX 2.0.1-parallel-make.patch 1537 RMD160 07b25c053ba74d1a4b924709d0c7ccc0ecaf39e2 SHA1 c03051d8180efb91228e52b881dbf7ae2cb473f5 SHA256 6c40029f740d8ea871b8e2b7bc8de6dfbae134b3a4208bd5a678b6af03c73335
-AUX ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e211f6e59c96dd6ce419a4c0bcdd3d9 SHA256 1f2254ce2835a986eb75adaf5602d1cb74ced989c2360331822a2c5e11c9837b
-AUX ejabberd-1.1.4-erlang-12.patch 3746 RMD160 17e6dc9ded6f598c27cf2cda098d2804e3c93957 SHA1 85e03ffd4e85b792759f23353d8e278f85276311 SHA256 bb96a790b948cd5c7359a7bdd2f2486d83dd7430b3556307c22188183be1f3aa
-AUX ejabberd-1.1.4.confd 736 RMD160 100b2b7957766380b0267d6fc91b3fe8a0f827fc SHA1 7c7283615eddafe24f7d331b76b598ad3f10699c SHA256 8c3f96ebaa0bf200ef145dbc6ebea82451cfaceec9ff7802fdc0ef48bf507715
-AUX ejabberd-1.1.4.initd 1437 RMD160 96d9d35de36585a9e735f124b7be1618949541aa SHA1 623713cfb28a247f16a14f6b2ca6a8555609bd35 SHA256 59f983e32f7b530b66b5242ac6f06405b7440a112b2f980abe602508459d923e
-AUX ejabberd-2.0.4-fix-EJAB-890.patch 5259 RMD160 72fe6630ab6ca84b90a4947b95ac24b689a86bd7 SHA1 ab61f5335177a4344a61830e39ada84f6688f2b4 SHA256 be38a6a278f3ad4da3fd9dfd56623a271677d8897cf4fd04b31994ed5d6f7959
 AUX ejabberd-2.0.5-erlang-13.patch 16877 RMD160 4b8924f5b37de85823dec539523e7800c394bc7c SHA1 663ffc03f29613d695589c199222bc0382a24c76 SHA256 3d5cb7c163647580e1776a4e31ca3f8e03b1b411288b8273c861d17db5fa1e4a
 AUX ejabberd-2.confd 834 RMD160 7beb5337d15b33d4b1d802edb03995cddb73e162 SHA1 53e754dcbd03edb27f9982f51323e355dafd1f73 SHA256 c48f5cb90c409bde333d5d7a6159995bbf02e265c9d06528c1ec35b764ca9f21
 AUX ejabberd-2.initd 1126 RMD160 8c696768e686efdc9865446ce5a3fbb2ae7302f6 SHA1 27c6b2fd8e1ff6b74d83688d9d68e8721aa0580e SHA256 9b6f076c452a8db149b689db12082fade95e1975a76e52a67a942220ee99aa2f
 AUX ejabberd-wrapper-2.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
-AUX ejabberdctl 199 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 SHA1 347200e8dd5790282cedb6a70c71fd4a6db9a0f5 SHA256 b88de8e8e5e8730ac7fe04b49ae3cf131c49a4e1ba451b35f1305d1c24a2dda0
-AUX ejabberdctl-wrapper-2.template 530 RMD160 f39037aac0f7ae65c2ca41bef59aa500553a7077 SHA1 84f340e60ce66b3b01c6e82122783fa590edf282 SHA256 6436820e8d015f7831464e0fb175074397ab9906ee8d552f97292acc3cd9e756
 AUX ejabberdctl-wrapper-3.template 908 RMD160 c5378d8e089ae1c180b7be76639a99d5cad16f11 SHA1 4ee6996c492360c4e44a05e011fb228eecff56b9 SHA256 c3c377ae8b00143e21ab4ccff7cffe539f6a6b95336aa5636cb8d6bba49c9592
-AUX inetrc 36 RMD160 4b79020864689ede547969610fde18fe490f5810 SHA1 1e0bae0f7251e2ae3b62ba9d3e5cc86bb5dd271e SHA256 0f383befc4c46134d88ce14d3bd06c404ef6575391f4ac0b5e8c28ba383b28fc
 AUX self-cert-v2.sh 1017 RMD160 3beb0f05e8cc3041abd2f689d31d410bc7d5088d SHA1 1f07299b2e49541dcbf5c2b81b26280bbf0b6aeb SHA256 34b2c9cb36c424ffd1117bd20b67d0f4a05168b0bc6237e287c2dcabd0e27972
-AUX self-cert.sh 491 RMD160 89bb577975eef172fa3c6e07b08d323162d1278b SHA1 61a4c8b79141ec1bc846e8ede6fa19a07210c619 SHA256 6a0c53a8573411c18ed6f5dd79ce4807b72fb10bc5eb3a3a7f4641c57e4ddceb
 AUX ssl.cnf 1042 RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 SHA1 7347bae5a195ad158881fe5313f55ee41e85cb81 SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635
-DIST ejabberd-1.1.4.tar.gz 846059 RMD160 4c72548129b0196ff0096bd85936e0750fc4d7be SHA1 db6f521d45dece200de4eb6fc967c64728e8f6a3 SHA256 dcd61b72c522eee77ab56227b16d75fd5741efe2b9b9a8a1d3ed7eefc2a7e4f6
-DIST ejabberd-2.0.4.tar.gz 1827181 RMD160 05b8d1fd42724335af588bf6fa7a14e5605bf6e3 SHA1 16516c7f9723e1ca781970d54afbf580a72c9eeb SHA256 6ddbd1501bd2824673522e2a3c119195acc177ce198800a116f90d5b0e3d2172
 DIST ejabberd-2.0.5.tar.gz 1796737 RMD160 5ec0210b3995004c708180a66a096e0b9be5f1ba SHA1 e5b8c4b742fdcc439da9458f94f530604abdfdd5 SHA256 37ef90e2afa2b73a620bf71a096df48d5fde8f1cd669fac83d8c143a1295198c
-EBUILD ejabberd-1.1.4-r1.ebuild 3456 RMD160 2f1ad83dd3d4773dd10de489f71939bb3b35fed5 SHA1 a191993a20e11ef84a6097029190360d5a1ce731 SHA256 db2686cc2ce063421843b048091af363fe8f18b88ebbeebe20f419a50dc38792
-EBUILD ejabberd-1.1.4-r2.ebuild 3479 RMD160 d6bfed9a9127bc8246d315b16c184bf7a94bccde SHA1 b2815db38d8d76d7697d82505f8bdf9cb7401195 SHA256 9898cff52c3d8948bddb16dcb5392c2a7cd8eafb48c69e9b5e6d74884023575d
-EBUILD ejabberd-2.0.4.ebuild 4837 RMD160 c10c9cbbada5b2ea1248f3a71303f69e9b01c582 SHA1 326bc8da6365817e6de94aaf77a1941b79e769e1 SHA256 63d967db168f8ab4f9593267a0c78948349ca0b9d31b67ef2c7c65a240c92b50
-EBUILD ejabberd-2.0.5-r1.ebuild 4788 RMD160 76d43c5c0c89d78e336945df71183f28eb16d6fe SHA1 5d7138063dc2b3e7bc0b65d5a34c81f7498be423 SHA256 597dbe9e920444f8cc711fb1432f78307faff9334af483a27fa28cb8afd2c2b3
-EBUILD ejabberd-2.0.5-r2.ebuild 4791 RMD160 ab86cf43e37f45a24e50d29804176d4daf8f77af SHA1 81c55701cf8f32e1afabc34a2b3877168bc900fb SHA256 361fcfaa8ef40f34619fd63f616bbedbdc9da958cd6c31dbb99b69fde232f6fb
 EBUILD ejabberd-2.0.5-r3.ebuild 4901 RMD160 1f7a17a51e3310a0619ed37d3defb34380d637f4 SHA1 608359d5a2a4889326b9afa43883104653689134 SHA256 02bf31c731eb7f72ace9fa5092421b2dd96700ca82d7eccc034aaa256c2b04fd
-EBUILD ejabberd-2.0.5.ebuild 4766 RMD160 3fd0647521dba6bc68e1fa5d405d75d368e96eb0 SHA1 07f9296159dfc9e1c06015479d4437471d3fcb62 SHA256 098f80b5acb25a9af53eb1cd572075d9a79955eb5bb8de242c2bfeeb77d0b53f
-MISC ChangeLog 14163 RMD160 cc7404969079ee38f99d91cf9827405304d0d29b SHA1 0f4100335056b2ac9bf47174ab90c50d3b5c279b SHA256 79d27027176b38ad32a4f669814543724c6100222a0233bc9e29eb931c6ff2b9
+MISC ChangeLog 14847 RMD160 b86fe6d04adfb6a30f79d3c040bb322f9bf12c7e SHA1 2a16c9e80a8cce50b14cad9bf586410e4f2b5f69 SHA256 5b280da534aa9bfe1e90ea46592a0d7eb6be098d0162a4868529b1bf4a6a6041
 MISC metadata.xml 619 RMD160 ca6e7f018d370ce36a3b93eb960254537260949c SHA1 404f3d0d31036ed1cfeb8aeee2264559c1d1c8d9 SHA256 843e1bbd5fdc082763e71322094170cde5b90d0f5d9320011c4b9872cd6589f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksNEvcACgkQkKaRLQcq0GKJIgCfX58vtHwFJtjH2njXzH/BTcLg
-1GAAoLRzna55GZTxUDtxs3Beke7CvUN6
-=ikJY
+iEYEARECAAYFAks7OycACgkQNQqtfCuFneNzXACeJZZb8dyUW9A1Sdg73ovrwDoz
+J/4Ani4NkGGZLX4Smrhn8+CG4N/YJcP2
+=wMEv
 -----END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild b/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild
deleted file mode 100644
index 70f227b8caf0..000000000000
--- a/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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-1.1.4-r1.ebuild,v 1.5 2009/02/01 10:01:06 patrick Exp $
-
-inherit eutils multilib
-
-JABBER_ETC="/etc/jabber"
-JABBER_RUN="/var/run/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-JABBER_LOG="/var/log/jabber"
-
-DESCRIPTION="The Erlang Jabber Daemon"
-HOMEPAGE="http://ejabberd.jabber.ru/"
-SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="debug mod_irc mod_muc mod_pubsub ldap odbc ssl web zlib"
-
-DEPEND=">=net-im/jabber-base-0.01
-	>=dev-libs/expat-1.95
-	>=dev-lang/erlang-10.2.0
-	odbc? ( dev-db/unixODBC )
-	ldap? ( =net-nds/openldap-2* )
-	ssl? ( >=dev-libs/openssl-0.9.8e )
-	zlib? ( sys-libs/zlib )"
-
-PROVIDE="virtual/jabber-server"
-S=${WORKDIR}/${P}/src
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Bug #171427
-	epatch "${FILESDIR}/${PV}-missing-declaration.patch"
-	# Bug 202114
-	epatch "${FILESDIR}/${P}-erlang-12.patch"
-}
-
-src_compile() {
-	econf								\
-		$(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)			\
-		|| 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"
-
-	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}"
-
-	insinto /usr/share/doc/${PF}
-	dohtml doc/*.{html,png}
-
-	#
-	# Create /usr/bin/ejabberd
-	#
-	cat <<EOF > "${T}/ejabberd"
-#!/bin/bash
-
-erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
-	${pa} \\
-	-sname ejabberd \\
-	-s ejabberd \\
-	-ejabberd config \"${JABBER_ETC}/ejabberd.cfg\" \\
-	log_path \"${JABBER_LOG}/ejabberd.log\" \\
-	-kernel inetrc \"${JABBER_ETC}/inetrc\" \\
-	-sasl sasl_error_logger \{file,\"${JABBER_LOG}/sasl.log\"\} \\
-	-mnesia dir \"${JABBER_SPOOL}\" \\
-	\$@
-EOF
-
-	#
-	# Create /usr/bin/ejabberdctl
-	#
-	cat <<EOF > "${T}/ejabberdctl"
-#!/bin/sh
-
-exec env HOME=${JABBER_RUN} \\
-	erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
-		${pa} \\
-		-noinput \\
-		-sname ejabberdctl \\
-		-s ejabberd_ctl \\
-		-extra \$@
-EOF
-
-	dobin "${T}/ejabberdctl"
-	dobin "${T}/ejabberd"
-
-	newinitd "${FILESDIR}/${P}.initd" ${PN}
-	newconfd "${FILESDIR}/ejabberd-1.1.4.confd" ${PN}
-
-	insinto ${JABBER_ETC}
-	doins "${FILESDIR}/inetrc"
-	if useq ssl ; then
-		doins "${FILESDIR}/ssl.cnf"
-		newins "${FILESDIR}/self-cert-v2.sh" self-cert.sh
-	fi
-}
-
-pkg_postinst() {
-	elog "For configuration instructions, please see /usr/share/doc/${PF}/html/guide.html"
-	elog "or the online version at http://www.process-one.net/en/projects/ejabberd/docs/guide_en.html"
-	echo
-	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
-}
diff --git a/net-im/ejabberd/ejabberd-1.1.4-r2.ebuild b/net-im/ejabberd/ejabberd-1.1.4-r2.ebuild
deleted file mode 100644
index fe3063a28d0e..000000000000
--- a/net-im/ejabberd/ejabberd-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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-1.1.4-r2.ebuild,v 1.1 2009/02/01 10:01:06 patrick Exp $
-
-inherit eutils multilib
-
-JABBER_ETC="/etc/jabber"
-JABBER_RUN="/var/run/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-JABBER_LOG="/var/log/jabber"
-
-DESCRIPTION="The Erlang Jabber Daemon"
-HOMEPAGE="http://ejabberd.jabber.ru/"
-SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug mod_irc mod_muc mod_pubsub ldap odbc ssl web zlib"
-
-DEPEND=">=net-im/jabber-base-0.01
-	>=dev-libs/expat-1.95
-	>=dev-lang/erlang-10.2.0
-	odbc? ( dev-db/unixODBC )
-	ldap? ( =net-nds/openldap-2* )
-	ssl? ( >=dev-libs/openssl-0.9.8e )
-	zlib? ( sys-libs/zlib )"
-
-PROVIDE="virtual/jabber-server"
-S=${WORKDIR}/${P}/src
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Bug #171427
-	epatch "${FILESDIR}/${PV}-missing-declaration.patch"
-	# Bug 202114
-	epatch "${FILESDIR}/${P}-erlang-12.patch"
-}
-
-src_compile() {
-	econf								\
-		$(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)			\
-		|| 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"
-
-	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}"
-
-	cd "${WORKDIR}/${P}"
-	insinto /usr/share/doc/${PF}
-	dohtml doc/*.{html,png}
-
-	#
-	# Create /usr/bin/ejabberd
-	#
-	cat <<EOF > "${T}/ejabberd"
-#!/bin/bash
-
-erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
-	${pa} \\
-	-sname ejabberd \\
-	-s ejabberd \\
-	-ejabberd config \"${JABBER_ETC}/ejabberd.cfg\" \\
-	log_path \"${JABBER_LOG}/ejabberd.log\" \\
-	-kernel inetrc \"${JABBER_ETC}/inetrc\" \\
-	-sasl sasl_error_logger \{file,\"${JABBER_LOG}/sasl.log\"\} \\
-	-mnesia dir \"${JABBER_SPOOL}\" \\
-	\$@
-EOF
-
-	#
-	# Create /usr/bin/ejabberdctl
-	#
-	cat <<EOF > "${T}/ejabberdctl"
-#!/bin/sh
-
-exec env HOME=${JABBER_RUN} \\
-	erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
-		${pa} \\
-		-noinput \\
-		-sname ejabberdctl \\
-		-s ejabberd_ctl \\
-		-extra \$@
-EOF
-
-	dobin "${T}/ejabberdctl"
-	dobin "${T}/ejabberd"
-
-	newinitd "${FILESDIR}/${P}.initd" ${PN}
-	newconfd "${FILESDIR}/ejabberd-1.1.4.confd" ${PN}
-
-	insinto ${JABBER_ETC}
-	doins "${FILESDIR}/inetrc"
-	if useq ssl ; then
-		doins "${FILESDIR}/ssl.cnf"
-		newins "${FILESDIR}/self-cert-v2.sh" self-cert.sh
-	fi
-}
-
-pkg_postinst() {
-	elog "For configuration instructions, please see /usr/share/doc/${PF}/html/guide.html"
-	elog "or the online version at http://www.process-one.net/en/projects/ejabberd/docs/guide_en.html"
-	echo
-	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
-}
diff --git a/net-im/ejabberd/ejabberd-2.0.4.ebuild b/net-im/ejabberd/ejabberd-2.0.4.ebuild
deleted file mode 100644
index b8973a6fc35c..000000000000
--- a/net-im/ejabberd/ejabberd-2.0.4.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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.4 2009/05/20 22:42:16 caleb 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
-	<dev-lang/erlang-13
-	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}"
-
-	# Bug #171427
-	epatch "${FILESDIR}/2.0.0-missing-declaration.patch"
-
-	# 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/ejabberd-2.0.5-r1.ebuild b/net-im/ejabberd/ejabberd-2.0.5-r1.ebuild
deleted file mode 100644
index 093e82b6f825..000000000000
--- a/net-im/ejabberd/ejabberd-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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-r1.ebuild,v 1.4 2009/06/05 12:56:25 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
-	<dev-lang/erlang-13
-	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}
-
-	fowners -R jabber:jabber ${JABBER_ETC}
-	fowners -R jabber:jabber ${JABBER_LOG}
-	fowners -R jabber:jabber /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
-		fowners root:jabber /usr/$(get_libdir)/erlang/lib/${P}/priv/bin/epam
-		fperms 4750 /usr/$(get_libdir)/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" || die
-
-	# 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} || die
-	newconfd "${FILESDIR}/${PN}-2.confd" ${PN} || die
-
-	# 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/ejabberd-2.0.5-r2.ebuild b/net-im/ejabberd/ejabberd-2.0.5-r2.ebuild
deleted file mode 100644
index d44c78d30ba9..000000000000
--- a/net-im/ejabberd/ejabberd-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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-r2.ebuild,v 1.2 2009/05/20 22:39:08 caleb 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
-	<dev-lang/erlang-13
-	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}
-
-	fowners -R jabber:jabber ${JABBER_ETC}
-	fowners -R jabber:jabber ${JABBER_LOG}
-	fowners -R jabber:jabber /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
-		fowners root:jabber /usr/$(get_libdir)/erlang/lib/${P}/priv/bin/epam
-		fperms 4750 /usr/$(get_libdir)/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" || die
-
-	# set up /usr/sbin/ejabberdctl wrapper
-	cat "${FILESDIR}/ejabberdctl-wrapper-3.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} || die
-	newconfd "${FILESDIR}/${PN}-2.confd" ${PN} || die
-
-	# 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/ejabberd-2.0.5.ebuild b/net-im/ejabberd/ejabberd-2.0.5.ebuild
deleted file mode 100644
index cab40bf8fdad..000000000000
--- a/net-im/ejabberd/ejabberd-2.0.5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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.4 2009/06/05 12:56:25 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
-	<dev-lang/erlang-13
-	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/1.1.4-missing-declaration.patch b/net-im/ejabberd/files/1.1.4-missing-declaration.patch
deleted file mode 100644
index 72c56cbcef97..000000000000
--- a/net-im/ejabberd/files/1.1.4-missing-declaration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr ejabberd-1.1.4.ORIG/src/expat_erl.c ejabberd-1.1.4/src/expat_erl.c
---- ejabberd-1.1.4.ORIG/src/expat_erl.c	2007-09-14 12:07:56.000000000 +0100
-+++ ejabberd-1.1.4/src/expat_erl.c	2007-09-14 12:08:56.000000000 +0100
-@@ -14,6 +14,8 @@
-  * Workaround for EI encode_string bug
-  */
- 
-+int x_fix_buff(ei_x_buff* x, int szneeded);
-+
- #define put8(s,n) do { \
-   (s)[0] = (char)((n) & 0xff); \
-   (s) += 1; \
diff --git a/net-im/ejabberd/files/2.0.0-ejab-542-mod_proxy65.patch b/net-im/ejabberd/files/2.0.0-ejab-542-mod_proxy65.patch
deleted file mode 100644
index 6cc3bc815a56..000000000000
--- a/net-im/ejabberd/files/2.0.0-ejab-542-mod_proxy65.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ejabberd-2.0.0/src/mod_proxy65/mod_proxy65_service.erl.original	2008-04-11 00:10:26.000000000 +0100
-+++ ejabberd-2.0.0/src/mod_proxy65/mod_proxy65_service.erl	2008-04-11 00:11:12.000000000 +0100
-@@ -201,7 +201,7 @@
- 	         none -> get_proxy_or_domainip(ServerHost, MyHost);
- 	         Addr -> Addr
- 	     end,
--    [_ | StrIP] = lists:append([[$. | integer_to_list(X)] || X <- inet:ip_to_bytes(IP)]),
-+    StrIP = inet_parse:ntoa(IP),
-     StreamAddr = [{"jid", MyHost}, {"host", StrIP}, {"port", integer_to_list(Port)}],
-     {IP, #state{myhost      = MyHost,
- 		serverhost  = ServerHost,
-
diff --git a/net-im/ejabberd/files/2.0.0-erlang12-s2s-in.patch b/net-im/ejabberd/files/2.0.0-erlang12-s2s-in.patch
deleted file mode 100644
index 68cc69810056..000000000000
--- a/net-im/ejabberd/files/2.0.0-erlang12-s2s-in.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ejabberd-2.0.0/src/ejabberd_s2s_in.erl.original	2008-02-21 10:02:12.000000000 +0000
-+++ ejabberd-2.0.0/src/ejabberd_s2s_in.erl	2008-04-08 18:00:04.000000000 +0100
-@@ -50,9 +50,13 @@
- -include("jlib.hrl").
- -ifdef(SSL39).
- -include_lib("ssl/include/ssl_pkix.hrl").
-+-define(PKIXEXPLICIT, 'OTP-PKIX').
-+-define(PKIXIMPLICIT, 'OTP-PKIX').
- -else.
- -include_lib("ssl/include/PKIX1Explicit88.hrl").
- -include_lib("ssl/include/PKIX1Implicit88.hrl").
-+-define(PKIXEXPLICIT, 'PKIX1Explicit88').
-+-define(PKIXIMPLICIT, 'PKIX1Implicit88').
- -endif.
- -include("XmppAddr.hrl").
- 
-@@ -603,7 +607,7 @@
-     lists:flatmap(
-       fun(#'AttributeTypeAndValue'{type = ?'id-at-commonName',
- 				   value = Val}) ->
--	      case 'PKIX1Explicit88':decode('X520CommonName', Val) of
-+	      case ?PKIXEXPLICIT:decode('X520CommonName', Val) of
- 		  {ok, {_, D1}} ->
- 		      D = if
- 			      is_list(D1) -> D1;
-@@ -637,7 +641,7 @@
- 			     is_binary(Val) -> Val;
- 			     true -> Val
- 			 end,
--		  case 'PKIX1Implicit88':decode('SubjectAltName', BVal) of
-+		  case ?PKIXIMPLICIT:decode('SubjectAltName', BVal) of
- 		      {ok, SANs} ->
- 			  lists:flatmap(
- 			    fun({otherName,
-
diff --git a/net-im/ejabberd/files/2.0.0-missing-declaration.patch b/net-im/ejabberd/files/2.0.0-missing-declaration.patch
deleted file mode 100644
index 72c56cbcef97..000000000000
--- a/net-im/ejabberd/files/2.0.0-missing-declaration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr ejabberd-1.1.4.ORIG/src/expat_erl.c ejabberd-1.1.4/src/expat_erl.c
---- ejabberd-1.1.4.ORIG/src/expat_erl.c	2007-09-14 12:07:56.000000000 +0100
-+++ ejabberd-1.1.4/src/expat_erl.c	2007-09-14 12:08:56.000000000 +0100
-@@ -14,6 +14,8 @@
-  * Workaround for EI encode_string bug
-  */
- 
-+int x_fix_buff(ei_x_buff* x, int szneeded);
-+
- #define put8(s,n) do { \
-   (s)[0] = (char)((n) & 0xff); \
-   (s) += 1; \
diff --git a/net-im/ejabberd/files/2.0.1-parallel-make.patch b/net-im/ejabberd/files/2.0.1-parallel-make.patch
deleted file mode 100644
index b6b1e7c00ea7..000000000000
--- a/net-im/ejabberd/files/2.0.1-parallel-make.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- trunk/src/Makefile.in
-+++ trunk/src/Makefile.in
-@@ -50,7 +50,9 @@
- SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep @tls@ @odbc@ @ejabberd_zlib@
- ERLSHLIBS = expat_erl.so
- ERLBEHAVS = cyrsasl.erl gen_mod.erl p1_fsm.erl
--SOURCES = $(ERLBEHAVS) $(wildcard *.erl)
-+SOURCES_ALL = $(wildcard *.erl)
-+SOURCES = $(filter-out $(ERLBEHAVS),$(SOURCES_ALL))
-+ERLBEHAVBEAMS = $(ERLBEHAVS:.erl=.beam)
- BEAMS = $(SOURCES:.erl=.beam)
- 
- DESTDIR =
-@@ -74,8 +76,12 @@
- 
- all: $(ERLSHLIBS) compile-beam all-recursive
- 
--compile-beam: XmppAddr.hrl $(BEAMS)
-+compile-beam: XmppAddr.hrl $(ERLBEHAVBEAMS) $(BEAMS)
- 
-+$(BEAMS): $(ERLBEHAVBEAMS)
-+
-+all-recursive: $(ERLBEHAVBEAMS)
-+
- %.beam:       %.erl
- 	@ERLC@ -W $(ERLC_FLAGS) $<
- 
---- trunk/src/eldap/Makefile.in
-+++ trunk/src/eldap/Makefile.in
-@@ -22,6 +22,8 @@
- 
- all:    $(BEAMS) ELDAPv3.beam
- 
-+ELDAPv3.beam: ELDAPv3.erl
-+
- ELDAPv3.erl:       ELDAPv3.asn
- 	@ERLC@ -bber_bin -W $(EFLAGS) $<
- 
---- trunk/src/mod_pubsub/Makefile.in
-+++ trunk/src/mod_pubsub/Makefile.in
-@@ -16,12 +16,17 @@
- endif
- 
- OUTDIR = ..
--SOURCES = $(wildcard *.erl)
-+ERLBEHAVS = gen_pubsub_node.erl gen_pubsub_nodetree.erl
-+SOURCES_ALL = $(wildcard *.erl)
-+SOURCES = $(filter-out $(ERLBEHAVS),$(SOURCES_ALL))
-+ERLBEHAVBEAMS = $(addprefix $(OUTDIR)/,$(ERLBEHAVS:.erl=.beam))
- BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
- 
- 
--all:    $(BEAMS)
-+all:    $(ERLBEHAVBEAMS) $(BEAMS)
- 
-+$(BEAMS): $(ERLBEHAVBEAMS)
-+
- $(OUTDIR)/%.beam:       %.erl
- 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
- 
diff --git a/net-im/ejabberd/files/ejabberd b/net-im/ejabberd/files/ejabberd
deleted file mode 100644
index d7506959fb3a..000000000000
--- a/net-im/ejabberd/files/ejabberd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-erl -pa /var/lib/ejabberd/ebin \
-    -sname ejabberd \
-    -s ejabberd \
-    -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" \
-    log_path \"/var/log/ejabberd/ejabberd.log\" \
-    -kernel inetrc \"/etc/ejabberd/inetrc\" \
-    -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} \
-    -mnesia dir \"/var/spool/ejabberd\" \
-    $@
diff --git a/net-im/ejabberd/files/ejabberd-1.1.4-erlang-12.patch b/net-im/ejabberd/files/ejabberd-1.1.4-erlang-12.patch
deleted file mode 100644
index b6976c370c69..000000000000
--- a/net-im/ejabberd/files/ejabberd-1.1.4-erlang-12.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-Patch by Sergei Golovan fixes building ejabberd with erlang R12B-0.
-
-Index: ejabberd-1.1.4/src/ejabberd_s2s_in.erl
-===================================================================
---- ejabberd-1.1.4.orig/src/ejabberd_s2s_in.erl
-+++ ejabberd-1.1.4/src/ejabberd_s2s_in.erl
-@@ -30,8 +30,12 @@
- 
- -include("ejabberd.hrl").
- -include("jlib.hrl").
-+-ifdef(SSL39).
-+-include_lib("ssl/include/ssl_pkix.hrl").
-+-else.
- -include_lib("ssl/include/PKIX1Explicit88.hrl").
- -include_lib("ssl/include/PKIX1Implicit88.hrl").
-+-endif.
- -include("XmppAddr.hrl").
- 
- -define(DICT, dict).
---- ejabberd-1.1.4.orig/src/configure
-+++ ejabberd-1.1.4/src/configure
-@@ -648,6 +648,7 @@
- ERLC
- ERL
- ERLANG_CFLAGS
-+ERLANG_SSL39
- ERLANG_LIBS
- LIBICONV
- CPP
-@@ -2865,14 +2866,21 @@
- -author('alexey@sevcom.net').
- 
- -export([start/0]).
-+-include_lib("ssl/include/ssl_pkix.hrl").
- 
- start() ->
-     EIDirS = code:lib_dir("erl_interface") ++ "\n",
-     EILibS =  libpath("erl_interface") ++ "\n",
-     RootDirS = code:root_dir() ++ "\n",
--    file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)),
-+    file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)),
-     halt().
- 
-+-ifdef('id-pkix').
-+ssldef() -> "-DSSL39\n".
-+-else.
-+ssldef() -> "\n".
-+-endif.
-+
- %% return physical architecture based on OS/Processor
- archname() ->
-     ArchStr = erlang:system_info(system_architecture),
-@@ -2927,6 +2935,8 @@
-    # Second line
-    ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1`
-    # Third line
-+   ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1`
-+   # End line
-    ERLANG_DIR=`cat conftest.out | tail -n 1`
- 
-    ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include"
-@@ -6205,6 +6215,7 @@
- ERL!$ERL$ac_delim
- ERLANG_CFLAGS!$ERLANG_CFLAGS$ac_delim
- ERLANG_LIBS!$ERLANG_LIBS$ac_delim
-+ERLANG_SSL39!$ERLANG_SSL39$ac_delim
- LIBICONV!$LIBICONV$ac_delim
- CPP!$CPP$ac_delim
- GREP!$GREP$ac_delim
-@@ -6238,7 +6248,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 79; then
-+  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 80; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
---- ejabberd-1.1.4.orig/src/Makefile.in
-+++ ejabberd-1.1.4/src/Makefile.in
-@@ -12,6 +12,8 @@
- EXPAT_LIBS = @EXPAT_LIBS@
- ERLANG_LIBS = @ERLANG_LIBS@
- 
-+ERLC_FLAGS += @ERLANG_SSL39@
-+
- # make debug=true to compile Erlang module with debug informations.
- ifdef debug
-   ERLC_FLAGS+=+debug_info
---- ejabberd-1.1.4.orig/src/aclocal.m4
-+++ ejabberd-1.1.4/src/aclocal.m4
-@@ -79,14 +79,21 @@
- -author('alexey@sevcom.net').
- 
- -export([[start/0]]).
-+-include_lib("ssl/include/ssl_pkix.hrl").
- 
- start() ->
-     EIDirS = code:lib_dir("erl_interface") ++ "\n",
-     EILibS =  libpath("erl_interface") ++ "\n",
-     RootDirS = code:root_dir() ++ "\n",
--    file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)),
-+    file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)),
-     halt().
- 
-+-ifdef('id-pkix').
-+ssldef() -> "-DSSL39\n".
-+-else.
-+ssldef() "\n".
-+-endif.
-+
- %% return physical architecture based on OS/Processor
- archname() ->
-     ArchStr = erlang:system_info(system_architecture),
-@@ -135,6 +142,8 @@
-    # Second line
-    ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1`
-    # Third line
-+   ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1`
-+   # End line
-    ERLANG_DIR=`cat conftest.out | tail -n 1`
-    
-    ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include"
-@@ -142,6 +151,7 @@
-    
-    AC_SUBST(ERLANG_CFLAGS)
-    AC_SUBST(ERLANG_LIBS)
-+   AC_SUBST(ERLANG_SSL39)
-    AC_SUBST(ERLC)
-    AC_SUBST(ERL)
- ])
diff --git a/net-im/ejabberd/files/ejabberd-1.1.4.confd b/net-im/ejabberd/files/ejabberd-1.1.4.confd
deleted file mode 100644
index a17197aaaf1a..000000000000
--- a/net-im/ejabberd/files/ejabberd-1.1.4.confd
+++ /dev/null
@@ -1,17 +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/ejabberd/files/ejabberd-1.1.4.confd,v 1.1 2008/02/22 14:58:22 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
diff --git a/net-im/ejabberd/files/ejabberd-1.1.4.initd b/net-im/ejabberd/files/ejabberd-1.1.4.initd
deleted file mode 100644
index 1f37df66a5c4..000000000000
--- a/net-im/ejabberd/files/ejabberd-1.1.4.initd
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-1.1.4.initd,v 1.1 2007/09/14 11:38:29 chainsaw Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use dns
-	need net
-	provide jabber-server
-}
-
-checkconfig() {
-	if [ ! -e /etc/jabber/ejabberd.cfg ] ; then
-		eerror "You need an /etc/jabber/ejabberd.cfg file to run ejabberd"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting eJabberd"
-	start-stop-daemon --start --quiet --chuid jabber:jabber \
-		--exec /usr/bin/env HOME=/var/run/jabber /usr/bin/ejabberd -- -noshell -detached
-	eend $?
-	# For bug #190266
-	chown jabber:jabber /var/run/jabber/.erlang.cookie
-}
-
-stop() {
-	ebegin "Stopping eJabberd"
-	if [ -z "$EJABBERD_NODE" ];
-	then
-		EJABBERD_NODE="ejabberd@`hostname -s`"
-	fi
-	/usr/bin/ejabberdctl $EJABBERD_NODE stop
-	eend $?
-}
-
-# Work around a bug in /sbin/runscript.sh - it won't run our custom
-# restart() unless it finds these two strings in the file.
-# svc_start svc_stop
-restart() {
-	ebegin "Restarting eJabberd"
-	if [ -z "$EJABBERD_NODE" ];
-	then
-		EJABBERD_NODE="ejabberd@`hostname -s`"
-	fi
-	/usr/bin/ejabberdctl $EJABBERD_NODE restart
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading eJabberd"
-	if [ -z "$EJABBERD_NODE" ];
-	then
-		EJABBERD_NODE="ejabberd@`hostname -s`"
-	fi
-	/usr/bin/ejabberdctl $EJABBERD_NODE reopen-log
-	eend $?
-}
diff --git a/net-im/ejabberd/files/ejabberd-2.0.4-fix-EJAB-890.patch b/net-im/ejabberd/files/ejabberd-2.0.4-fix-EJAB-890.patch
deleted file mode 100644
index 3da58ce6b83d..000000000000
--- a/net-im/ejabberd/files/ejabberd-2.0.4-fix-EJAB-890.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
-index 9bd5ba5..40cba2a 100644
---- ejabberd_c2s.erl
-+++ ejabberd_c2s.erl
-@@ -1091,21 +1091,16 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
- 			Attrs1 = lists:keydelete("type", 1, Attrs),
- 			{true, [{"type", "unavailable"} | Attrs1], StateData};
- 		    "subscribe" ->
--			Reason = xml:get_path_s(Packet,[{elem,"status"},cdata]),
--			SRes = check_privacy_subs(in, subscribe, From, To,
--						  Packet, Reason, StateData),
-+			SRes = is_privacy_allow(From, To, Packet, StateData#state.privacy_list),
- 			{SRes, Attrs, StateData};
- 		    "subscribed" ->
--			SRes = check_privacy_subs(in, subscribed, From, To,
--						  Packet, "", StateData),
-+			SRes = is_privacy_allow(From, To, Packet, StateData#state.privacy_list),
- 			{SRes, Attrs, StateData};
- 		    "unsubscribe" ->
--			SRes = check_privacy_subs(in, unsubscribe, From, To,
--						  Packet, "", StateData),
-+			SRes = is_privacy_allow(From, To, Packet, StateData#state.privacy_list),
- 			{SRes, Attrs, StateData};
- 		    "unsubscribed" ->
--			SRes = check_privacy_subs(in, unsubscribed, From, To,
--						  Packet, "", StateData),
-+			SRes = is_privacy_allow(From, To, Packet, StateData#state.privacy_list),
- 			{SRes, Attrs, StateData};
- 		    _ ->
- 			case ejabberd_hooks:run_fold(
-@@ -1628,35 +1623,18 @@ presence_track(From, To, Packet, StateData) ->
- 			    pres_a = A}
-     end.
- 
--%% Check privacy rules for subscription requests and call the roster storage
--check_privacy_subs(Dir, Type, From, To, Packet, Reason, StateData) ->
--    case is_privacy_allow(From, To, Dir, Packet, StateData) of
--	true ->
--	    ejabberd_hooks:run_fold(
--	      roster_in_subscription,
--	      To#jid.lserver,
--	      false,
--	      [To#jid.user, To#jid.server, From, Type, Reason]),
--	    true;
--	false ->
--	    false
--    end.
--
--%% Check if privacy rules allow this delivery, then push to roster
--is_privacy_allow(From, To, Dir, Packet, StateData) ->
--    case ejabberd_hooks:run_fold(
--	   privacy_check_packet, StateData#state.server,
--	   allow,
--	   [StateData#state.user,
--	    StateData#state.server,
--	    StateData#state.privacy_list,
--	    {From, To, Packet},
--	    Dir]) of
--	deny ->
--	    false;
--	allow ->
--	    true
--    end.
-+%% Check if privacy rules allow this delivery
-+is_privacy_allow(From, To, Packet, PrivacyList) ->
-+    User = To#jid.user,
-+    Server = To#jid.server,
-+    allow == ejabberd_hooks:run_fold(
-+	       privacy_check_packet, Server,
-+	       allow,
-+	       [User,
-+		Server,
-+		PrivacyList,
-+		{From, To, Packet},
-+		in]).
- 
- presence_broadcast(StateData, From, JIDSet, Packet) ->
-     lists:foreach(fun(JID) ->
-diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
-index 9a56e5f..148ef5a 100644
---- ejabberd_sm.erl
-+++ ejabberd_sm.erl
-@@ -59,6 +59,7 @@
- -include("ejabberd.hrl").
- -include("jlib.hrl").
- -include("ejabberd_ctl.hrl").
-+-include("mod_privacy.hrl").
- 
- -record(session, {sid, usr, us, priority, info}).
- -record(state, {}).
-@@ -381,13 +382,40 @@ do_route(From, To, Packet) ->
- 		    {Pass, _Subsc} =
- 			case xml:get_attr_s("type", Attrs) of
- 			    "subscribe" ->
--				{true, true};
-+				Reason = xml:get_path_s(
-+					   Packet,
-+					   [{elem, "status"}, cdata]),
-+				{is_privacy_allow(From, To, Packet) andalso
-+				 ejabberd_hooks:run_fold(
-+				   roster_in_subscription,
-+				   LServer,
-+				   false,
-+				   [User, Server, From, subscribe, Reason]),
-+				 true};
- 			    "subscribed" ->
--				{true, true};
-+				{is_privacy_allow(From, To, Packet) andalso
-+				 ejabberd_hooks:run_fold(
-+				   roster_in_subscription,
-+				   LServer,
-+				   false,
-+				   [User, Server, From, subscribed, ""]),
-+				 true};
- 			    "unsubscribe" ->
--				{true, true};
-+				{is_privacy_allow(From, To, Packet) andalso
-+				 ejabberd_hooks:run_fold(
-+				   roster_in_subscription,
-+				   LServer,
-+				   false,
-+				   [User, Server, From, unsubscribe, ""]),
-+				 true};
- 			    "unsubscribed" ->
--				{true, true};
-+				{is_privacy_allow(From, To, Packet) andalso
-+				 ejabberd_hooks:run_fold(
-+				   roster_in_subscription,
-+				   LServer,
-+				   false,
-+				   [User, Server, From, unsubscribed, ""]),
-+				 true};
- 			    _ ->
- 				{true, false}
- 			end,
-@@ -446,6 +474,31 @@ do_route(From, To, Packet) ->
- 	    end
-     end.
- 
-+%% The default list applies to the user as a whole,
-+%% and is processed if there is no active list set
-+%% for the target session/resource to which a stanza is addressed,
-+%% or if there are no current sessions for the user.
-+is_privacy_allow(From, To, Packet) ->
-+    User = To#jid.user,
-+    Server = To#jid.server,
-+    PrivacyList = ejabberd_hooks:run_fold(privacy_get_user_list, Server,
-+					  #userlist{}, [User, Server]),
-+    is_privacy_allow(From, To, Packet, PrivacyList).
-+
-+%% Check if privacy rules allow this delivery
-+%% Function copied from ejabberd_c2s.erl
-+is_privacy_allow(From, To, Packet, PrivacyList) ->
-+    User = To#jid.user,
-+    Server = To#jid.server,
-+    allow == ejabberd_hooks:run_fold(
-+	       privacy_check_packet, Server,
-+	       allow,
-+	       [User,
-+		Server,
-+		PrivacyList,
-+		{From, To, Packet},
-+		in]).
-+
- route_message(From, To, Packet) ->
-     LUser = To#jid.luser,
-     LServer = To#jid.lserver,
diff --git a/net-im/ejabberd/files/ejabberdctl b/net-im/ejabberd/files/ejabberdctl
deleted file mode 100644
index a3a18245e992..000000000000
--- a/net-im/ejabberd/files/ejabberdctl
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-exec env HOME=/var/run/ejabberd \
-         erl -pa /var/lib/ejabberd/ebin \
-             -noinput \
-             -sname ejabberdctl \
-             -s ejabberd_ctl \
-             -extra $@
diff --git a/net-im/ejabberd/files/ejabberdctl-wrapper-2.template b/net-im/ejabberd/files/ejabberdctl-wrapper-2.template
deleted file mode 100644
index 6443678cf9b2..000000000000
--- a/net-im/ejabberd/files/ejabberdctl-wrapper-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/inetrc b/net-im/ejabberd/files/inetrc
deleted file mode 100644
index 2d2f63575c2e..000000000000
--- a/net-im/ejabberd/files/inetrc
+++ /dev/null
@@ -1 +0,0 @@
-{file, resolv, "/etc/resolv.conf"}.
diff --git a/net-im/ejabberd/files/self-cert.sh b/net-im/ejabberd/files/self-cert.sh
deleted file mode 100755
index 2c984fd9dde4..000000000000
--- a/net-im/ejabberd/files/self-cert.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-######
-#
-# Generate a certificate and key with no passphrase.
-#
-######
-
-OPENSSL=/usr/bin/openssl
-
-## This generates the cert and key
-$OPENSSL req -new -x509 -newkey rsa:1024 -keyout /tmp/privkey.pem -out /etc/ejabberd/ssl.pem
-## This will remove the passphrase
-$OPENSSL rsa -in /tmp/privkey.pem -out /tmp/privkey.pem
-## Put it all together
-cat /tmp/privkey.pem >> /etc/ejabberd/ssl.pem
-## Cleanup
-rm /tmp/privkey.pem
-echo ""
-echo "Your new key is /etc/ejabberd/ssl.pem"
-echo ""