version bump wrt #382129. also fixes #378139.

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

6 files changed, 42 insertions, 34 deletions

diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog
index 11e4749f709a..d67b596d20fa 100644
--- a/net-misc/rabbitmq-server/ChangeLog
+++ b/net-misc/rabbitmq-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/rabbitmq-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.12 2011/07/25 09:36:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.13 2011/09/30 07:45:54 hollow Exp $
+
+*rabbitmq-server-2.6.1 (30 Sep 2011)
+
+  30 Sep 2011; Benedikt Böhm <hollow@gentoo.org>
+  -rabbitmq-server-2.4.1.ebuild, rabbitmq-server-2.5.1.ebuild,
+  +rabbitmq-server-2.6.1.ebuild, +files/rabbitmq-server.init-r3,
+  -files/rabbitmq-server.init-r1, files/rabbitmq-server.init-r2:
+  version bump wrt #382129. also fixes #378139.
 
 *rabbitmq-server-2.5.1 (25 Jul 2011)
 
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 $?
+}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.5.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.5.1.ebuild
index 3b878e6ad298..f393c08a3376 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.5.1.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # 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.5.1.ebuild,v 1.1 2011/07/25 09:36:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.5.1.ebuild,v 1.2 2011/09/30 07:45:54 hollow Exp $
 
 EAPI="2"
 
@@ -46,7 +46,7 @@ src_install() {
 	doins -r ebin include
 
 	einfo "Installing server scripts to /usr/sbin"
-	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-multi; do
+	for script in rabbitmq-env rabbitmq-server rabbitmqctl; do
 		exeinto /usr/libexec/rabbitmq
 		doexe scripts/${script}
 		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.4.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.6.1.ebuild
index a37299878603..9f28367d4cfb 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.4.1.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-2.6.1.ebuild
@@ -1,8 +1,8 @@
 # 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.4.1.ebuild,v 1.2 2011/07/25 09:36:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.6.1.ebuild,v 1.1 2011/09/30 07:45:54 hollow Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="<=dev-lang/erlang-14.2.2-r1"
+RDEPEND="dev-lang/erlang"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
@@ -46,7 +46,7 @@ src_install() {
 	doins -r ebin include
 
 	einfo "Installing server scripts to /usr/sbin"
-	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-multi; do
+	for script in rabbitmq-env rabbitmq-server rabbitmqctl; do
 		exeinto /usr/libexec/rabbitmq
 		doexe scripts/${script}
 		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
@@ -61,7 +61,7 @@ src_install() {
 	dodir /var/lib/rabbitmq{,/mnesia}
 
 	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r2 rabbitmq
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
 
 	# install documentation
 	doman docs/*.[15]