version bump

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

4 files changed, 199 insertions, 6 deletions

diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog
index ddb23ed7073e..042b0e2ec08e 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.23 2012/09/03 16:00:40 ultrabug Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.24 2013/01/11 15:05:23 ultrabug Exp $
+
+*rabbitmq-server-3.0.1 (11 Jan 2013)
+*rabbitmq-server-2.8.7 (11 Jan 2013)
+
+  11 Jan 2013; Ultrabug <ultrabug@gentoo.org> +rabbitmq-server-2.8.7.ebuild,
+  +rabbitmq-server-3.0.1.ebuild:
+  Version bump
 
 *rabbitmq-server-2.8.6 (03 Sep 2012)
 
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index a460ba74b513..300610f5313b 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -7,15 +7,19 @@ AUX rabbitmq.service 314 SHA256 a1444878e941541cc413b9a7c50057e1374bddf858eccf64
 DIST rabbitmq-server-2.8.4.tar.gz 2646689 SHA256 41b8d3d162a3a3ad3fd7de06c5b8d5efefc2623abff4ce2b6603222512cb05df SHA512 054343642e744a0a5fc22c0401e49e402935fecd8c09b7fdefd0dae99eb1ef4d4a506b1d7381ec245831d2d97976862ba8619580c2485953134e9b8f734a88bb WHIRLPOOL 31db69c1b3d883787385a71526e40a802e3b63bc8cf4d82396953f09451cc4be1c10a363388d8d8f9e1d44f26f9f9d7ac46fcdb9eb032da08b7cae56e37a7925
 DIST rabbitmq-server-2.8.5.tar.gz 3118328 SHA256 960a451b7229ce342ccf410783b0f701ba22eaa134a1e822ae00e6d495f2b958 SHA512 47bbc4e4efa51ab05e19d8f1be7860f94f01645bf27ecaa26cfe1404050e032767e6c7ecb0f7123081ab302913eafc25dd67d492b1847ececf32ef50aafdb6fa WHIRLPOOL 764d9be250c2f0729a7673ff546ed60ee0d4fa9138b7d8d14f834acab2b26b14b22a50ffaa64056f30d195acfff9cf64608c8272bdfc62e91a866b1070b191e6
 DIST rabbitmq-server-2.8.6.tar.gz 2788855 SHA256 146a24f2c336d304c465ac4243539b2e45838fb4b9900e8d84aca1ea800d593f SHA512 281ca90768c8483e7dea832b9699bc7470cdc9d70f942323cd556224b3bba60b72e1bc1376a0eed1e1005236c0c71e8fb04a961010759da981be1dd4ee163006 WHIRLPOOL af48428e075c52357dbfc024bc9e268386760eb5bb5c37161cc0f7cae33452063b209cfb15fb599d535adea94e8a1668456f3609ad68280dc5a59ff1d6f6e6b5
+DIST rabbitmq-server-2.8.7.tar.gz 2792978 SHA256 0726e126896abbe30d9fd491d13eb16afa15327a548a3de9c3a31d41adcaccfc SHA512 89c39e8b7062adf716eec5195db5eb359418e50b9294d525dd0a6c045987799ef6493560bfafbccb3e25321808385b07988bc7723c462d3b4ee2a59b421f5a3d WHIRLPOOL 3e89e1345aea46de4540b26d45b8c4734f17a9822eea4794b04d8b7cd145c33c4f0768f11941b2ccae1e1abdf3d6a60bc80f770767bfbd1194f7dccbd11f315a
+DIST rabbitmq-server-3.0.1.tar.gz 3298255 SHA256 6cd27c374e216e2a789dcc6ed6d1414217a554df2f1023cf636785e7346a3b88 SHA512 57d6b3e83a34722f705636af7155e02e1bc8559e1bff374806abc5ac130d3fac7c3bd7a71bf7b237f6befd5143112ef1b51d0cff2d849f390e945606f84c22c6 WHIRLPOOL bdf9aefd5433430206d962086a550767c9ee7aba4f057e449cafa9fa068d1b6c5984757ceab453c170c1cc2d8fc0590c60e91288b2fcde285c5bdda37af1f081
 EBUILD rabbitmq-server-2.8.4.ebuild 2452 SHA256 07a5097756d63be3d55fd101a98dac8455bd562ea8cdabd660b204ea33333b65 SHA512 760844716fb21452258a79b5720f39e68b83efaba2eef0a6c84415341ae8e704db19faf7bf0cb14b9a14688bf5ae3b793bcdee29c49ab103c2350ea046fa6ba3 WHIRLPOOL 0a55264aea26b1ce2594cd152b0497dcffb72536a0e6e71c6de680c1bff62862544d9c23f318033133f05dd827cc5445021213dde843dc47960b5fc71ac8a62a
 EBUILD rabbitmq-server-2.8.5.ebuild 2585 SHA256 1678685caa3bc48994715ff1eeda5500f628a002f76919ae1e17321efcf8136a SHA512 ba415a7283ada03fae721872608e4164f4d3d98a2cef71345a65f94fe0522ace69df4821da052f2b9956c733589314b09c85a6c8af9a464722c9421f15f64972 WHIRLPOOL 4fcff28e6d1af666b663273edb4928e2a07c84f83cc75ff7386e2ad7b3b9c021ef31093d3923dc9340f0288c708b8fe4f48d1e1bf1d9443c0fdee708c7e2494f
 EBUILD rabbitmq-server-2.8.6.ebuild 2585 SHA256 ac2c895a886fc05ad2e1c29af04190ccb0b94e30e3e900fac1f365074eb4ae61 SHA512 fce7b3b3f53c2fee481a02f4bfd97383217dfa4fce7d542c6f1a8272fe4cb2a028ebbd0261a4247639f59a2451ec50d9b03511531cb777f5a03a9de2a7803446 WHIRLPOOL 4665da1ff0f80384f4b385f86c150a4fc504dc299f2720a02dc03d04d524678bdade5f5fe28b36f97f1feb875903c5acbeb1c6c27f5b9091ab416f580428211b
-MISC ChangeLog 722 SHA256 51c5f3f1685aa144697e33b6139c58c48ecfb70b6cc4c63d1f734cc2bea8d59c SHA512 e067f16c085470d99bc5291258010d954991a71e909e43d53cecf2f6ba80c038839c6fd28809a24e95d838c6b15be7a490d20d62220cc7cc545f6c80308aa9ab WHIRLPOOL 6e76e6402aaf86de432cbabd1ca105894961ad3e93bf39400c4443a5fd1f5835f085620e6e2e9025c2f180fedff5b50e9fb26aa3aa942a0b83d5a3e1e7d58df6
+EBUILD rabbitmq-server-2.8.7.ebuild 2432 SHA256 bc2e8dea466042fe2887fd15d1f107a97077c992bab14c3a754b0e7ca97176f5 SHA512 2a8c48724f34fb0917a71ee681b2a344731d6e971efc31d348f7fff53b518dfef8ab286e0400b71ec5f1f61e58831990f471959f66edd6da07383065b2ac14b4 WHIRLPOOL 4aa17dd304bfb314f5e830a74495558b1418533b7ecfeb99962d4eaf036c926f8f816a93bbf7e3da0a9237af39d30d17ef74f571638fb71628eebfb7971ed1da
+EBUILD rabbitmq-server-3.0.1.ebuild 2656 SHA256 479cbe982ade9291e1dec0f3a4a17b35713057db082afc7c4825ad3bccf91e4b SHA512 ecafe6e52e87522c48bc2d829aed2037cb560ceef7f9c97cf902b36157539013d3769dbf30588f7d3fd155043b0535fa2648aed0959f0e7ad102093d77f83313 WHIRLPOOL 2c3f91045c0aefa152e4d6a2b7b06fe2c63b76b35fc213d73ab92a78fb7d87d448fd48fefcb3206c5f883892bbcaab06a3f096df63b12a9aa16c1aba3322467b
+MISC ChangeLog 923 SHA256 88b001970610860f8596693f8de43667c9331e36bbf67a4672d2e3bf89aa0f3a SHA512 43c88bac7a381a18019f1cd484b04c0605b95c8f3766d3114ec1df9ee65eb38027b2197e8e76f31840f139aed781bda325cbc9ff01ef1a629e96104bf0c2fc2e WHIRLPOOL c71809794d1c785b4d3219703f7a95ce9d9222e54ca5bf900e0a3ecd0dd2a7c5b1940835d22139b273732a9fd6af482bd7b2bab5458d9d06e7dc9ccb12560493
 MISC metadata.xml 230 SHA256 bd8560ab21232bace10a233ea24414dacb36c87e37a3a10cdeeded266cbb5c8d SHA512 3c7c9badebcc814572f1be89f2cdffaa81f795e3a44ae4f67bc7332927d332844a8a076b0f34d0e84b31db5abef654001cf1e6efff9628fa56a06786c082e6c0 WHIRLPOOL 57f9c4a65d7791075c8859af3cbbff141cc74e426102fefd15029bf1c63d3cf8a2c496eb4fc4f59570d0b84151a0d7a0feba0599827e932702ecfd5b8598563d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlBE1DIACgkQKiQSS7ZY+hN/PgEAxbHJBEbYJ9IL4Y07KDuzh1uf
-smQ/qGtaXgKImOcJqpUA/ijYaOYDh3lpd3xkKlqFRTOBcAphmmSAFe91zkUN52i4
-=8Npc
+iF4EAREIAAYFAlDwKjgACgkQKiQSS7ZY+hOkLQEAw/UlwlTySVY/LE7N8fdcFVKj
+g+1npqwX2NlbE2yWPYoBAJL/nV3x+DTokxk5CuVG9buXKK+9ExoTGTEJclsqBH+V
+=uwpZ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.8.7.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.8.7.ebuild
new file mode 100644
index 000000000000..6fa96184a5e4
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-2.8.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 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.7.ebuild,v 1.1 2013/01/11 15:05:23 ultrabug Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2"
+
+inherit eutils python systemd
+
+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="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/erlang"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	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
+	python_set_active_version 2
+}
+
+src_compile() {
+	emake all docs_all
+	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 plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; 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 /etc/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-r3 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# 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
+}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.0.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.0.1.ebuild
new file mode 100644
index 000000000000..c6831a1aeb19
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.0.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.0.1.ebuild,v 1.1 2013/01/11 15:05:23 ultrabug Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2"
+
+inherit eutils python systemd
+
+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="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/erlang"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	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
+	python_set_active_version 2
+}
+
+src_compile() {
+	emake all docs_all
+	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 plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; 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 /etc/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-r3 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# 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
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+}