Mercurial > hg > portage

changeset 295:002a7080cbc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bump rabbitmq to 2.6.0, fix wait for started pid
author holger
date Wed, 31 Aug 2011 18:30:17 +0200
parents 49757b8e148e
children fd979fb28c28
files net-misc/rabbitmq-server/Manifest net-misc/rabbitmq-server/files/rabbitmq-server.init-r2 net-misc/rabbitmq-server/rabbitmq-server-2.5.1.ebuild net-misc/rabbitmq-server/rabbitmq-server-2.6.0.ebuild
diffstat 4 files changed, 87 insertions(+), 87 deletions(-) [+]
line wrap: on
line diff
--- a/net-misc/rabbitmq-server/Manifest	Sun Aug 28 15:14:23 2011 +0200
+++ b/net-misc/rabbitmq-server/Manifest	Wed Aug 31 18:30:17 2011 +0200
@@ -1,5 +1,5 @@
 AUX rabbitmq-script-wrapper 1844 RMD160 255586b0339a8200c63309eaefb952f67712eb0d SHA1 3b4f880d484541e749e3dd0d913adc6a21e4df23 SHA256 46783bc7466f48d8ddc785c5aac2b94d723c811106b6d8251adee170558f316e
-AUX rabbitmq-server.init-r2 645 RMD160 3dfed1fb7411b64c834061c07736ea162dcc66bb SHA1 caa830ce642966efcb9e809b5ab8404f117baafb SHA256 3837bd8df0d7c81829ea9763723e282ccd57204ffad89caa493a1f39849469ea
-DIST rabbitmq-server-2.5.1.tar.gz 332560 RMD160 d2e2e5e2f0c88afceb5c56cda088340b6e624ad3 SHA1 25a14f4bb931b0772f0001b4b6e0c3e12d936593 SHA256 f5afeb8429508644738b68a158ed1f4a4dfc4bcbe1ebdab5ba818a75545e942f
-EBUILD rabbitmq-server-2.5.1.ebuild 2254 RMD160 1c0c6c5c42cab8cb8efffd6248007dcf6520b0f5 SHA1 b1013523bb98d2dd0599da90a592f29163e399d0 SHA256 ef5b65d9d2c7aab7749f9565632ce7f8e7e1db95931d0735c045e7c4196ab6a3
+AUX rabbitmq-server.init-r2 695 RMD160 52624f9b3e289a11229e7d9ef920de3f3baa315b SHA1 d8dc0a7f6636abbd18711b2a16d3d2ec3f1238c7 SHA256 718e749d9fa2087bfdd22ecd35063d6261df6787bbffb312abe9dc46c9b90f59
+DIST rabbitmq-server-2.6.0.tar.gz 367456 RMD160 d0abe91f16e499c1942ebc48bc5d219fde9287bd SHA1 1329bad773f9ac221c8d1e61e09e9df89e78395e SHA256 812b3ef407c8b3faeceab989ea5fdc063820862ae5191781c48edb5ac28d34ee
+EBUILD rabbitmq-server-2.6.0.ebuild 2254 RMD160 1c0c6c5c42cab8cb8efffd6248007dcf6520b0f5 SHA1 b1013523bb98d2dd0599da90a592f29163e399d0 SHA256 ef5b65d9d2c7aab7749f9565632ce7f8e7e1db95931d0735c045e7c4196ab6a3
 MISC metadata.xml 256 RMD160 d9b3d76f0f3b12500bf0a1e012563f2f32f4992f SHA1 2520f467b4a64d131a92dd8101e03ad334d6d7a6 SHA256 74f2c9d6b7ef600697deed6d19bc64604a39ba7a2e8c24fae47ca2544def84c0
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2	Sun Aug 28 15:14:23 2011 +0200
+++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2	Wed Aug 31 18:30:17 2011 +0200
@@ -11,7 +11,7 @@
 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
+    /usr/sbin/rabbitmqctl wait /var/lib/rabbitmq/mnesia/rabbit@`hostname`.pid &>/dev/null
 	eend $?
 }
 
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.5.1.ebuild	Sun Aug 28 15:14:23 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-# 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; 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
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/rabbitmq-server/rabbitmq-server-2.6.0.ebuild	Wed Aug 31 18:30:17 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; 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
+}