# HG changeset patch
# User holger
# Date 1256871894 -3600
# Node ID e165174ac4709f1039fbe73718df4a7a39728e24
# Parent  6dd358c8854bb7943c8d781b3906c0d216042406
update rabbitmq-server with b.g.o fixes

diff -r 6dd358c8854b -r e165174ac470 net-misc/rabbitmq-server/Manifest
--- a/net-misc/rabbitmq-server/Manifest	Tue Oct 27 15:24:16 2009 +0100
+++ b/net-misc/rabbitmq-server/Manifest	Fri Oct 30 04:04:54 2009 +0100
@@ -1,3 +1,3 @@
 AUX rabbitmq-server.init 434 RMD160 11a7851c395e488bb03a7a002d62dae405d4f67f SHA1 c1030740427f95eedba3fafbb8a038ea69842607 SHA256 d3f8fb55bbab4506567a9dbc995194720ed63072c82af27bbb6831541a0fb89c
 DIST rabbitmq-server-1.7.0.tar.gz 143252 RMD160 092f90946825cc3eb277019805e24db637a559f4 SHA1 84fb86d403057bb808c1b51deee0c1fca3bf7bef SHA256 a73c25ff0e725a2b9afb37e3796ad46c32f5f6c097091f6c0e40ccc878db9e4a
-EBUILD rabbitmq-server-1.7.0.ebuild 1807 RMD160 e2547f98e74884fef39f0e4a4bfa5ecdfd6dbcfb SHA1 672eaed3d5e33c92497ed4e1102229345fcfe1ac SHA256 2cfd7b022a0ac61cd01796bac1eec91990afe44fc1b83dc4e77b799ce9942576
+EBUILD rabbitmq-server-1.7.0.ebuild 1835 RMD160 c9cf9a9e17384ca7fd6813020e34a2ea87026aee SHA1 1e47e69b5a5f7d41469af1458ec733b05326c751 SHA256 3287ea3483e1eca2763798d0d6ec8204acc39170d6f8770e6c1c3ff5e1d20638
diff -r 6dd358c8854b -r e165174ac470 net-misc/rabbitmq-server/rabbitmq-server-1.7.0.ebuild
--- a/net-misc/rabbitmq-server/rabbitmq-server-1.7.0.ebuild	Tue Oct 27 15:24:16 2009 +0100
+++ b/net-misc/rabbitmq-server/rabbitmq-server-1.7.0.ebuild	Fri Oct 30 04:04:54 2009 +0100
@@ -1,6 +1,6 @@
 # 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.2 2009/04/23 03:37:16 mr_bones_ Exp $
+# $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
 
@@ -19,10 +19,10 @@
 
 src_install() {
 	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/${P}"
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
 
 	einfo "Correcting additional Erlang code path in scripts"
-	sed -i -e "s:\`dirname \$0\`\/..\/ebin:${targetdir}:g" scripts/* || die "sed failed"
+	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}"
@@ -30,12 +30,12 @@
 
 	einfo "Installing server scripts to /usr/sbin"
 	# Install server scripts to sbin
-	dosbin scripts/rabbitmq-env scripts/rabbitmq-multi scripts/rabbitmq-server
-	dosbin scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins
+	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/rabbitmq-env scripts/rabbitmqctl
+	dobin scripts/rabbitmqctl
 
 	# Docs
 	dodoc README