# HG changeset patch
# User holger
# Date 1302258746 -7200
# Node ID de70db54f512db5231a97a01dc56abb8e205b949
# Parent  0256a54aeb68839a81bbc5deb326e88b1cb1846c
sync & bump to 2.4.1

diff -r 0256a54aeb68 -r de70db54f512 net-misc/rabbitmq-server/Manifest
--- a/net-misc/rabbitmq-server/Manifest	Mon Apr 04 15:26:16 2011 +0200
+++ b/net-misc/rabbitmq-server/Manifest	Fri Apr 08 12:32:26 2011 +0200
@@ -1,5 +1,5 @@
 AUX rabbitmq-script-wrapper 1844 RMD160 255586b0339a8200c63309eaefb952f67712eb0d SHA1 3b4f880d484541e749e3dd0d913adc6a21e4df23 SHA256 46783bc7466f48d8ddc785c5aac2b94d723c811106b6d8251adee170558f316e
-AUX rabbitmq-server.init-r1 640 RMD160 74285fbafeeec24b3c9f5e83ec0f65bed9e23a06 SHA1 c68b9493920a25dbad9ad27e462defbff775c582 SHA256 5c4110c077679461105d77f1b1048bf014f6f4a817e402a1f6bc0d93feaa1ae4
-DIST rabbitmq-server-2.4.0.tar.gz 318182 RMD160 6362f4f2bf06f201410132be91edbd64a1577798 SHA1 9f39d830aa778cf8e71fd5eb47c8a42e26c3c42d SHA256 aadad1bb6ae8b7ecba73dbe1c74a2dfd3ac0559018ed0d433af1df9938f67e7f
-EBUILD rabbitmq-server-2.4.0.ebuild 2237 RMD160 6afbe2bdea6a454580b6a13b55c73e0b7cea2296 SHA1 a490ffcacdfac87fdd1e50f9c83bf749bad29bc5 SHA256 5b9f6b8b7fe38e8a21578b72922c3d79de01d7d8270fab220ffc212d699a66dd
+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
+EBUILD rabbitmq-server-2.4.1.ebuild 2269 RMD160 1ccffd8b0bcbfa31a3b18b1c6d1b90c43ee7cb7f SHA1 a36c696ab8bc83d769ca69094fd706c3426c9ca2 SHA256 266caab1ff836b6b2aeb9b42c3cd5a68fc6f1d30c23f2d6f6f94f4ba11acda9a
 MISC metadata.xml 256 RMD160 d9b3d76f0f3b12500bf0a1e012563f2f32f4992f SHA1 2520f467b4a64d131a92dd8101e03ad334d6d7a6 SHA256 74f2c9d6b7ef600697deed6d19bc64604a39ba7a2e8c24fae47ca2544def84c0
diff -r 0256a54aeb68 -r de70db54f512 net-misc/rabbitmq-server/files/rabbitmq-server.init-r1
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r1	Mon Apr 04 15:26:16 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +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() {
-	need epmd
-	need net
-	use dns
-}
-
-start() {
-	ebegin "Starting RabbitMQ..."
-	start-stop-daemon --start --background --exec /usr/sbin/rabbitmq-server >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping RabbitMQ..."
-	/usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err
-	eend $?
-}
diff -r 0256a54aeb68 -r de70db54f512 net-misc/rabbitmq-server/files/rabbitmq-server.init-r2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2	Fri Apr 08 12:32:26 2011 +0200
@@ -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 -r 0256a54aeb68 -r de70db54f512 net-misc/rabbitmq-server/rabbitmq-server-2.4.0.ebuild
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.4.0.ebuild	Mon Apr 04 15:26:16 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-# 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/rabbitmq-server-2.1.0.ebuild,v 1.1 2010/09/19 08:35:51 hollow Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang."
-HOMEPAGE="http://www.rabbitmq.com/"
-SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	dev-libs/libxslt
-	dev-python/simplejson
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-}
-
-src_compile() {
-	emake all docs_all || die "emake all failed"
-	gunzip docs/*.gz
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/${P}"
-
-	einfo "Setting correct RABBITMQ_HOME in scripts"
-	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i scripts/rabbitmq-env
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r ebin include
-
-	einfo "Installing server scripts to /usr/sbin"
-	for script in rabbitmq-env rabbitmq-server rabbitmqctl; do
-		exeinto /usr/libexec/rabbitmq
-		doexe scripts/${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
-	done
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	dodir /var/lib/rabbitmq{,/mnesia}
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r1 rabbitmq
-
-	# install documentation
-	doman docs/*.[15]
-	dodoc README
-}
-
-pkg_preinst() {
-	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "RabbitMQ is now running as an unprivileged user instead of root."
-		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
-		elog "Please run the following commands as root:"
-		elog
-		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
-		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
-		elog
-	fi
-}
diff -r 0256a54aeb68 -r de70db54f512 net-misc/rabbitmq-server/rabbitmq-server-2.4.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/rabbitmq-server/rabbitmq-server-2.4.1.ebuild	Fri Apr 08 12:32:26 2011 +0200
@@ -0,0 +1,83 @@
+# 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.1 2011/04/08 07:00:32 hollow Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang."
+HOMEPAGE="http://www.rabbitmq.com/"
+SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/erlang"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	dev-libs/libxslt
+	dev-python/simplejson
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+}
+
+src_compile() {
+	emake all docs_all || die "emake all failed"
+	gunzip docs/*.gz
+}
+
+src_install() {
+	# erlang module
+	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" \
+		-i scripts/rabbitmq-env
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r ebin include
+
+	einfo "Installing server scripts to /usr/sbin"
+	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-multi; do
+		exeinto /usr/libexec/rabbitmq
+		doexe scripts/${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
+	done
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	dodir /var/lib/rabbitmq{,/mnesia}
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r2 rabbitmq
+
+	# install documentation
+	doman docs/*.[15]
+	dodoc README
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	fi
+}