version bump wrt #347419

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

4 files changed, 35 insertions, 29 deletions

diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog
index cf60a19a8d7c..0d60371667ee 100644
--- a/net-misc/rabbitmq-server/ChangeLog
+++ b/net-misc/rabbitmq-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rabbitmq-server
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.9 2010/09/19 08:35:51 hollow Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.10 2011/04/07 15:23:19 hollow Exp $
+
+*rabbitmq-server-2.4.0 (07 Apr 2011)
+
+  07 Apr 2011; Benedikt Böhm <hollow@gentoo.org>
+  -rabbitmq-server-2.0.0.ebuild, +rabbitmq-server-2.4.0.ebuild,
+  -files/rabbitmq-server.init, +files/rabbitmq-server.init-r2:
+  version bump wrt #347419
 
 *rabbitmq-server-2.1.0 (19 Sep 2010)
 
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init b/net-misc/rabbitmq-server/files/rabbitmq-server.init
deleted file mode 100644
index 154f7df6586d..000000000000
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# 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/files/rabbitmq-server.init,v 1.2 2010/08/02 23:56:58 hollow Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	export HOME=/var/empty
-	ebegin "Starting RabbitMQ..."
-	rabbitmq-server -detached
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping RabbitMQ..."
-	rabbitmqctl stop
-	eend $?
-}
-
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2
new file mode 100644
index 000000000000..0d3553b78dc0
--- /dev/null
+++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2
@@ -0,0 +1,22 @@
+#!/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 $
+
+depend() {
+	need net
+	use dns epmd
+}
+
+start() {
+	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..."
+	/usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err
+	eend $?
+}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.0.0.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.4.0.ebuild
index 99b49f8784df..023161f0a967 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.0.0.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-2.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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/rabbitmq-server-2.0.0.ebuild,v 1.2 2010/08/29 17:36:35 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.4.0.ebuild,v 1.1 2011/04/07 15:23:19 hollow Exp $
 
 EAPI="2"
 
@@ -35,7 +35,7 @@ src_compile() {
 
 src_install() {
 	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/${P}"
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
 
 	einfo "Setting correct RABBITMQ_HOME in scripts"
 	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
@@ -61,7 +61,7 @@ src_install() {
 	dodir /var/lib/rabbitmq{,/mnesia}
 
 	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r1 rabbitmq
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r2 rabbitmq
 
 	# install documentation
 	doman docs/*.[15]