diff options
Diffstat (limited to 'net-misc/rabbitmq-server')
-rw-r--r-- | net-misc/rabbitmq-server/ChangeLog | 9 | ||||
-rw-r--r-- | net-misc/rabbitmq-server/metadata.xml | 4 | ||||
-rw-r--r-- | net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild | 4 | ||||
-rw-r--r-- | net-misc/rabbitmq-server/rabbitmq-server-1.5.4.ebuild | 36 | ||||
-rw-r--r-- | net-misc/rabbitmq-server/rabbitmq-server-1.8.0.ebuild (renamed from net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r1.ebuild) | 46 |
5 files changed, 37 insertions, 62 deletions
diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog index f75256dedf26..7b4c068177f8 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.4 2010/06/02 07:04:32 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.5 2010/07/03 08:21:06 hollow Exp $ + +*rabbitmq-server-1.8.0 (03 Jul 2010) + + 03 Jul 2010; Benedikt Böhm <hollow@gentoo.org> + -rabbitmq-server-1.5.4.ebuild, -rabbitmq-server-1.5.4-r1.ebuild, + +rabbitmq-server-1.8.0.ebuild, metadata.xml: + version bump 02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml: Remove caleb from metadata.xml (#317071) diff --git a/net-misc/rabbitmq-server/metadata.xml b/net-misc/rabbitmq-server/metadata.xml index 9f3fdee2246b..b263a5bc4f28 100644 --- a/net-misc/rabbitmq-server/metadata.xml +++ b/net-misc/rabbitmq-server/metadata.xml @@ -3,6 +3,8 @@ <pkgmetadata> <herd>no-herd</herd> <maintainer> - <email>maintainer-needed@gentoo.org</email> + <email>hollow@gentoo.org</email> + <name>Benedikt Böhm</name> </maintainer> </pkgmetadata> + diff --git a/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild index f731c24c6cb8..3163f03f8744 100644 --- a/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild +++ b/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# 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-1.5.4-r2.ebuild,v 1.1 2009/06/21 15:45:19 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild,v 1.2 2010/07/03 08:21:06 hollow Exp $ inherit eutils diff --git a/net-misc/rabbitmq-server/rabbitmq-server-1.5.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-1.5.4.ebuild deleted file mode 100644 index d63107016813..000000000000 --- a/net-misc/rabbitmq-server/rabbitmq-server-1.5.4.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# 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/rabbitmq-server-1.5.4.ebuild,v 1.3 2009/04/20 11:29:43 caleb Exp $ - -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-generic-unix-${PV}.tar.gz" -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# Q: is RDEPEND-only sufficient for a binary package, since we don't compile? -DEPEND="dev-lang/erlang" -RDEPEND="${DEPEND}" - -# grr: the packaged directory contains an underscore -MODNAME="rabbitmq_server-${PV}" -S="${WORKDIR}/${MODNAME}" - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/${MODNAME}" - dodir "${targetdir}" - cp -dpR ebin include "${D}/${targetdir}" - - # scripts - dosbin sbin/* - - newinitd "${FILESDIR}/rabbitmq-server.init" rabbitmq-server - - # TODO: - # config to set env vars as per INSTALL? - # set LOGDIR to /var/log/rabbitmq.log - # run as different user? -} diff --git a/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-1.8.0.ebuild index 6d119d66918d..68dd49ceead9 100644 --- a/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r1.ebuild +++ b/net-misc/rabbitmq-server/rabbitmq-server-1.8.0.ebuild @@ -1,42 +1,47 @@ -# Copyright 1999-2009 Gentoo Foundation +# 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-1.5.4-r1.ebuild,v 1.2 2009/04/23 03:37:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.8.0.ebuild,v 1.1 2010/07/03 08:21:06 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="" -# Q: is RDEPEND-only sufficient for a binary package, since we don't compile? -DEPEND="dev-lang/erlang" -RDEPEND="${DEPEND}" +RDEPEND="dev-lang/erlang" +DEPEND="${RDEPEND} + dev-libs/libxslt + dev-python/simplejson +" + +pkg_setup() { + enewgroup rabbitmq + enewuser rabbitmq -1 -1 -1 rabbitmq +} src_install() { # erlang module local targetdir="/usr/$(get_libdir)/erlang/lib/${P}" - einfo "Correcting additional Erlang code path in scripts" - sed -i -e "s:\`dirname \$0\`\/..\/ebin:${targetdir}:g" scripts/* || die "sed failed" + einfo "Setting correct RABBITMQ_HOME in scripts" + sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ + -i scripts/rabbitmq_env einfo "Installing Erlang module to ${targetdir}" - dodir "${targetdir}" - cp -dpR ebin include "${D}/${targetdir}" + insinto "${targetdir}" + doins -r ebin include einfo "Installing server scripts to /usr/sbin" - # Install server scripts to sbin - dosbin scripts/rabbitmq-multi scripts/rabbitmq-server - - einfo "Installing rabbitmqctl to /usr/bin" - # Install control script to bin - dobin scripts/rabbitmqctl - - # Docs - dodoc README + dosbin scripts/rabbitmq-multi scripts/rabbitmq-server scripts/rabbitmq-env \ + scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins \ + scripts/rabbitmqctl # create the directory where our log file will go. diropts -m 0770 -o rabbitmq -g rabbitmq @@ -48,9 +53,6 @@ src_install() { # Install the init script newinitd "${FILESDIR}"/rabbitmq-server.init rabbitmq -} -pkg_setup() { - enewgroup rabbitmq - enewuser rabbitmq -1 -1 -1 rabbitmq + dodoc README } |