3 files changed, 26 insertions, 26 deletions
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r1 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r1
deleted file mode 100644
index d659af4499b1..000000000000
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# 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/files/rabbitmq-server.init-r1,v 1.1 2010/08/28 14:33:02 hollow Exp $
-
-depend() {
-	# uncomment this as soon as bug 334979 is fixed
-	#need epmd
-	need net
-	use dns
-}
-
-start() {
-	ebegin "Starting RabbitMQ..."
-	/usr/sbin/rabbitmq-multi start_all ${NODE_COUNT:-1} >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping RabbitMQ..."
-	/usr/sbin/rabbitmq-multi stop_all >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err
-	eend $?
-}
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2
index 0d3553b78dc0..34c632e1535a 100644
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2
+++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2,v 1.1 2011/04/07 15:23:19 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2,v 1.2 2011/09/30 07:45:54 hollow Exp $
 
 depend() {
 	need net
@@ -9,14 +9,14 @@ depend() {
 }
 
 start() {
-	ebegin "Starting RabbitMQ..."
+	ebegin "Starting RabbitMQ"
 	setsid sh -c "/usr/sbin/rabbitmq-server >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err" &
 	/usr/sbin/rabbitmqctl wait &>/dev/null
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping RabbitMQ..."
+	ebegin "Stopping RabbitMQ"
 	/usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err
 	eend $?
 }
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
new file mode 100755
index 000000000000..f3fbaf861b9f
--- /dev/null
+++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3,v 1.1 2011/09/30 07:45:54 hollow Exp $
+
+depend() {
+	need net
+	use dns epmd
+}
+
+start() {
+	ebegin "Starting RabbitMQ"
+	/usr/sbin/rabbitmq-server -detached >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err
+	/usr/sbin/rabbitmqctl status | sed -n 's/[^p]*pid,\([0-9]*\)[^0-9]*/\1/p' > /var/run/rabbitmq.pid
+	/usr/sbin/rabbitmqctl -q wait /var/run/rabbitmq.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping RabbitMQ"
+	/usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err
+	eend $?
+}