version bump

Package-Manager: portage-2.2_rc67/cvs/Linux i686

6 files changed, 42 insertions, 78 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/Manifest b/net-misc/rabbitmq-server/Manifest
index 18729d16962d..3205f5085a18 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rabbitmq-server.init 434 RMD160 11a7851c395e488bb03a7a002d62dae405d4f67f SHA1 c1030740427f95eedba3fafbb8a038ea69842607 SHA256 d3f8fb55bbab4506567a9dbc995194720ed63072c82af27bbb6831541a0fb89c
 DIST rabbitmq-server-1.5.4.tar.gz 113657 RMD160 af2aeb1c9d18d5bbf619b858278f1ddc8c02f02f SHA1 2ddf5328ab6635168962f76c29b77185064df2bc SHA256 4edc03be70810e04922b7fbcf51487970836a2ce4c0c887b3a6640bc4ebee362
-DIST rabbitmq-server-generic-unix-1.5.4.tar.gz 358688 RMD160 1c3de8125a7135b07c6cba01c8b3395a9aa79982 SHA1 3adcbc9aae336db45ecc0537dee614071315e439 SHA256 07efb49be2e61f9834d262ab93f364a14cb09061a86f8a6a478295858d367ba4
-EBUILD rabbitmq-server-1.5.4-r1.ebuild 1664 RMD160 c5d95edef457441d79702f3a29e4c6493a77078b SHA1 17188dc82f1b23645f5092960519dbc86848589c SHA256 ffcba324a2f47c2847f5e11bd12cd536b52782f9ac7e9238e07a3944cb53c43b
-EBUILD rabbitmq-server-1.5.4-r2.ebuild 1683 RMD160 0ad23173fe5c24689c3354986a5ecfec4d92ecd8 SHA1 156ee435e60f3a381a6f27955fa88b4739e41d26 SHA256 9588d3b537617457828140b96f763e6eb52fedbcd70c9019257076e22404e205
-EBUILD rabbitmq-server-1.5.4.ebuild 1133 RMD160 ae93e0f0b85ec67d18d4ee8408c07423c196d803 SHA1 963b07a1cd97a9a25cbe9a886cb76fce0971a125 SHA256 e5beaf777c5d6c5142eefa5ee36e9fda8e8f21fffa0ab79b633069b311eff518
-MISC ChangeLog 861 RMD160 93d4c17e8cab316412050e6077c9884895b5c9d8 SHA1 5936a19327d6687884a59a346ee93f745495ae7d SHA256 d9e56cdfb0fdd557c53b570988df851d71278b3f0c5459ba722df5b17f692739
-MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwGAoUACgkQV3J2n04EauzsxACbBkZTj25UY5a3kmWLYn++vupa
-uFMAn3Wm/N9lbilMJ0mt3kWBUnTC8on8
-=dZZu
------END PGP SIGNATURE-----
+DIST rabbitmq-server-1.8.0.tar.gz 202386 RMD160 935d1a5f171d2f7c34b6d785c52c169387a25343 SHA1 99cdd8832e972997b78efec11ff3d4e01846ca26 SHA256 ccb64d1ea0823a0e143444b8888f86b625bd6907f0625c9f7cd28da1d029d8d8
+EBUILD rabbitmq-server-1.5.4-r2.ebuild 1684 RMD160 53101c81a54d8ab59ad6669ebe3e509e8641ef9a SHA1 94c5b9a5f80dcac5ff021ef51add90395fd0ae80 SHA256 11bc0e444aa49428a18c0a797876b84d0ac5d58850812c295e41756a952f6b32
+EBUILD rabbitmq-server-1.8.0.ebuild 1585 RMD160 79e92961b57ad22563e1bbbd1a83948d33e52c6b SHA1 4d9b2306b2203fdd84b6baf15f8f8d23e9209591 SHA256 7723eb784051ef102a34df320f89f8dbadcfcdd848d5a60e1d92e3dae820a946
+MISC ChangeLog 1081 RMD160 37ea0005d3160e5b1510b0f7706c9f08041efbd7 SHA1 c251b5668fa979449e2f6d5b1c2e4640c25df708 SHA256 3811b8cda24bd658ba12786f5ed0205d8725a9b72ff120be565798d2ef339dd0
+MISC metadata.xml 256 RMD160 d9b3d76f0f3b12500bf0a1e012563f2f32f4992f SHA1 2520f467b4a64d131a92dd8101e03ad334d6d7a6 SHA256 74f2c9d6b7ef600697deed6d19bc64604a39ba7a2e8c24fae47ca2544def84c0
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
 }