version bump wrt #347419

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64

5 files changed, 39 insertions, 33 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/Manifest b/net-misc/rabbitmq-server/Manifest
index 2aeda06f341d..081848a5ca74 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,9 +1,9 @@
 AUX rabbitmq-script-wrapper 1844 RMD160 255586b0339a8200c63309eaefb952f67712eb0d SHA1 3b4f880d484541e749e3dd0d913adc6a21e4df23 SHA256 46783bc7466f48d8ddc785c5aac2b94d723c811106b6d8251adee170558f316e
-AUX rabbitmq-server.init 459 RMD160 b407cb249939b350a8190d37595d69f4fe472edf SHA1 242bb810ab313164865c3ba34906e660af631a20 SHA256 dc401ad19c5c7b8e113cbe1de22652db4c62a742c3a9d8a10b49ddc4b032f00e
 AUX rabbitmq-server.init-r1 677 RMD160 be421539a5dba2f9cc689492e66d99690036daae SHA1 8a931567b923473defb69483b47ab4c9a423d640 SHA256 f74ac0c623a698b7ecc1db2a85bd464e69253a6ac7fb6f265cbbe35742341c60
-DIST rabbitmq-server-2.0.0.tar.gz 272752 RMD160 cb7ad2c8b0282b9d11e4eae47646e6b59e81a8e2 SHA1 3c72e4bd540caa81180701414c9bb5ec298d0365 SHA256 68ec7d210e3a379696538f09322d1c8161066dbcb2a8822ffbfed068b7c9bc7f
+AUX rabbitmq-server.init-r2 645 RMD160 3dfed1fb7411b64c834061c07736ea162dcc66bb SHA1 caa830ce642966efcb9e809b5ab8404f117baafb SHA256 3837bd8df0d7c81829ea9763723e282ccd57204ffad89caa493a1f39849469ea
 DIST rabbitmq-server-2.1.0.tar.gz 275559 RMD160 7c447b47774f27c86efb3f8958b12cc7cff20ead SHA1 8cfff94a4685b645d0d14026b7df8e51ce414bd1 SHA256 16e3fa66ba36ee1478f79d83bc24f86be04123ba814f89d11fb6d1850267cd78
-EBUILD rabbitmq-server-2.0.0.ebuild 2252 RMD160 e6fb186f3a8a604067eb02c3b0b11a147c367cfc SHA1 3fb6568fb443a6825601d28780cba47fd21b532e SHA256 959b8dfec9e5100b5e8d1a5cd87a57b0a6c601ede2412e101ae342699e99fa52
+DIST rabbitmq-server-2.4.0.tar.gz 318182 RMD160 6362f4f2bf06f201410132be91edbd64a1577798 SHA1 9f39d830aa778cf8e71fd5eb47c8a42e26c3c42d SHA256 aadad1bb6ae8b7ecba73dbe1c74a2dfd3ac0559018ed0d433af1df9938f67e7f
 EBUILD rabbitmq-server-2.1.0.ebuild 2252 RMD160 459b31bd0d462e3aeea384196a2344ce71ab2b36 SHA1 954f4883d57e0d90ee0f2339e1858602edca9d8b SHA256 492e2b188664c606ebbcf8792e5c4b9351c21ae102e31cc2f4bc5ec39540a99b
-MISC ChangeLog 1821 RMD160 69acaed532be6e8880b83beaff60e42ab052aa5f SHA1 2f1c1c38e1346a6681ab3c4ee521315600a5f59a SHA256 82ba7e9d6cc798f7ccfa24dade297ecb5dea1c01fc6a64ccc72406a70b779b6c
+EBUILD rabbitmq-server-2.4.0.ebuild 2269 RMD160 6f4ae9f39f568cd34c23c414c70533dace1bb157 SHA1 e705804219ebc043e644afaa8c9181ad2012c76a SHA256 ad53c79a95b35c7fd8a520d957147967f9dbe908462c5f242c5cf92a132bbf8b
+MISC ChangeLog 2065 RMD160 b17602559e08349bdf5cfd6e36f31aedcecdd136 SHA1 36430ddbb1861485a85d9665ce04c4c7e5c3e061 SHA256 6508837612681eeb38986fe0a76468c9ba47093c3d96f61a0f36fdd379fa6dc1
 MISC metadata.xml 256 RMD160 d9b3d76f0f3b12500bf0a1e012563f2f32f4992f SHA1 2520f467b4a64d131a92dd8101e03ad334d6d7a6 SHA256 74f2c9d6b7ef600697deed6d19bc64604a39ba7a2e8c24fae47ca2544def84c0
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]