gentoo resync : 23.12.2017

3 files changed, 19 insertions, 16 deletions

diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index e6eae1107829..65cda08eeaef 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,10 +1,10 @@
 AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e585628a82954c9cabe2548a33dc5742e111a92335443332b705214bc908d7d1b15d89408f0ef585be92c6c522c736 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab
 AUX rabbitmq-server.init-r3 638 BLAKE2B 56c9116898f480b08fcd8fbfa37af5d1e9d4f9d482aa91e63f2bb5eaeb2e0700566dfddd27e0463fb2162292a09ceb1c96fa16b9fda5389e39491214d2952d25 SHA512 fa6c7293c11190b1f59eef23c4a3de00666e32451f695f1a7f686f01bb92055a0c2afae565d9106e852e6b77a71661c364eacb36e2d39dfb8d175d8f0eab98b9
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
-DIST rabbitmq-server-3.6.10.tar.xz 1426900 BLAKE2B 045ee3181e05bb422dc2d4b2d2cd50ca15f2b7958c381d30748b58e5bd1df799d3b18fa6af631972b37fe19f8edc0b0a830271c54b1689417978e19d91e14732 SHA512 64e618e51ab259463029ad75b981dbf64687515e52d19854f225d4c68077e683ef56f0f6bb92cbbf91f140bc829d905473d687d083d12f36dd2cdfab3defaed6
-DIST rabbitmq-server-3.6.5.tar.xz 2923164 BLAKE2B bb3286a30db7323a6971d29c1a94b644fd24a5ff5c6d19818358a6f2a59585d568078e8bb7d4a8f266179175063b5cc6e7245021bc82f4d0745cfbc8055ce859 SHA512 50751a25b39a96a8b0665c9316d8a603050807597f932e0b3cc74f63fbd73a5668865ad7e7c58de5bef80295a5a3c472731446e4e07c530812a6275703ce2388
+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
-EBUILD rabbitmq-server-3.6.10.ebuild 2862 BLAKE2B da0e3d9877b21c6b96965a9f69f9d62fc2e39f35443664d96c19411ccc84f02413c8dbe6a38002c61f2f7a3ffeb3502eb57047ed4a13d9b5d9a4efe8834310e2 SHA512 30b2b5abea99f3f7d277c73135ebcfa15e592650dfd5b7815c81824efc495e3d3fcdeb350e3fba5d6e465a73d844230ff46da2083c580819146b8548361ca0a5
-EBUILD rabbitmq-server-3.6.5.ebuild 2784 BLAKE2B f47f776e489c4ad640390727efe4b1a96d0fce6969e84776e15e96966a509905238b3500f3907659b4cf68a8eb8675137796760d8cb2a5917c5d2ceadfa6024a SHA512 e56a01c1d4c0cc7537fdd680387a845c0077c744fa29faf73777d258b8d7399233ccf58bc5368a10c5949ed9685a4fc14c9778a43bd03a98564451b0028b584e
+DIST rabbitmq-server-3.7.1.tar.xz 2466028 BLAKE2B 37bb69dd031bc9f9c345ef00128b8eb2ef719c8f48280b41e30d5cd82ed431430798eabe8eceb88a2edf112d2807bf6465aa19ffd108a5e84d4d8c0ea29fe143 SHA512 66c47f54ab3a725e7caec37e6ef632ab8b367af47431e89893085463c676775a9f42c8f89e7fb9ac174768805790d4cc70a1b964963267cf586de2d13fc55d0c
+EBUILD rabbitmq-server-3.6.14.ebuild 2865 BLAKE2B 64a85b0d626e222182a167c5edff69e55802c4a2261a4507a6164dc57cf0d36dddc4db58d3c3aa47152557cbc3bec84fe6701a438ed735ab4b4597ed0f25519c SHA512 bd84518cdee06f69be05ef141ff6d10ffaca2312410621ed35508315878ae7dcbd5ae17f654dd539b6dbd7e0a46850fdbbb3c444564357a352e175107f814ffd
 EBUILD rabbitmq-server-3.6.9.ebuild 2860 BLAKE2B 51d41a29be6986157954f3b675e31b9d813baeff9023c6f6c31ec104039ee2544bd1216ffbed27e0b69437dbe5f396a864fa18b789d33d5f9d8702a32aed4cdd SHA512 17951e227b45b1230bae2992b3f4530e7c2e7dabd62cfd8c9950254cdf0633dace11b45da1ff34934adac1a365032d72e87adf3ad64051e3942d1077b9b59303
+EBUILD rabbitmq-server-3.7.1.ebuild 2957 BLAKE2B 441e49fc8e818d7024403e38186c2c9c7fa685c34dddb2e7103bdd887acea549e9d32ad9f495ca3607d7aaf50f0de76cca81ab972bc4ddc9d0bf385405d16b98 SHA512 aa5e96ae41e1b62d0b78b76a151aa8622a92dc6e0bd586c6f2204d4a9e705e922e917141524c83545e4643f36f028a2e412826ce1b73b9ae25f1c7139b4847be
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.10.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild
index 5a8de0fe6be5..dbb8168aa3c4 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.10.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -61,7 +61,7 @@ src_install() {
 
 	# install documentation
 	dodoc deps/rabbit/docs/*.xml
-	dodoc deps/rabbit/README
+	dodoc deps/rabbit/README.md
 
 	# create the directory where our log file will go.
 	diropts -m 0770 -o rabbitmq -g rabbitmq
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.5.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.1.ebuild
index d8095794d6f1..3571bfcc50ca 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.5.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -9,19 +9,20 @@ 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"
+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"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
-RDEPEND="dev-lang/erlang[ssl]"
+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}]')
 "
@@ -42,16 +43,16 @@ src_install() {
 
 	einfo "Setting correct RABBITMQ_HOME in scripts"
 	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i scripts/rabbitmq-env || die
+		-i deps/rabbit/scripts/rabbitmq-env || die
 
 	einfo "Installing Erlang modules to ${targetdir}"
 	insinto "${targetdir}"
-	doins -r ebin include plugins
+	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 scripts/${script}
+		doexe deps/rabbit/scripts/${script}
 		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
 	done
 
@@ -60,8 +61,10 @@ src_install() {
 	systemd_dounit "${FILESDIR}/rabbitmq.service"
 
 	# install documentation
-	doman docs/*.[15]
-	dodoc README
+	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