Various fixes submitted by Luke Chamberlain (luke@re.gen.nz)

Package-Manager: portage-2.1.6.11/cvs/Linux i686

3 files changed, 66 insertions, 2 deletions

diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog
index 01921e62799d..4a223be5571a 100644
--- a/net-misc/rabbitmq-server/ChangeLog
+++ b/net-misc/rabbitmq-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/rabbitmq-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.1 2009/04/19 12:42:54 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.2 2009/04/22 10:48:00 caleb Exp $
+
+*rabbitmq-server-1.5.4-r1 (22 Apr 2009)
+
+  22 Apr 2009; Caleb Tennis <caleb@gentoo.org>
+  +rabbitmq-server-1.5.4-r1.ebuild:
+  Various fixes submitted by Luke Chamberlain (luke@re.gen.nz)
 
 *rabbitmq-server-1.5.4 (19 Apr 2009)
 
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 8e9546f1e9b8..fff9e7626cb4 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,5 +1,7 @@
 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
+EBUILD rabbitmq-server-1.5.4-r1.ebuild 1661 RMD160 b1b7e79ac38228387d5ddfd9eeaec03e88e440fd SHA1 123ec3002a058261f66f6a2e2556ac59a49c03c7 SHA256 646f9f2aca6724e0f35eea01ae78152ca3072b5ce8f1a962c5c6b88ff32119af
 EBUILD rabbitmq-server-1.5.4.ebuild 1133 RMD160 ae93e0f0b85ec67d18d4ee8408c07423c196d803 SHA1 963b07a1cd97a9a25cbe9a886cb76fce0971a125 SHA256 e5beaf777c5d6c5142eefa5ee36e9fda8e8f21fffa0ab79b633069b311eff518
-MISC ChangeLog 399 RMD160 c6a1581fe255104c85b3c1def21630cf017c2c2d SHA1 111c6ccccd7a34345b06683851eb13bdedaef2f3 SHA256 56408c3f8ee541cb46c6c4ba3ca4e4ad64f660e2031177bca35f53f120adca66
+MISC ChangeLog 587 RMD160 572b2cb2e20a75103152fc4f21460c3eab2a4ed9 SHA1 9109bc27b42897602787fd85b0fb27b870fed20d SHA256 37ac4b3dfd20907fc5f2023308b4166ae5544cd63224c231ea4dff7f01cd2a81
 MISC metadata.xml 224 RMD160 bb2009757c340fc870e2e7fe5eee501303c70a62 SHA1 e89e8d75b54d9f07a8e7efc9b468a9b74b2d5eec SHA256 79754f25228240ec611264268d0e8dd94cdd8f6cd0473c430343741a2d293824
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..f3802fc0ebda
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r1.ebuild
@@ -0,0 +1,56 @@
+# 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-r1.ebuild,v 1.1 2009/04/22 10:48:00 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"
+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
+
+	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
+}