version bump wrt #382129. also fixes #378139.

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

7 files changed, 48 insertions, 52 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/Manifest b/net-misc/rabbitmq-server/Manifest
index d4c443b83156..229e7520c1ec 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX rabbitmq-script-wrapper 1844 RMD160 255586b0339a8200c63309eaefb952f67712eb0d SHA1 3b4f880d484541e749e3dd0d913adc6a21e4df23 SHA256 46783bc7466f48d8ddc785c5aac2b94d723c811106b6d8251adee170558f316e
-AUX rabbitmq-server.init-r1 677 RMD160 be421539a5dba2f9cc689492e66d99690036daae SHA1 8a931567b923473defb69483b47ab4c9a423d640 SHA256 f74ac0c623a698b7ecc1db2a85bd464e69253a6ac7fb6f265cbbe35742341c60
-AUX rabbitmq-server.init-r2 645 RMD160 3dfed1fb7411b64c834061c07736ea162dcc66bb SHA1 caa830ce642966efcb9e809b5ab8404f117baafb SHA256 3837bd8df0d7c81829ea9763723e282ccd57204ffad89caa493a1f39849469ea
-DIST rabbitmq-server-2.4.1.tar.gz 324199 RMD160 b8f84c5703e69dbb73de8f8461510eea498a571c SHA1 d70d3fc74fd5a3f93afe43dbb6ddb29b08afd2fe SHA256 7872ad1528c5c2388384bdd67b9efe6e9a9f34510d245f8fc012dfa15dca0159
+AUX rabbitmq-server.init-r2 639 RMD160 662f02bbab06237564d813bb2cd9f2eae8af96da SHA1 60834768b2a9419faec866b2e4d46de8f5c39153 SHA256 ab59f64ad7166a66454629f2e8a3c076f3f733ee361527d894ae31564ed0eaef
+AUX rabbitmq-server.init-r3 744 RMD160 eb810f5428ad16a3e2c143a84b9666abf49a535b SHA1 b2e6586dd21e8debbb8ff5e7cb8e59f1abf16626 SHA256 76aa4fe4578c31fe076d7c48770b63ad8836996352a981c6bba415e67e071b5c
 DIST rabbitmq-server-2.5.1.tar.gz 332560 RMD160 d2e2e5e2f0c88afceb5c56cda088340b6e624ad3 SHA1 25a14f4bb931b0772f0001b4b6e0c3e12d936593 SHA256 f5afeb8429508644738b68a158ed1f4a4dfc4bcbe1ebdab5ba818a75545e942f
-EBUILD rabbitmq-server-2.4.1.ebuild 2281 RMD160 7a4759e44a0e9458f02e0088e5c42b7a138eea25 SHA1 20fe358fbe3f7d26b3e2b80fcee4d339cd5f6ca2 SHA256 66f79eeab5d310c9a53084a6daf5af5dca1c889c54f3d9e14874f8951087ebde
-EBUILD rabbitmq-server-2.5.1.ebuild 2269 RMD160 da15cd82ae89bdd2cb8c3c437de277899150a46c SHA1 7705dbd33fa78931ee10a1c8746a86a02cc49f1a SHA256 720459573e8a22574403d9f8c95f48ca4260be7de4387e53ea42a85cbc1775a6
-MISC ChangeLog 2469 RMD160 406cf50deebfcc43d19214f977c9bcdb83abf475 SHA1 cccccfb3f3b85a72dc34194356a39c8da5aeb0ca SHA256 16360f80e7d637d06ede6a82de246f999910a28f93cd3c26f3742dc4ea6ae226
+DIST rabbitmq-server-2.6.1.tar.gz 367491 RMD160 818cd8bfbf5593b0cdb4bd4a71d4b7124472f35c SHA1 628ec7453c0ee8ec3bad0780504e335b48f9b533 SHA256 0ab7b43a6b4cc5848242cdd4830b3c09018cfd920a2bfb00ebb89291c9cdd385
+EBUILD rabbitmq-server-2.5.1.ebuild 2254 RMD160 60884c8f8c7134447c06094472e44edd66e525ca SHA1 1711bad666fee11ebc9b213dc8730e6266b0d98a SHA256 5413c3e4f310830373ced5bb0e6bac18e951114433180a5ad36f21f9fbe68b99
+EBUILD rabbitmq-server-2.6.1.ebuild 2254 RMD160 d681a841a7466e6bde00230ad05f8b32a2a1be32 SHA1 86c65d1af14709b90ca302c24d04c60ffcb89529 SHA256 83f2bd1a5c13232c0016652fd06efcc36ff7f749dc1d6910cefc11023538cbf2
+MISC ChangeLog 2799 RMD160 ea521f8d6febd77364ebd33a57142a39f5214fdb SHA1 7f5db847ab2f7c6a8260fd6ce6d9646f4f5108aa SHA256 4c74a31603eb69c0c62a6f9e101793ee6daed99f71f4c3bec7a547deedb2e7a2
 MISC metadata.xml 234 RMD160 cb149fcd7945b8906164cad81daf559757035cde SHA1 9bf4056cf71e3eb7153bb319e8bd24ede9a205b6 SHA256 9f3ea84c59dfbd2d2dd7f1e6f0b959540e27cc9caad4f77e6e76774ce98505a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59rRkACgkQfXuS5UK5QB0oKAQAsX4aNNQ5zeHFJYVO3cDRaMXn
-xcMNSxriaavGE+wTf1b7a005XnCbh+hqILvKPap66WeyG8nx5AUBPm6/0gzzUg/x
-Y9BWPtr+WXG6SdPdL/YhLSRl4P7Q5jJm73ABf6GJnsvkOqBVn96yRBMrX8fnFb3R
-4PNxqIJv7jZoHIrOZnE=
-=9Y8d
------END PGP SIGNATURE-----
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]