bump to 2.0.0, remove old versions

Package-Manager: portage-2.1.4.4

8 files changed, 14 insertions, 454 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index fa2e8d92f391..1c067cf75af0 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.30 2008/02/10 00:35:58 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.31 2008/02/22 14:55:58 caleb Exp $
+
+*ejabberd-2.0.0 (22 Feb 2008)
+
+  22 Feb 2008; Caleb Tennis <caleb@gentoo.org> -files/ejabberd-1.1.3.confd,
+  -files/1.1.3-missing-declaration.patch, -ejabberd-1.1.3.ebuild,
+  -ejabberd-1.1.3-r1.ebuild, -ejabberd-1.1.3-r2.ebuild,
+  -ejabberd-2.0.0_rc1.ebuild, +ejabberd-2.0.0.ebuild:
+  bump to 2.0.0, remove old versions
 
   10 Feb 2008; Luca Barbato <lu_zero@gentoo.org> ejabberd-2.0.0_rc1.ebuild:
   Marked ~ppc
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 8f517ddeeccd..43eddd96be89 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,10 +1,8 @@
-AUX 1.1.3-missing-declaration.patch 334 RMD160 af3e6f2560533ab5fcda7c8ac3d4789324ea8023 SHA1 a04bbfaa748ec3d45f0c3bb5fbc50d2d8b520d9f SHA256 c3ecd6e3b2fc7548eaa151754020ff9d799de7ea0d9efc9afd6db06a84422736
 AUX 1.1.4-missing-declaration.patch 411 RMD160 f314900dd00fd23c9043cb5a60982448c39d2fa9 SHA1 687066247c9ad74c4e9ec869a9f4f0d9e80bae6d SHA256 1c32a57f4f187d55b28b240820875fcd3e731f6d91cd9429d14c318222f07e7b
 AUX 2.0.0-missing-declaration.patch 411 RMD160 f314900dd00fd23c9043cb5a60982448c39d2fa9 SHA1 687066247c9ad74c4e9ec869a9f4f0d9e80bae6d SHA256 1c32a57f4f187d55b28b240820875fcd3e731f6d91cd9429d14c318222f07e7b
 AUX ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e211f6e59c96dd6ce419a4c0bcdd3d9 SHA256 1f2254ce2835a986eb75adaf5602d1cb74ced989c2360331822a2c5e11c9837b
 AUX ejabberd-1.1.1-r1.initd 1401 RMD160 7513d6b71200591a3266e9355505f0b715879ca8 SHA1 14624338a1520291cd08bf0044d3a8845fefd796 SHA256 a69e65d6ec26ed2af1e8cda83493e0a2a652b165560317bf6679fbc97d83db49
 AUX ejabberd-1.1.1.confd 772 RMD160 e250deb4895d02637043877b5f17db447488da0d SHA1 4a716be46619efb4ee40810cbcc11ab191a583de SHA256 61e329a57da720527101a0db42d0ac3ec31d908039b445a1d9e90df5b1195135
-AUX ejabberd-1.1.3.confd 739 RMD160 b06ee5cf9f6542dd752c44dc0ef21076163811e5 SHA1 9bd467e571f70482750db0108775273da93de772 SHA256 840fbf999509e03917b7281b2893e2609fb2d0dea016e7463590aa13507bb770
 AUX ejabberd-1.1.4-erlang-12.patch 3746 RMD160 17e6dc9ded6f598c27cf2cda098d2804e3c93957 SHA1 85e03ffd4e85b792759f23353d8e278f85276311 SHA256 bb96a790b948cd5c7359a7bdd2f2486d83dd7430b3556307c22188183be1f3aa
 AUX ejabberd-1.1.4.initd 1437 RMD160 96d9d35de36585a9e735f124b7be1618949541aa SHA1 623713cfb28a247f16a14f6b2ca6a8555609bd35 SHA256 59f983e32f7b530b66b5242ac6f06405b7440a112b2f980abe602508459d923e
 AUX ejabberd-2.0.0.initd 1434 RMD160 dcaf0056eb0f9d903fd550139d4c218e00b7c791 SHA1 eb99a7a8154ad094313451ada9cacb065f240590 SHA256 72f151da8193bafec7c578d1a74e5a3da52f0376e5786d620329fe7a20dfa201
@@ -13,14 +11,10 @@ AUX inetrc 36 RMD160 4b79020864689ede547969610fde18fe490f5810 SHA1 1e0bae0f7251e
 AUX self-cert-v2.sh 1009 RMD160 48b7091243bb30718121bad3e771a9335404d75e SHA1 5fe0516f5001a6580cb977bbce2bf63c117fe26a SHA256 a17d411a138b9130b13d9eb7036984ddca2a47b2f66f55eee738f028e817e327
 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.3.tar.gz 826057 RMD160 99b4c73ae29ef9814f5c572f8e3b3a82d960f5ee SHA1 66b00ca52fa4f4f4e097b0e897c3b5a2e4526603 SHA256 3b8ac67673fa6c08bc25382d3e99171ebc71d4759899eb5a730e65117256e703
 DIST ejabberd-1.1.4.tar.gz 846059 RMD160 4c72548129b0196ff0096bd85936e0750fc4d7be SHA1 db6f521d45dece200de4eb6fc967c64728e8f6a3 SHA256 dcd61b72c522eee77ab56227b16d75fd5741efe2b9b9a8a1d3ed7eefc2a7e4f6
-DIST ejabberd-2.0.0-rc1.tar.gz 1371857 RMD160 ada84c41bd9d997cb55106690065fd235c3155c3 SHA1 12bcc965f68fd7544a2284d20519b93ae7afb6f2 SHA256 fe5b348156568bea036749e598e7c371305ae6752800936adf3303afb7d68d0a
-EBUILD ejabberd-1.1.3-r1.ebuild 3945 RMD160 7a513028284e746b61599132a696bef3cdb9f5cb SHA1 285238a0a201b15887c091e897f29488ddda7756 SHA256 21d6c50e18f8251e21714e3f67e6819f33b2c28fa862434332123978baef50c3
-EBUILD ejabberd-1.1.3-r2.ebuild 3467 RMD160 0c246504ea43acdf03351440b437b4cbe283ca35 SHA1 0fef6e570814ae652982c745778fc4f27ea90fdc SHA256 f243e6be538869e63e6e7850a67ecda46bf6226ea7d86d7a532f99fe23c480e9
-EBUILD ejabberd-1.1.3.ebuild 3367 RMD160 153663a118ebf45fce1cd68e9b3e7497bd7d5960 SHA1 065ff0d1095e5b53f4c7b93e0fca58583249e05c SHA256 cac88de8d3e24bf40c8729a226ff56807a7b8c4b6519761381f0883221b9255e
+DIST ejabberd-2.0.0.tar.gz 1387404 RMD160 9e7bb30825f2d480d75516136fcc62a49d871255 SHA1 d70257c1e75f59b7284d52c038431664cfd53e08 SHA256 086e105cb402ef868e3187277db1486807e1b34a2e3e3679f0ee6de1e5fd2e54
 EBUILD ejabberd-1.1.4-r1.ebuild 3454 RMD160 b5d68a4304ed7eaa3634cce61f5ea9ab950e5321 SHA1 e090e7a05d4c8fb639dc11a5409bee1999bc5134 SHA256 f88196beb2d1eeb7cd8d699f05c8578f6e303224d36450307dccda02794ac086
 EBUILD ejabberd-1.1.4.ebuild 3398 RMD160 27a04ce2f5b4b1ab0242c31b8e43d05d5fc17993 SHA1 1e06c37bde6bf4cb5cfa0218a14939bb394567cf SHA256 5ed0d6bfc3a034670a5821fbfcaf1e3c0d15ea3b89d888e997602f4dc62c640f
-EBUILD ejabberd-2.0.0_rc1.ebuild 3462 RMD160 32e583009be2505425661a939a831a703aab1481 SHA1 5be132f49a59ce3d18e4890c83067a160c418699 SHA256 61200724711531340323da76650846efd19eae075f5efa5a1d65f317e24e7361
-MISC ChangeLog 6604 RMD160 bc7ca0e1398df4b866554748947b88d1ba70c126 SHA1 66aa6e2e8118c1d7ad8dd3ec889e2a30ead5a8bc SHA256 f5febfaac2ea9dcde93998a17b23fc87696f53c2b279d469ea48b7060c5e2faf
+EBUILD ejabberd-2.0.0.ebuild 3450 RMD160 16dcf0a34066b9962d09cd06a0fa15c5ece61f01 SHA1 0cc3ff09d050ec3bee2de28ecd997681220cc0cd SHA256 de8913a00636433dddad7192183703b19ce76962c31bd34526e30b7b68b034bd
+MISC ChangeLog 6923 RMD160 3af6d01b2cacf6b49ed7287007a8185c19b9d106 SHA1 4946d7d9aed9205205c348f4e780401b74ce875e SHA256 31cab20a6922cfdcda71944741861a07c6149f2aef328355278f20a94a0ee617
 MISC metadata.xml 383 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee SHA1 2e1a9e8406a47ceb62f0d9edcabd27668b412634 SHA256 c1afbca95c1be1d2095a4dcd6ba39c8d1dd1974993b0f800264add3c18428a55
diff --git a/net-im/ejabberd/ejabberd-1.1.3-r1.ebuild b/net-im/ejabberd/ejabberd-1.1.3-r1.ebuild
deleted file mode 100644
index 4444d8a726d7..000000000000
--- a/net-im/ejabberd/ejabberd-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,155 +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/ejabberd-1.1.3-r1.ebuild,v 1.1 2007/04/11 14:42:45 chainsaw Exp $
-
-inherit eutils multilib versionator
-
-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="mod_irc mod_muc mod_pubsub ldap odbc sname ssl web"
-
-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 )"
-
-PROVIDE="virtual/jabber-server"
-S=${WORKDIR}/${P}/src
-
-src_unpack() {
-	# Bug #171551
-	if useq ssl && built_with_use dev-libs/openssl zlib ; then
-		die "Openssl must be built without the zlib USE flag to avoid triggering ejabberd SSL/TLS instability"
-	fi
-
-	unpack ${A}
-	cd ${S}
-
-	# Bug #171427
-	epatch ${FILESDIR}/${PV}-missing-declaration.patch
-}
-
-src_compile() {
-	econf ${myconf}							\
-		$(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)					\
-		|| die "econf failed"
-
-	emake || die "compiling ejabberd core failed"
-}
-
-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}
-
-	# Bug #161252
-	if useq sname; then
-		CHECK_CONF=""
-		EJD_LINE="-sname ejabberd"
-		EJCTL_LINE="-sname ejabberdctl"
-	else
-		CHECK_CONF=". /etc/conf.d/ejabberd"
-		EJD_LINE="-name \$EJABBERD_NODE"
-		EJCTL_LINE="-name \$EJABBERCTL_NODE"
-	fi
-
-	#
-	# Create /usr/bin/ejabberd
-	#
-	cat <<EOF > ${T}/ejabberd
-#!/bin/bash
-
-${CHECK_CONF}
-
-erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
-	${pa} \\
-	${EJD_LINE} \\
-	-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
-
-${CHECK_CONF}
-
-exec env HOME=${JABBER_RUN} \\
-	erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
-		${pa} \\
-		-noinput \\
-		${EJCTL_LINE} \\
-		-s ejabberd_ctl \\
-		-extra \$@
-EOF
-
-	dobin ${T}/ejabberdctl
-	dobin ${T}/ejabberd
-
-	newinitd ${FILESDIR}/ejabberd-1.1.1-r1.initd ${PN}
-	newconfd ${FILESDIR}/${P}.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
-			ebegin "Creating SSL key"
-			sh ${JABBER_ETC}/self-cert.sh &> /dev/null
-			eend $?
-		fi
-		chown jabber:jabber ${JABBER_ETC}/ssl.pem
-		elog "Please be sure that your ${JABBER_ETC}/ejabber.cfg points to ${JABBER_ETC}/ssl.pem"
-		elog "You may want to edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh again"
-	fi
-	if ! useq web ; then
-		elog "The web USE flag is off, this has disabled the web admin interface."
-	fi
-	if useq odbc ; then
-		elog "Please add a column askmessage to the rosterusers table if migrating from 1.1.1"
-	fi
-}
diff --git a/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild b/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild
deleted file mode 100644
index f6ba1f240e3e..000000000000
--- a/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild
+++ /dev/null
@@ -1,135 +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/ejabberd-1.1.3-r2.ebuild,v 1.3 2007/09/01 07:04:02 opfer Exp $
-
-inherit eutils multilib versionator
-
-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"
-
-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 )"
-
-PROVIDE="virtual/jabber-server"
-S=${WORKDIR}/${P}/src
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Bug #171427
-	epatch "${FILESDIR}/${PV}-missing-declaration.patch"
-}
-
-src_compile() {
-	econf ${myconf}							\
-		$(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)					\
-		|| 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}/ejabberd-1.1.1-r1.initd" ${PN}
-	newconfd "${FILESDIR}/${P}.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
-	if useq odbc ; then
-		elog "Please add a column askmessage to the rosterusers table if migrating from 1.1.1"
-	fi
-}
diff --git a/net-im/ejabberd/ejabberd-1.1.3.ebuild b/net-im/ejabberd/ejabberd-1.1.3.ebuild
deleted file mode 100644
index 04df8ed14848..000000000000
--- a/net-im/ejabberd/ejabberd-1.1.3.ebuild
+++ /dev/null
@@ -1,124 +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/ejabberd-1.1.3.ebuild,v 1.3 2007/03/11 19:04:23 corsair Exp $
-
-inherit eutils multilib versionator
-
-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="mod_irc mod_muc mod_pubsub ldap odbc ssl web"
-
-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* )"
-
-PROVIDE="virtual/jabber-server"
-S=${WORKDIR}/${P}/src
-
-src_compile() {
-	econf ${myconf}								 \
-		$(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)					 \
-		|| die "econf failed"
-
-	emake || die "compiling ejabberd core failed"
-}
-
-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}/ejabberd-1.1.1-r1.initd ${PN}
-	newconfd ${FILESDIR}/ejabberd-1.1.1.confd ${PN}
-
-	insinto ${JABBER_ETC}
-	doins ${FILESDIR}/inetrc
-	doins ${FILESDIR}/ssl.cnf
-	newins ${FILESDIR}/self-cert-v2.sh self-cert.sh
-}
-
-pkg_postinst() {
-	einfo "For configuration instructions, please see /usr/share/doc/${PF}/html/guide.html"
-	einfo "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
-			ebegin "Creating SSL key"
-			sh ${JABBER_ETC}/self-cert.sh &> /dev/null
-			eend $?
-		fi
-		chown jabber:jabber ${JABBER_ETC}/ssl.pem
-		ewarn "Please be sure that your ${JABBER_ETC}/ejabber.cfg points to ${JABBER_ETC}/ssl.pem"
-		ewarn "You may want to edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh again"
-	fi
-	if ! useq web ; then
-		einfo "The web USE flag is off, this has disabled the web admin interface."
-	fi
-	if useq odbc ; then
-		ewarn "Please add a column askmessage to the rosterusers table if migrating from 1.1.1"
-	fi
-}
diff --git a/net-im/ejabberd/ejabberd-2.0.0_rc1.ebuild b/net-im/ejabberd/ejabberd-2.0.0.ebuild
index c3886749272e..c13843ba9456 100644
--- a/net-im/ejabberd/ejabberd-2.0.0_rc1.ebuild
+++ b/net-im/ejabberd/ejabberd-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.0_rc1.ebuild,v 1.2 2008/02/10 00:35:58 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.0.ebuild,v 1.1 2008/02/22 14:55:58 caleb Exp $
 
 inherit eutils multilib
 
@@ -9,7 +9,7 @@ JABBER_RUN="/var/run/jabber"
 JABBER_SPOOL="/var/spool/jabber"
 JABBER_LOG="/var/log/jabber"
 
-MY_PV=${PV/_rc1/}
+MY_PV=${PV}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="The Erlang Jabber Daemon"
diff --git a/net-im/ejabberd/files/1.1.3-missing-declaration.patch b/net-im/ejabberd/files/1.1.3-missing-declaration.patch
deleted file mode 100644
index a9ece714782a..000000000000
--- a/net-im/ejabberd/files/1.1.3-missing-declaration.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ejabberd-1.1.3/src/expat_erl.c.orig	2007-04-11 15:24:05.000000000 +0100
-+++ ejabberd-1.1.3/src/expat_erl.c	2007-04-11 15:25:25.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/ejabberd-1.1.3.confd b/net-im/ejabberd/files/ejabberd-1.1.3.confd
deleted file mode 100644
index 2a6dc053c8fc..000000000000
--- a/net-im/ejabberd/files/ejabberd-1.1.3.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.3.confd,v 1.1 2007/04/11 14:42:45 chainsaw 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