--- a/net-misc/rabbitmq-server/Manifest	Fri Jul 02 14:08:09 2010 +0200
+++ b/net-misc/rabbitmq-server/Manifest	Sat Jul 03 11:47:25 2010 +0200
@@ -1,3 +1,3 @@
 AUX rabbitmq-server.init 434 RMD160 11a7851c395e488bb03a7a002d62dae405d4f67f SHA1 c1030740427f95eedba3fafbb8a038ea69842607 SHA256 d3f8fb55bbab4506567a9dbc995194720ed63072c82af27bbb6831541a0fb89c
-DIST rabbitmq-server-1.7.2.tar.gz 156201 RMD160 ba2db97f88a3b51c6246307244e3f5b40112bb36 SHA1 ecc35617cc14cca7752f67b845bcc97e421254b4 SHA256 7a3f1a0324dbd1b450c85907fb43e92739f5c9708cf8550ef960a6eea9f488dd
-EBUILD rabbitmq-server-1.7.2.ebuild 1835 RMD160 c9cf9a9e17384ca7fd6813020e34a2ea87026aee SHA1 1e47e69b5a5f7d41469af1458ec733b05326c751 SHA256 3287ea3483e1eca2763798d0d6ec8204acc39170d6f8770e6c1c3ff5e1d20638
+DIST rabbitmq-server-1.8.0.tar.gz 202386 RMD160 935d1a5f171d2f7c34b6d785c52c169387a25343 SHA1 99cdd8832e972997b78efec11ff3d4e01846ca26 SHA256 ccb64d1ea0823a0e143444b8888f86b625bd6907f0625c9f7cd28da1d029d8d8
+EBUILD rabbitmq-server-1.8.0.ebuild 1585 RMD160 79e92961b57ad22563e1bbbd1a83948d33e52c6b SHA1 4d9b2306b2203fdd84b6baf15f8f8d23e9209591 SHA256 7723eb784051ef102a34df320f89f8dbadcfcdd848d5a60e1d92e3dae820a946

--- a/net-misc/rabbitmq-server/rabbitmq-server-1.7.2.ebuild	Fri Jul 02 14:08:09 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild,v 1.1 2009/06/21 15:45:19 caleb Exp $
-
-inherit eutils
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang."
-HOMEPAGE="http://www.rabbitmq.com/"
-SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz"
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Q: is RDEPEND-only sufficient for a binary package, since we don't compile?
-DEPEND="dev-lang/erlang
-	dev-python/simplejson"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Correcting additional Erlang code path in scripts"
-	sed -i -e "s:\`dirname \$0\`/rabbitmq-env:/usr/sbin/rabbitmq-env:g" scripts/* || die "sed failed"
-
-	einfo "Installing Erlang module to ${targetdir}"
-	dodir "${targetdir}"
-	cp -dpR ebin include "${D}/${targetdir}"
-
-	einfo "Installing server scripts to /usr/sbin"
-	# Install server scripts to sbin
-	dosbin scripts/rabbitmq-env scripts/rabbitmq-multi scripts/rabbitmq-server \
-	    scripts/rabbitmq-server scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins
-
-	einfo "Installing rabbitmqctl to /usr/bin"
-	# Install control script to bin
-	dobin scripts/rabbitmqctl
-
-	# Docs
-	dodoc README
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	dodir /var/lib/rabbitmq/mnesia
-
-	# Install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init rabbitmq
-}
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 -1 rabbitmq
-}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/rabbitmq-server/rabbitmq-server-1.8.0.ebuild	Sat Jul 03 11:47:25 2010 +0200
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.8.0.ebuild,v 1.1 2010/07/03 08:21:06 hollow Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang."
+HOMEPAGE="http://www.rabbitmq.com/"
+SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/erlang"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-python/simplejson
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 -1 rabbitmq
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/${P}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i scripts/rabbitmq_env
+
+	einfo "Installing Erlang module to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r ebin include
+
+	einfo "Installing server scripts to /usr/sbin"
+	dosbin scripts/rabbitmq-multi scripts/rabbitmq-server scripts/rabbitmq-env \
+		scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins \
+		scripts/rabbitmqctl
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	dodir /var/lib/rabbitmq/mnesia
+
+	# Install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init rabbitmq
+
+	dodoc README
+}