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

Package-Manager: portage-2.2_rc28/cvs/Linux i686

20 files changed, 212 insertions, 359 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/Manifest b/net-im/ejabberd/Manifest
index 7532b8998ac8..40c01a671cbb 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -7,20 +7,12 @@ AUX ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e
 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.1.confd 840 RMD160 c013ebfe1e471916561ba23a0ac83618501ce8cc SHA1 1bf74fa62acfd3edf60633fcdf11aeb2882a150a SHA256 8df6a561feeb84c5117837ef6924fec4aed392accd20fd1b0135a3dc789f1372
-AUX ejabberd-2.0.1.initd 1132 RMD160 54f96d792816f214d689e01f0ea571681ad6a9b0 SHA1 154d6494c18eb8f97b9d2bf4420562ebe64bbd32 SHA256 c493257640d0195552c87f38d803fc8c15d3d36caced476e021d57960fa92acb
-AUX ejabberd-2.0.2.confd 840 RMD160 5227a3fbb0d0c8bffd8a5537003f965f1fb73582 SHA1 d3a51fa0923a571d30f3f0840834c651726ad206 SHA256 d6b0c44a450c4191e450b8e3ab281dc2e3bc668a97ddd1652d2e6c555675a2c6
-AUX ejabberd-2.0.2.initd 1132 RMD160 dd527410a24368940ad23075f4ff57f4ee9828a2 SHA1 9fa7859b48248e27b39e13775699921d8e6b024a SHA256 1b14f49ae4ebca31bf3aab6a7d9887752174c032a176e1da9a43120c1e350b22
 AUX ejabberd-2.0.4-fix-EJAB-890.patch 5259 RMD160 72fe6630ab6ca84b90a4947b95ac24b689a86bd7 SHA1 ab61f5335177a4344a61830e39ada84f6688f2b4 SHA256 be38a6a278f3ad4da3fd9dfd56623a271677d8897cf4fd04b31994ed5d6f7959
-AUX ejabberd-2.0.4.confd 840 RMD160 0d6761c629964febf390249304d9b2a4e10f85b4 SHA1 0afedf459a4a8bf6c24798800c1f83149003f44f SHA256 5f86c82752f5cbdc77556a134d3d0d07e682f7255a25d91873677f9e2f43cda0
-AUX ejabberd-2.0.4.initd 1132 RMD160 c055617a8f5cc1a095742dbfeabd96edf2cdcbb6 SHA1 1b4a5b5ff8b4af5fea1341befe808f3b39d67edb SHA256 5b3b7a59b17979bf4bc7baba39f3ae5801f5176b061fc52e6ca77effab59fdec
-AUX ejabberd-wrapper-2.0.1.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
-AUX ejabberd-wrapper-2.0.2.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
-AUX ejabberd-wrapper-2.0.4.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
+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.0.1.template 530 RMD160 f39037aac0f7ae65c2ca41bef59aa500553a7077 SHA1 84f340e60ce66b3b01c6e82122783fa590edf282 SHA256 6436820e8d015f7831464e0fb175074397ab9906ee8d552f97292acc3cd9e756
-AUX ejabberdctl-wrapper-2.0.2.template 530 RMD160 f39037aac0f7ae65c2ca41bef59aa500553a7077 SHA1 84f340e60ce66b3b01c6e82122783fa590edf282 SHA256 6436820e8d015f7831464e0fb175074397ab9906ee8d552f97292acc3cd9e756
-AUX ejabberdctl-wrapper-2.0.4.template 530 RMD160 f39037aac0f7ae65c2ca41bef59aa500553a7077 SHA1 84f340e60ce66b3b01c6e82122783fa590edf282 SHA256 6436820e8d015f7831464e0fb175074397ab9906ee8d552f97292acc3cd9e756
+AUX ejabberdctl-wrapper-2.template 530 RMD160 f39037aac0f7ae65c2ca41bef59aa500553a7077 SHA1 84f340e60ce66b3b01c6e82122783fa590edf282 SHA256 6436820e8d015f7831464e0fb175074397ab9906ee8d552f97292acc3cd9e756
 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
@@ -29,12 +21,14 @@ DIST ejabberd-1.1.4.tar.gz 846059 RMD160 4c72548129b0196ff0096bd85936e0750fc4d7b
 DIST ejabberd-2.0.1_2.tar.gz 1054739 RMD160 a5561a6c508bbb9846a351189ed5aad2f5fb65ee SHA1 7fbb21eb87206c1b40e5234927e2d6a20de66149 SHA256 a5335517a443e80dae4698a33423858201d699af18d2b53b279a2ad171916ad4
 DIST ejabberd-2.0.2.tar.gz 1040817 RMD160 b24c1c2d6ce8c56fd26f28a98b89d99890dbad72 SHA1 7c82082b941277fe18aac25ca9b2016f25dc8472 SHA256 23136f2d215e82836d84322011914e1c9a846ab056b80cd26ff3e70b300b345a
 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.1_p2-r1.ebuild 4888 RMD160 d3155ae40d18d431f047e4dc7d29dbc7a57b9bbc SHA1 bef8cc2ed73edd70ba01490b062ac5247afcfcef SHA256 5cfd96195106459e4d5f1675d7b8837b060e91b2d69163c778f7f18954bcad55
-EBUILD ejabberd-2.0.2-r1.ebuild 4817 RMD160 f5a48c390ad0ea3760b2667c623374c1bc2a5ca4 SHA1 cc56db2924b713b7edff88ad304bd11c0c2377d2 SHA256 19b2b7dcfa1930068bbe1d2a79ab1d845823fce0ce962d1f8f42ee32a6d9fe30
-EBUILD ejabberd-2.0.2.ebuild 4814 RMD160 78fdc1c569c0961efda5aa9c53be5c363d5a4b13 SHA1 e6590f5fa39628aad821c0aaa75a93bfc1610998 SHA256 785f47b09ba14a32673a5a231d57b549aa61cb341f86e624f2630b941b4a302b
-EBUILD ejabberd-2.0.4-r1.ebuild 4894 RMD160 f3e1b6609b2c0d66ce005518ac320e540f769d84 SHA1 a513a4c13dffe86bb48cd31f590b274a40344908 SHA256 6cf06ff443c9f49f99290faf466aa199d31229c4fe96a8fe069ccf97b2b6fb74
-EBUILD ejabberd-2.0.4.ebuild 4831 RMD160 a107945058ff565b5a6ba60d27359f2f75761f09 SHA1 4857680dff8d02417c917f7bdf7b3cf6aa0a7f64 SHA256 3bd1fe637198b29ded4aeaac3771869e08541c51ace2531bde925d9dc745ee14
-MISC ChangeLog 11296 RMD160 b874bc478839b56632214abb4ec5d1849b35a8e8 SHA1 33bf3f3f1a72554f98bed0ba3aa471a043749e06 SHA256 06b64f344fa5e18152004803702107debe1a759cc1720b253d8e9b9cb1ffca60
+EBUILD ejabberd-2.0.1_p2-r1.ebuild 4872 RMD160 a1318db109e7036590ed4a5dee8ee165599903aa SHA1 71101d77390657292afa00357917c194c5756a57 SHA256 022fc433455080d2a21371ff3f937501fc683fd0af200770311f1143987c5e6b
+EBUILD ejabberd-2.0.2-r1.ebuild 4799 RMD160 aa56c896ec0fb7300c30d0b651589144794ab50c SHA1 2ad961722792f7bd032c6886a3ab359982e4693d SHA256 64d7b172446ba709f5392affed0f5118958271faf88034d54165dc3590455e05
+EBUILD ejabberd-2.0.2.ebuild 4796 RMD160 21b06d748fdce3254de01ea4534283b773a1f576 SHA1 b1314459af0720306c0354771cc52df390ca6a28 SHA256 8311eeceae62f8387c62c05343c82cc1d1985aa661084cedad03ae457b704e87
+EBUILD ejabberd-2.0.4-r1.ebuild 4880 RMD160 1afa8baedd614d60a94d2127b97cf731aa821a0f SHA1 87821e4fa57ba76558e50db23a74496aaef292b9 SHA256 e2ee596c6ceda950b378f85b59e8dcde5f80d1bf54f3960de2abb79d479f06fd
+EBUILD ejabberd-2.0.4.ebuild 4814 RMD160 3d3f65505877405ca7cbf008f900636146520f55 SHA1 ec3c64f8a4f55f98dc963b55ea7da5cd76f9f908 SHA256 62b65d0e2d4210437541a56d77388737ba26597b04233580c1bfc942177a3478
+EBUILD ejabberd-2.0.5.ebuild 4746 RMD160 e4489cd1f72a0b84c13a1ed26f6168979ea0f076 SHA1 a0e8cc91c3cdc45e4f6e23489ef12fef49295ddd SHA256 f7a3bd2fe8f28b2ba66cfb9b868a66da5a1e6a81f237408a012f34e2e3ebfa4c
+MISC ChangeLog 12180 RMD160 1fa8860d50f149c59d211764af2d4e74857016ea SHA1 1981e062117200acfe4882d3348673f6c88b2f76 SHA256 bf7deeb0f104a126421c69c2c52ebf5400b178af228eb70de49af2c486beae56
 MISC metadata.xml 619 RMD160 ca6e7f018d370ce36a3b93eb960254537260949c SHA1 404f3d0d31036ed1cfeb8aeee2264559c1d1c8d9 SHA256 843e1bbd5fdc082763e71322094170cde5b90d0f5d9320011c4b9872cd6589f4
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