diff -urN rabbitmq-server/Manifest rabbitmq-server.new/Manifest
--- rabbitmq-server/Manifest	2009-06-21 12:09:06.000000000 -0400
+++ rabbitmq-server.new/Manifest	2010-01-07 14:56:56.000000000 -0500
@@ -1,8 +1,10 @@
 AUX rabbitmq-server.init 434 RMD160 11a7851c395e488bb03a7a002d62dae405d4f67f SHA1 c1030740427f95eedba3fafbb8a038ea69842607 SHA256 d3f8fb55bbab4506567a9dbc995194720ed63072c82af27bbb6831541a0fb89c
 DIST rabbitmq-server-1.5.4.tar.gz 113657 RMD160 af2aeb1c9d18d5bbf619b858278f1ddc8c02f02f SHA1 2ddf5328ab6635168962f76c29b77185064df2bc SHA256 4edc03be70810e04922b7fbcf51487970836a2ce4c0c887b3a6640bc4ebee362
 DIST rabbitmq-server-generic-unix-1.5.4.tar.gz 358688 RMD160 1c3de8125a7135b07c6cba01c8b3395a9aa79982 SHA1 3adcbc9aae336db45ecc0537dee614071315e439 SHA256 07efb49be2e61f9834d262ab93f364a14cb09061a86f8a6a478295858d367ba4
+DIST rabbitmq-server-1.7.0.tar.gz 143252 RMD160 092f90946825cc3eb277019805e24db637a559f4 SHA1 84fb86d403057bb808c1b51deee0c1fca3bf7bef SHA256 a73c25ff0e725a2b9afb37e3796ad46c32f5f6c097091f6c0e40ccc878db9e4a
 EBUILD rabbitmq-server-1.5.4-r1.ebuild 1664 RMD160 c5d95edef457441d79702f3a29e4c6493a77078b SHA1 17188dc82f1b23645f5092960519dbc86848589c SHA256 ffcba324a2f47c2847f5e11bd12cd536b52782f9ac7e9238e07a3944cb53c43b
 EBUILD rabbitmq-server-1.5.4-r2.ebuild 1683 RMD160 0ad23173fe5c24689c3354986a5ecfec4d92ecd8 SHA1 156ee435e60f3a381a6f27955fa88b4739e41d26 SHA256 9588d3b537617457828140b96f763e6eb52fedbcd70c9019257076e22404e205
 EBUILD rabbitmq-server-1.5.4.ebuild 1133 RMD160 ae93e0f0b85ec67d18d4ee8408c07423c196d803 SHA1 963b07a1cd97a9a25cbe9a886cb76fce0971a125 SHA256 e5beaf777c5d6c5142eefa5ee36e9fda8e8f21fffa0ab79b633069b311eff518
+EBUILD rabbitmq-server-1.7.0.ebuild 1827 RMD160 8bab123a4f9d9e7e677e630042667215bebaf231 SHA1 b4780fbec49754010e75216473a971f6f52cac65 SHA256 a08df4a13994e945f659644a825123b08d5ad55662fe85f1a75fb640f080c6b8
 MISC ChangeLog 756 RMD160 9e34f6339dc42ca0d1a817a22b62b78b6f18d20e SHA1 1e135a25eac7ed83fabfeecfc50fdf393de913b3 SHA256 628c6daa62352953cc00848544feafca494b5f3b0b723887c7f7993882556c9b
 MISC metadata.xml 224 RMD160 bb2009757c340fc870e2e7fe5eee501303c70a62 SHA1 e89e8d75b54d9f07a8e7efc9b468a9b74b2d5eec SHA256 79754f25228240ec611264268d0e8dd94cdd8f6cd0473c430343741a2d293824
diff -urN rabbitmq-server/rabbitmq-server-1.7.0.ebuild rabbitmq-server.new/rabbitmq-server-1.7.0.ebuild
--- rabbitmq-server/rabbitmq-server-1.7.0.ebuild	1969-12-31 19:00:00.000000000 -0500
+++ rabbitmq-server.new/rabbitmq-server-1.7.0.ebuild	2010-01-07 14:55:58.000000000 -0500
@@ -0,0 +1,59 @@
+# 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/${P}"
+
+	einfo "Correcting additional Erlang code path in scripts"
+	sed -i -e "s:\`dirname \$0\`\/..\/ebin:${targetdir}: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-multi scripts/rabbitmq-server scripts/rabbitmq-env scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins
+
+	einfo "Installing rabbitmqctl to /usr/bin"
+	# Install control script to bin
+	dobin scripts/rabbitmqctl
+
+	dosym /usr/sbin/rabbitmq-env /usr/bin/rabbitmq-env
+
+	# 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
+}