diff options
| -rw-r--r-- | net-misc/rabbitmq-server/ChangeLog | 127 | ||||
| -rw-r--r-- | net-misc/rabbitmq-server/files/rabbitmq-script-wrapper | 1 | ||||
| -rw-r--r-- | net-misc/rabbitmq-server/files/rabbitmq.service | 6 | ||||
| -rw-r--r-- | net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild | 4 | ||||
| -rw-r--r-- | net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild | 13 | ||||
| -rw-r--r-- | net-misc/rabbitmq-server/rabbitmq-server-2.8.6.ebuild (renamed from net-misc/rabbitmq-server/rabbitmq-server-2.8.1-r1.ebuild) | 13 |
6 files changed, 37 insertions, 127 deletions
diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog index 054aac07abef..ddb23ed7073e 100644 --- a/net-misc/rabbitmq-server/ChangeLog +++ b/net-misc/rabbitmq-server/ChangeLog @@ -1,123 +1,14 @@ # ChangeLog for net-misc/rabbitmq-server # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.22 2012/08/07 12:55:12 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.23 2012/09/03 16:00:40 ultrabug Exp $ -*rabbitmq-server-2.8.5 (07 Aug 2012) +*rabbitmq-server-2.8.6 (03 Sep 2012) - 07 Aug 2012; Ultrabug <ultrabug@gentoo.org> -rabbitmq-server-2.8.1.ebuild, - +rabbitmq-server-2.8.5.ebuild: - Version bump, drop old. - -*rabbitmq-server-2.8.4 (23 Jul 2012) - - 23 Jul 2012; Ultrabug <ultrabug@gentoo.org> +rabbitmq-server-2.8.4.ebuild: - Version bump. - - 19 Jul 2012; Ultrabug <ultrabug@gentoo.org> metadata.xml: - Add myself as new maintainer. - - 18 Jul 2012; Benedikt Böhm <hollow@gentoo.org> metadata.xml: - change to maintainer-needed - -*rabbitmq-server-2.8.1-r1 (18 May 2012) - - 18 May 2012; <trapni@gentoo.org> +rabbitmq-server-2.8.1-r1.ebuild, - +files/rabbitmq.service: - Added systemd support - - 12 May 2012; Benedikt Böhm <hollow@gentoo.org> - -rabbitmq-server-2.5.1.ebuild, -rabbitmq-server-2.6.1.ebuild, - -rabbitmq-server-2.7.9.ebuild, rabbitmq-server-2.8.1.ebuild, - -files/rabbitmq-server.init-r2: - fix install location wrt #399831; cleanup - -*rabbitmq-server-2.8.1 (07 Apr 2012) - - 07 Apr 2012; Patrick Lauer <patrick@gentoo.org> +rabbitmq-server-2.8.1.ebuild: - Bump - - 19 Mar 2012; Benedikt Böhm <hollow@gentoo.org> rabbitmq-server-2.7.9.ebuild: - fix #399831 - -*rabbitmq-server-2.7.9 (16 Mar 2012) - - 16 Mar 2012; Patrick Lauer <patrick@gentoo.org> +rabbitmq-server-2.7.9.ebuild: - Bump for #394923 - -*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) - - 25 Jul 2011; Benedikt Böhm <hollow@gentoo.org> - -rabbitmq-server-2.1.0.ebuild, rabbitmq-server-2.4.1.ebuild, - +rabbitmq-server-2.5.1.ebuild: - version bump wrt #370639 and #375533 - -*rabbitmq-server-2.4.1 (08 Apr 2011) - - 08 Apr 2011; Benedikt Böhm <hollow@gentoo.org> - -rabbitmq-server-2.4.0.ebuild, +rabbitmq-server-2.4.1.ebuild: - version bump wrt #362527 - -*rabbitmq-server-2.4.0 (07 Apr 2011) - - 07 Apr 2011; Benedikt Böhm <hollow@gentoo.org> - -rabbitmq-server-2.0.0.ebuild, +rabbitmq-server-2.4.0.ebuild, - -files/rabbitmq-server.init, +files/rabbitmq-server.init-r2: - version bump wrt #347419 - -*rabbitmq-server-2.1.0 (19 Sep 2010) - - 19 Sep 2010; Benedikt Böhm <hollow@gentoo.org> - -rabbitmq-server-1.8.0.ebuild, +rabbitmq-server-2.1.0.ebuild: - version bump wrt #337597; remove old ebuild - - 29 Aug 2010; Benedikt Böhm <hollow@gentoo.org> - rabbitmq-server-2.0.0.ebuild: - add missing dependency for man-page generation - -*rabbitmq-server-2.0.0 (28 Aug 2010) - - 28 Aug 2010; Benedikt Böhm <hollow@gentoo.org> - -rabbitmq-server-1.5.4-r2.ebuild, +rabbitmq-server-2.0.0.ebuild, - +files/rabbitmq-script-wrapper, +files/rabbitmq-server.init-r1: - version bump wrt #334543. also fixes #332391. - - 02 Aug 2010; Benedikt Böhm <hollow@gentoo.org> - files/rabbitmq-server.init: - fix "erlexec: HOME must be set" when starting from init - -*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) - -*rabbitmq-server-1.5.4-r2 (21 Jun 2009) - - 21 Jun 2009; Caleb Tennis <caleb@gentoo.org> - +rabbitmq-server-1.5.4-r2.ebuild: - Add dev-python/simplejson as a dependency - -*rabbitmq-server-1.5.4-r1 (22 Apr 2009) - - 22 Apr 2009; Caleb Tennis <caleb@gentoo.org> - +rabbitmq-server-1.5.4-r1.ebuild: - Various fixes submitted by Luke Chamberlain (luke@re.gen.nz) - -*rabbitmq-server-1.5.4 (19 Apr 2009) - - 19 Apr 2009; Caleb Tennis <caleb@gentoo.org +files/rabbitmq-server.init, - +metadata.xml, +rabbitmq-server-1.5.4.ebuild: - Initial import + 03 Sep 2012; Ultrabug <ultrabug@gentoo.org> -rabbitmq-server-2.8.1-r1.ebuild, + rabbitmq-server-2.8.4.ebuild, rabbitmq-server-2.8.5.ebuild, + +rabbitmq-server-2.8.6.ebuild, files/rabbitmq.service, + files/rabbitmq-script-wrapper: + Drop old. Add GPL-2 LICENSE fix #426092. Enhanced systemd service file fix + #419531 and init script fix #416345 thx to Maksim Melnikau. Fix #430510 VCS + fetching in compilation. Fix #430508 parallel building. Version bump. diff --git a/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper b/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper index 91b4b7c7898e..23f3d75a42cf 100644 --- a/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper +++ b/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper @@ -31,6 +31,7 @@ ## # Escape spaces and quotes, because shell is revolting. +CMDLINE="" for arg in "$@" ; do # Escape quotes in parameters, so that they're passed through cleanly. arg=$(sed -e 's/"/\\"/g' <<-END diff --git a/net-misc/rabbitmq-server/files/rabbitmq.service b/net-misc/rabbitmq-server/files/rabbitmq.service index 6bb26f62f447..9264b406713f 100644 --- a/net-misc/rabbitmq-server/files/rabbitmq.service +++ b/net-misc/rabbitmq-server/files/rabbitmq.service @@ -3,7 +3,11 @@ Description=RabbitMQ daemon [Service] Type=simple -ExecStart=/usr/sbin/rabbitmq-server +ExecStart=/usr/libexec/rabbitmq/rabbitmq-server +ExecStop=/usr/libexec/rabbitmq/rabbitmqctl stop +WorkingDirectory=/var/lib/rabbitmq +User=rabbitmq +Group=rabbitmq StandardOutput=syslog StandardError=syslog Restart=always diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild index a071eace2050..a0c8377bf5c5 100644 --- a/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild +++ b/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/07/23 10:13:38 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild,v 1.2 2012/09/03 16:00:40 ultrabug Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -11,7 +11,7 @@ DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker writte 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" +LICENSE="GPL-2 MPL-1.1" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild index 089a9f10f010..47c6132370ff 100644 --- a/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild +++ b/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.8.5.ebuild,v 1.1 2012/08/07 12:55:12 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild,v 1.2 2012/09/03 16:00:40 ultrabug Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -11,7 +11,7 @@ DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker writte 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" +LICENSE="GPL-2 MPL-1.1" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" @@ -33,8 +33,15 @@ pkg_setup() { python_pkg_setup } +src_prepare() { + # do not refetch plugins from their vcs + for f in $(find plugins-src/*-wrapper ${plugin} -type d -maxdepth 1); do + touch ${f}/.done + done +} + src_compile() { - emake all docs_all || die "emake all failed" + emake all docs_all gunzip docs/*.gz } diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.8.1-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.8.6.ebuild index 6fc8e998f80b..e1a724555301 100644 --- a/net-misc/rabbitmq-server/rabbitmq-server-2.8.1-r1.ebuild +++ b/net-misc/rabbitmq-server/rabbitmq-server-2.8.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.8.1-r1.ebuild,v 1.1 2012/05/18 15:00:03 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.8.6.ebuild,v 1.1 2012/09/03 16:00:40 ultrabug Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -11,7 +11,7 @@ DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker writte 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" +LICENSE="GPL-2 MPL-1.1" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" @@ -33,8 +33,15 @@ pkg_setup() { python_pkg_setup } +src_prepare() { + # do not refetch plugins from their vcs + for f in $(find plugins-src/*-wrapper ${plugin} -type d -maxdepth 1); do + touch ${f}/.done + done +} + src_compile() { - emake all docs_all || die "emake all failed" + emake all docs_all gunzip docs/*.gz } |