net-misc/rabbitmq-server: add missing escript lib directory for 3.7 series

3 files changed, 1 insertions, 104 deletions

diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index b17c0bec8e39..1095babcefbf 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,4 +1,3 @@
 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.1.tar.xz 2466028 BLAKE2B 37bb69dd031bc9f9c345ef00128b8eb2ef719c8f48280b41e30d5cd82ed431430798eabe8eceb88a2edf112d2807bf6465aa19ffd108a5e84d4d8c0ea29fe143 SHA512 66c47f54ab3a725e7caec37e6ef632ab8b367af47431e89893085463c676775a9f42c8f89e7fb9ac174768805790d4cc70a1b964963267cf586de2d13fc55d0c
 DIST rabbitmq-server-3.7.2.tar.xz 2466952 BLAKE2B 99065384e4a8c3362200c1cea9225e243952d1c7eae2e5feb5a5cbe6d17c1a803cb904edc9a1e3f9e23a99b6e5b2f119b4ce226765e97db1310776b19977c00d SHA512 8972efd81c03d5499393ee87000f86373a1e933ce327318122d603ce4e76156f1c8588f3740adccc74c00afa5256ea6a040f1c420bacf3eaec170224259e1c3c
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.1.ebuild
deleted file mode 100644
index 3571bfcc50ca..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="http://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 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/erlang-19.3[ssl]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	dev-lang/elixir
-	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/*.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
-	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.7.2.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.2-r1.ebuild
index 5f86107a94be..9ab7ab6bcfe3 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.2.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.2-r1.ebuild
@@ -47,7 +47,7 @@ src_install() {
 
 	einfo "Installing Erlang modules to ${targetdir}"
 	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/include plugins
+	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include plugins
 
 	einfo "Installing server scripts to /usr/sbin"
 	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do