net-misc/rabbitmq-server: version bump fix #588164 #573394

Package-Manager: portage-2.2.27

4 files changed, 2 insertions, 204 deletions

diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 980643b3920a..9f54415783f6 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -2,6 +2,4 @@ DIST rabbitmq-server-3.2.4.tar.gz 3588097 SHA256 a930f92b362df2f292ec5f0281aa201
 DIST rabbitmq-server-3.3.4.tar.gz 3499481 SHA256 741005b566178de0c0bb9782f6bbc5aa115cfb652b994538fa95904586d5d68e SHA512 c0b76b239fd4e1a80a2646c1d222f6155480a40bb04eaf1b78c1367a5953a36ec626e300399e2ab9478167dab464b1826ec5490167f2cbc14767fccdc4002015 WHIRLPOOL 18793c2dee1a82ba142bddac44d3c9b744d8faccd60c129730e1ec6dfa59b793a76b6508ee63073b89e7904ca74b0130a04e1778d96f373aa7d7a0d290278901
 DIST rabbitmq-server-3.5.4.tar.gz 3730770 SHA256 f79814d5fd5574734f599ef570ddace02ce4e47a1441cd052c568cde4d6ca3a4 SHA512 bb6edcbe007779feabaef3215b9bddaa28e85f315583de6f8ebe161a330e0466120a39ed8a016ffc47b6a4ec8f3a10ddbebd08f499070e920f5dd5df5924f49c WHIRLPOOL f36a898976c5c1cbf38df49d43713129132a835cd4fb5bb8b7bf44652589a5bc08533f93134630098328d1ea0d41caf963de8fff10ce39a1c51190ca8200b41b
 DIST rabbitmq-server-3.5.7.tar.gz 3919168 SHA256 380c9cab8f24add440a0aead3b70a0830e0f32a531139828003ae18e08b72028 SHA512 7ccfb5f4f81262988f81d93d9bb71fd3fa1812d028fbcc9f3b4d3ed0a0a975d1249874c67c73b11195cd8175f36d2a7df3c1cd69a250af3b82f030104b433629 WHIRLPOOL 4861b92e0a385a559ac51c9eefcaf0204855294d863019a0dd86a39f86a6a3f7baa0679b1ffc3ee6359d11b41414e86de3deb4f5b06fc0786db306870d32bcd5
-DIST rabbitmq-server-3.6.0.tar.xz 2928768 SHA256 8e55cce9e293108b16567cf3acca4ba8227cf6ada5933527f274687821cfe386 SHA512 5ed5cd9fc0092e4cfc8187f38143ce9b43c12fa48595ca84e650dd696fae120e405593a15e5832f05fc80bd15525841f6e60dfdc5e9fc8f42397ae66d78d6bf9 WHIRLPOOL c76d6cb14076770a62c2a2cc2f3d886217841abfbddcb45ed5495cb699ba0ce792ea1b3ab7fc5c495cfc33803be7f0a199edbd9dcdb388091395ea94381d0535
-DIST rabbitmq-server-3.6.1.tar.xz 2895888 SHA256 c696134e863f99191a301288c12d69ff00b7e648107ee52c8686ae047dde1bee SHA512 dbcb6b6bef117c1d79afd909257b7b744dbcaf7dfa8d064a6bcf4599ec9c882cf3712c8726e79529af016ec1dc090a43eb332d48e40b90398186e08ef3be46aa WHIRLPOOL 9942fb550b8e46f6668c863b4adefb73afe4581f2dc9f99444a787f3179840041dc8aba06dbe6aefd216f650bf3f9e28c52e3aae8d5966326ba0dfd91a12e7ba
-DIST rabbitmq-server-3.6.2.tar.xz 2937204 SHA256 b09eadd91244115e50856d1423e4659e46313f1545c69b434021e1afa1b60216 SHA512 9ada10f6dff84161dae13e593211a271b7c414252a3da276f593c57fe8a513cd6a718ec592e2853630f703bb6c7f0dee3bed8c0ddeaefbb36c04613b5466f3e8 WHIRLPOOL 509dca71973b1761d3e5ac26a6829d738d8d717ff0c3244f21d84abbd31e07e4214cb6f14bfcc01bcb14a0decca59335a8ad13ddf7512dc0aebb4030793dc006
+DIST rabbitmq-server-3.6.5.tar.xz 2923164 SHA256 9550433ca8aaf5130bf5235bb978c44d3c4694cbd09d97114b3859f4895788ec SHA512 50751a25b39a96a8b0665c9316d8a603050807597f932e0b3cc74f63fbd73a5668865ad7e7c58de5bef80295a5a3c472731446e4e07c530812a6275703ce2388 WHIRLPOOL 0b9d0b796b06463e7162a1f72dc242eec92013ff145b87a5d3524c274059dfeaec23c453c7105fc5b69e270c68116b77fcc7f9eb5a42c087fe78a2b77a364f9b
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.1.ebuild
deleted file mode 100644
index 799f40494539..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 systemd user
-
-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.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~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
-	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs dist
-}
-
-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 || die
-
-	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
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	doman docs/*.[15]
-	dodoc README
-
-	# 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}
-}
-
-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
-	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
-		elog
-		elog "This release changes the behaviour of the default guest user:"
-		elog
-		elog "http://www.rabbitmq.com/access-control.html"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.2.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.2.ebuild
deleted file mode 100644
index 799f40494539..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 systemd user
-
-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.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~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
-	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs dist
-}
-
-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 || die
-
-	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
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	doman docs/*.[15]
-	dodoc README
-
-	# 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}
-}
-
-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
-	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
-		elog
-		elog "This release changes the behaviour of the default guest user:"
-		elog
-		elog "http://www.rabbitmq.com/access-control.html"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.0.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.5.ebuild
index 799f40494539..b7c6982ec5bd 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.0.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.5.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
-RDEPEND="dev-lang/erlang"
+RDEPEND="dev-lang/erlang[ssl]"
 DEPEND="${RDEPEND}
 	app-arch/zip
 	app-arch/unzip