gentoo resync : 25.08.2020

9 files changed, 2 insertions, 581 deletions

diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 8fb358574e5e..5b5940aafa92 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,19 +1,6 @@
 AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e585628a82954c9cabe2548a33dc5742e111a92335443332b705214bc908d7d1b15d89408f0ef585be92c6c522c736 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab
-AUX rabbitmq-server.init-r3 638 BLAKE2B 56c9116898f480b08fcd8fbfa37af5d1e9d4f9d482aa91e63f2bb5eaeb2e0700566dfddd27e0463fb2162292a09ceb1c96fa16b9fda5389e39491214d2952d25 SHA512 fa6c7293c11190b1f59eef23c4a3de00666e32451f695f1a7f686f01bb92055a0c2afae565d9106e852e6b77a71661c364eacb36e2d39dfb8d175d8f0eab98b9
 AUX rabbitmq-server.init-r4 656 BLAKE2B 0ec16b0b5f7c17d4e12e08382ac12f1ec0f8c94b63b05bc2066b66ee46afc1e246f76833f75b6a9c56572ccd348a50bbab0416bac07f29784ceb84c7333fc907 SHA512 1d16de0cb21527b8ac4db54a2d4f4f9ef07d8fbd744370f0ee311a2cd77da63e17dc160796bfb99a4d95f4743fcd1ff9819a5a3d14e18cfe38b337fdd4b7b04e
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
-DIST rabbitmq-server-3.6.14.tar.xz 1508216 BLAKE2B 1ca3f933e91ce204cc90df7df619742e6d42e211b6350c629015a15a0ea6cdad05ad1e0139db5b2f1f353f314d1709ba468112a4059c6894ef9fb454fd616cf2 SHA512 22874b81fcebfd954e5ee8f4701bd8743bbc9559c1a1c09f8de03e16039153aa6e6b0bea71067770913493299e57da6b3928ff0ade4ee9ffb5ea48a30a154d9f
-DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a2997f7bea6f14a2d72cb42ad8d3254b2bcd32b0605c7687eeae8e1c39a6d3ad1776f89e84292d508903b956ec05f6cd858 SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662
-DIST rabbitmq-server-3.7.13.tar.xz 2595904 BLAKE2B 3dce5af3b63d84e1ab8ee02ba3f55560087e5f72532e693b483e8083e25d540406d696873b291dd715c45aae1e15945e76fcc33bdd77503c6517860b45f7e7b9 SHA512 33cc3682214782152e4e1270d1011e94df79b454abf6fcf9d56b73be1f8cf42ce0a4a559f243b4721ae25b10897c756960c655909bee2b427395d0f0b63a2fb9
-DIST rabbitmq-server-3.7.24.tar.xz 2867964 BLAKE2B 30d49a72f92a9adc4fe7de071e9369cb4d574249b1d414b2e5d492585ae0bc0e5f85ca0c287d73dbf661df4cb249f29d1bfccc7516e6ec5d6ff70a437a01ce00 SHA512 5bf2b69b555ddc89415ce7918d0ab23221d383742fc20036f608b4cf99852fb58b61a5d7616b6357f151e1f16ed660b35d7b54a1c2ea46cf5b4ef67c2d38bd28
-DIST rabbitmq-server-3.8.2.tar.xz 15178744 BLAKE2B 11da75e48415d53f291fffc8fafd89b506e727714e6f9dfce6a0b7c605a0d56bb3b879c779bebbc21f2bc5ada21378f9ed30e6f729c2c71b61ebe00db16eb225 SHA512 ac8cfc002ccbff8cf95c3e5508956cf5622c1c145b730589308ec4ca9173e5efca338829e13aa7dc37db035868dc964ab0e3e0edba15de49c64e18c50247b918
-DIST rabbitmq-server-3.8.3.tar.xz 3304456 BLAKE2B 2ad04a1a8688cbbba71a82d44003f7ad632b26616dae977e8d326316baaaf7b475c4db37777b13aa8cb153373be0f9f85972aac7ad53c299e39615dd032e8ced SHA512 1547e7935ff34be278970c03b176d76e52a6968cc2955dc75fa00d184ed1ba567e095c5a56e0f2f7c868d41281897c53ec6f4baff019e144aa57afe99cd6adaa
 DIST rabbitmq-server-3.8.4.tar.xz 3086216 BLAKE2B c1c22ebca1b66aa210b45b3fccfffd89f3bb9312d37c78362db6d728456c8b7f3a0d787bcd411909509130307faf8457e4a7becb40cbf76ebb1cd1f1b615cce6 SHA512 2dee202b0a39f3d3d4314c4a5ee812d1c2b85225c6cdfc9ddb887285176df8d7009ca4ac8c3ab61cc3a943d32fa7665124dbf51ed18a322a280a3590601f118d
-EBUILD rabbitmq-server-3.6.14.ebuild 2866 BLAKE2B 0750fb1c6968b6c97471a940ab2010c44cf4cb831ae06effdec756df77e72fd1a9a0557de56e89daa0ae65097ee6a39ca3f779f9ad3c7b94175a6800ec6cdc06 SHA512 c5804a6938ae7d9f429e9bcfc0325ae276e3deecf9329a850111f099c1206587954a47daee906848dfa0569caa220fe9afd3e43b7823b4db65d353ffd7cd427a
-EBUILD rabbitmq-server-3.6.9.ebuild 2861 BLAKE2B efc0b3acca1f57d4116a18475c923502febd6ecb4a95030be05bdf94bd726c2cb90a8a95a7a47cc390da3c6c66f84af1eec14279f235b6547d247d2a8437e4c0 SHA512 ebabcbe717134e17d16a1623ff05a7700d7825de626c25c4b2ad8510f0ac42ede1a37ddbfd367c198d6cb4b550f30294c64fd7cbebe64bf6ac0244c9de4dee50
-EBUILD rabbitmq-server-3.7.13.ebuild 3105 BLAKE2B 61175864b1b7eab693fdfcf16ff1178c87d37e966a44ed29e08d01242d16af099ef492eeb527e8181b06ceb2222736c354df34cb510dbcce6a929eba63696b05 SHA512 5896fa3e7a2865e42a3f5c485c55504ead488115334e220b489db9dec55d2537d2e12266d8507f6b73ef76b1dadab6ba56a86a092c590e0627478207cbc7f6bf
-EBUILD rabbitmq-server-3.7.24.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2
-EBUILD rabbitmq-server-3.8.2.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2
-EBUILD rabbitmq-server-3.8.3.ebuild 2160 BLAKE2B 1ea1fb4a67301f670fc1c256dc2c32ea3f833e0b02adace4a1e34e03a4d5509d9e3e931385697b9dc749e0f24a70974ef0161798743fcef9106f0395c1953717 SHA512 ab51c206eb5d2d9c395aabc016b691784364b2220fea1feacdbf559ba809402491ba5282c513d312f82b897d36ccad9b8e15837bb6ed69d5f2484315b8959786
-EBUILD rabbitmq-server-3.8.4.ebuild 2376 BLAKE2B af252dc508def8a6902923deccf85a3308de5c10b973d572b5f6d34916c84e5e8f7543acd42237fc586b35ee0ceda3b678880e49fdeae27f2005ec1a43ef3344 SHA512 028fe0378e8ae3aa6ad729d6886359ea69269d5c1d78098f30047c964df88c55badde3e410469acda81c0b2d41d76abaffed41a2079fe6d9a362525f0b98a596
+EBUILD rabbitmq-server-3.8.4.ebuild 2374 BLAKE2B 3befa2b1082a817401324e00a571f3e59bb66cd97e1249adb791edfe3b78e005d3169af7068e3cad23595196873b6bbc127c8b668091bb859c06aaffd0cfe8c5 SHA512 4386018e0dd428346285d082681b43b0e3fd2c25be676301ef176e18e7c475e2e9cfb85eede2a7d4e18b2964f1b7e9db696986eb52a71f8e5b63c141a98ec92a
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
deleted file mode 100644
index fb7c194aa94f..000000000000
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use dns epmd
-}
-
-start() {
-	ebegin "Starting RabbitMQ"
-	/usr/sbin/rabbitmq-server -detached >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err
-	/usr/sbin/rabbitmqctl status | sed -n 's/[^p]*pid,\([0-9]*\)[^0-9]*/\1/p' > /var/run/rabbitmq.pid
-	/usr/sbin/rabbitmqctl -q wait /var/run/rabbitmq.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping RabbitMQ"
-	/usr/sbin/rabbitmqctl stop /var/run/rabbitmq.pid >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err
-	eend $?
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild
deleted file mode 100644
index d6fd89e8e0e4..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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="https://www.rabbitmq.com/"
-SRC_URI="https://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-18[ssl]"
-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 deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/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 deps/rabbit/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
-	dodoc deps/rabbit/docs/*.xml
-	dodoc deps/rabbit/README.md
-
-	# 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 "https://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 "https://www.rabbitmq.com/access-control.html"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild
deleted file mode 100644
index 60b7628d197a..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://www.rabbitmq.com/"
-SRC_URI="https://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-18[ssl]"
-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 deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/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 deps/rabbit/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
-	dodoc deps/rabbit/docs/*.xml
-	dodoc deps/rabbit/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 "https://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 "https://www.rabbitmq.com/access-control.html"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.13.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.13.ebuild
deleted file mode 100644
index dfbcc2c75b34..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.13.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="https://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="test"
-
-# dev-lang/erlang-20.3 cloud be used but 21 is easier to specify as it always includes the smp stuff now
-RDEPEND=">=dev-lang/erlang-21.0[ssl]
-	<dev-lang/erlang-22.0[ssl]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	>=dev-lang/elixir-1.6.6
-	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 deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	rm -v deps/rabbit/scripts/*.bat
-	exeinto /usr/libexec/rabbitmq
-	for script in deps/rabbit/scripts/*; do
-		doexe ${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# 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
-	keepdir /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 "https://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 "https://www.rabbitmq.com/access-control.html"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.24.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.24.ebuild
deleted file mode 100644
index b3cb02eb6945..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.24.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-any-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="https://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/erlang-21.3[ssl]
-	<dev-lang/erlang-23.0[ssl]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	>=dev-lang/elixir-1.6.6
-	<dev-lang/elixir-1.10.0
-	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 deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	rm -v deps/rabbit/scripts/*.bat
-	exeinto /usr/libexec/rabbitmq
-	for script in deps/rabbit/scripts/*; do
-		doexe ${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# 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
-	keepdir /var/lib/rabbitmq{,/mnesia}
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.2.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.2.ebuild
deleted file mode 100644
index b3cb02eb6945..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-any-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="https://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/erlang-21.3[ssl]
-	<dev-lang/erlang-23.0[ssl]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	>=dev-lang/elixir-1.6.6
-	<dev-lang/elixir-1.10.0
-	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 deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	rm -v deps/rabbit/scripts/*.bat
-	exeinto /usr/libexec/rabbitmq
-	for script in deps/rabbit/scripts/*; do
-		doexe ${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# 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
-	keepdir /var/lib/rabbitmq{,/mnesia}
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.3.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.3.ebuild
deleted file mode 100644
index 2f702fd994a5..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-any-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="https://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/erlang-21.3[ssl]
-	<dev-lang/erlang-23.0[ssl]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	>=dev-lang/elixir-1.7.0
-	<dev-lang/elixir-1.11.0
-	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 deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	rm -v deps/rabbit/scripts/*.bat
-	exeinto /usr/libexec/rabbitmq
-	for script in deps/rabbit/scripts/*; do
-		doexe ${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# 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
-	keepdir /var/lib/rabbitmq{,/mnesia}
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
index 34216e4b9ac2..99334121ba05 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/ra
 
 LICENSE="GPL-2 MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 RESTRICT="test"