Revert recent stable versions back, added <erlang-13 dependency too.

Package-Manager: portage-2.2_rc33/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 320 insertions, 12 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index b071b738e5a4..13142f1ccc31 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.63 2009/06/03 06:07:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.64 2009/06/05 12:56:25 pva Exp $
+
+  05 Jun 2009; Peter Volkov <pva@gentoo.org> +ejabberd-2.0.5.ebuild,
+  +ejabberd-2.0.5-r1.ebuild:
+  Revert recent stable versions back, added <erlang-13 dependency too.
 
 *ejabberd-2.0.5-r3 (03 Jun 2009)
 
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index dc2b89ed60fe..0f00aa01ba33 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,6 +1,3 @@
------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
@@ -28,14 +25,9 @@ DIST ejabberd-2.0.5.tar.gz 1796737 RMD160 5ec0210b3995004c708180a66a096e0b9be5f1
 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 4891 RMD160 1469f0ea5a5e9faa1ae8416f4bfdb0c4ef495256 SHA1 324a8119752aef53fc703e9996975b0c86fa69a0 SHA256 a76c52ef35d946febfa2b8e899369de9a8a6cf87ae74c126fc7a4a881a964e44
-MISC ChangeLog 13625 RMD160 20eeb1bc9e3205c0b3aea25d8c48c924b98bd41f SHA1 2894cc8234a9424066752682f1143602ef4a46a8 SHA256 b026260edbd8915da3bf8800058f87e20b66ac3861967e25c7bde9e445df76d7
+EBUILD ejabberd-2.0.5.ebuild 4766 RMD160 3fd0647521dba6bc68e1fa5d405d75d368e96eb0 SHA1 07f9296159dfc9e1c06015479d4437471d3fcb62 SHA256 098f80b5acb25a9af53eb1cd572075d9a79955eb5bb8de242c2bfeeb77d0b53f
+MISC ChangeLog 13793 RMD160 dbf695d58d5231a08ec0ef8a63ea6e8f4df34dc4 SHA1 9df6505311aa6838a85cc6e7b890b079b58e918d SHA256 d2581bcee14b5227f655287177f1edb8af289ec1560c827042ab21320959c210
 MISC metadata.xml 619 RMD160 ca6e7f018d370ce36a3b93eb960254537260949c SHA1 404f3d0d31036ed1cfeb8aeee2264559c1d1c8d9 SHA256 843e1bbd5fdc082763e71322094170cde5b90d0f5d9320011c4b9872cd6589f4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkomEzUACgkQNQqtfCuFneOO8QCbB9PtWCRw/B3iZpJkxIKfaFet
-IZYAn3EafrurzX0mrmeiVGIfpUvkPUTz
-=m890
------END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/ejabberd-2.0.5-r1.ebuild b/net-im/ejabberd/ejabberd-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..093e82b6f825
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-2.0.5-r1.ebuild
@@ -0,0 +1,156 @@
+# 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.ebuild b/net-im/ejabberd/ejabberd-2.0.5.ebuild
new file mode 100644
index 000000000000..cab40bf8fdad
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-2.0.5.ebuild
@@ -0,0 +1,156 @@
+# 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'
+}