Mercurial > hg > portage
changeset 301:557cd567f9e3
sync rabbitmq with better portage mainline
| author | holger |
|---|---|
| date | Fri, 30 Sep 2011 18:02:49 +0200 |
| parents | 6196c20c6dec |
| children | 0567492f4a01 |
| files | net-misc/rabbitmq-server/Manifest net-misc/rabbitmq-server/files/rabbitmq-server.init-r2 net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 net-misc/rabbitmq-server/rabbitmq-server-2.6.1.ebuild |
| diffstat | 4 files changed, 28 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/net-misc/rabbitmq-server/Manifest Fri Sep 23 13:21:36 2011 +0200 +++ b/net-misc/rabbitmq-server/Manifest Fri Sep 30 18:02:49 2011 +0200 @@ -1,5 +1,5 @@ AUX rabbitmq-script-wrapper 1844 RMD160 255586b0339a8200c63309eaefb952f67712eb0d SHA1 3b4f880d484541e749e3dd0d913adc6a21e4df23 SHA256 46783bc7466f48d8ddc785c5aac2b94d723c811106b6d8251adee170558f316e -AUX rabbitmq-server.init-r2 695 RMD160 52624f9b3e289a11229e7d9ef920de3f3baa315b SHA1 d8dc0a7f6636abbd18711b2a16d3d2ec3f1238c7 SHA256 718e749d9fa2087bfdd22ecd35063d6261df6787bbffb312abe9dc46c9b90f59 +AUX rabbitmq-server.init-r3 744 RMD160 eb810f5428ad16a3e2c143a84b9666abf49a535b SHA1 b2e6586dd21e8debbb8ff5e7cb8e59f1abf16626 SHA256 76aa4fe4578c31fe076d7c48770b63ad8836996352a981c6bba415e67e071b5c DIST rabbitmq-server-2.6.1.tar.gz 367491 RMD160 818cd8bfbf5593b0cdb4bd4a71d4b7124472f35c SHA1 628ec7453c0ee8ec3bad0780504e335b48f9b533 SHA256 0ab7b43a6b4cc5848242cdd4830b3c09018cfd920a2bfb00ebb89291c9cdd385 -EBUILD rabbitmq-server-2.6.1.ebuild 2254 RMD160 1c0c6c5c42cab8cb8efffd6248007dcf6520b0f5 SHA1 b1013523bb98d2dd0599da90a592f29163e399d0 SHA256 ef5b65d9d2c7aab7749f9565632ce7f8e7e1db95931d0735c045e7c4196ab6a3 +EBUILD rabbitmq-server-2.6.1.ebuild 2254 RMD160 d681a841a7466e6bde00230ad05f8b32a2a1be32 SHA1 86c65d1af14709b90ca302c24d04c60ffcb89529 SHA256 83f2bd1a5c13232c0016652fd06efcc36ff7f749dc1d6910cefc11023538cbf2 MISC metadata.xml 256 RMD160 d9b3d76f0f3b12500bf0a1e012563f2f32f4992f SHA1 2520f467b4a64d131a92dd8101e03ad334d6d7a6 SHA256 74f2c9d6b7ef600697deed6d19bc64604a39ba7a2e8c24fae47ca2544def84c0
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2 Fri Sep 23 13:21:36 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -#!/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 /var/lib/rabbitmq/mnesia/rabbit@`hostname`.pid &>/dev/null - eend $? -} - -stop() { - ebegin "Stopping RabbitMQ..." - /usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err - eend $? -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 Fri Sep 30 18:02:49 2011 +0200 @@ -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 $? +}
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.6.1.ebuild Fri Sep 23 13:21:36 2011 +0200 +++ b/net-misc/rabbitmq-server/rabbitmq-server-2.6.1.ebuild Fri Sep 30 18:02:49 2011 +0200 @@ -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.1 2011/04/08 07:00:32 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 @@ -61,7 +61,7 @@ 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]