Version bump, drop old, fix #426092 #419531 #430510 #430508 #416345.

Package-Manager: portage-2.1.11.13/cvs/Linux x86_64

7 files changed, 47 insertions, 137 deletions

diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog
index 054aac07abef..ddb23ed7073e 100644
--- a/net-misc/rabbitmq-server/ChangeLog
+++ b/net-misc/rabbitmq-server/ChangeLog
@@ -1,123 +1,14 @@
 # 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.22 2012/08/07 12:55:12 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.23 2012/09/03 16:00:40 ultrabug Exp $
 
-*rabbitmq-server-2.8.5 (07 Aug 2012)
+*rabbitmq-server-2.8.6 (03 Sep 2012)
 
-  07 Aug 2012; Ultrabug <ultrabug@gentoo.org> -rabbitmq-server-2.8.1.ebuild,
-  +rabbitmq-server-2.8.5.ebuild:
-  Version bump, drop old.
-
-*rabbitmq-server-2.8.4 (23 Jul 2012)
-
-  23 Jul 2012; Ultrabug <ultrabug@gentoo.org> +rabbitmq-server-2.8.4.ebuild:
-  Version bump.
-
-  19 Jul 2012; Ultrabug <ultrabug@gentoo.org> metadata.xml:
-  Add myself as new maintainer.
-
-  18 Jul 2012; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
-  change to maintainer-needed
-
-*rabbitmq-server-2.8.1-r1 (18 May 2012)
-
-  18 May 2012; <trapni@gentoo.org> +rabbitmq-server-2.8.1-r1.ebuild,
-  +files/rabbitmq.service:
-  Added systemd support
-
-  12 May 2012; Benedikt Böhm <hollow@gentoo.org>
-  -rabbitmq-server-2.5.1.ebuild, -rabbitmq-server-2.6.1.ebuild,
-  -rabbitmq-server-2.7.9.ebuild, rabbitmq-server-2.8.1.ebuild,
-  -files/rabbitmq-server.init-r2:
-  fix install location wrt #399831; cleanup
-
-*rabbitmq-server-2.8.1 (07 Apr 2012)
-
-  07 Apr 2012; Patrick Lauer <patrick@gentoo.org> +rabbitmq-server-2.8.1.ebuild:
-  Bump
-
-  19 Mar 2012; Benedikt Böhm <hollow@gentoo.org> rabbitmq-server-2.7.9.ebuild:
-  fix #399831
-
-*rabbitmq-server-2.7.9 (16 Mar 2012)
-
-  16 Mar 2012; Patrick Lauer <patrick@gentoo.org> +rabbitmq-server-2.7.9.ebuild:
-  Bump for #394923
-
-*rabbitmq-server-2.6.1 (30 Sep 2011)
-
-  30 Sep 2011; Benedikt Böhm <hollow@gentoo.org>
-  -rabbitmq-server-2.4.1.ebuild, rabbitmq-server-2.5.1.ebuild,
-  +rabbitmq-server-2.6.1.ebuild, +files/rabbitmq-server.init-r3,
-  -files/rabbitmq-server.init-r1, files/rabbitmq-server.init-r2:
-  version bump wrt #382129. also fixes #378139.
-
-*rabbitmq-server-2.5.1 (25 Jul 2011)
-
-  25 Jul 2011; Benedikt Böhm <hollow@gentoo.org>
-  -rabbitmq-server-2.1.0.ebuild, rabbitmq-server-2.4.1.ebuild,
-  +rabbitmq-server-2.5.1.ebuild:
-  version bump wrt #370639 and #375533
-
-*rabbitmq-server-2.4.1 (08 Apr 2011)
-
-  08 Apr 2011; Benedikt Böhm <hollow@gentoo.org>
-  -rabbitmq-server-2.4.0.ebuild, +rabbitmq-server-2.4.1.ebuild:
-  version bump wrt #362527
-
-*rabbitmq-server-2.4.0 (07 Apr 2011)
-
-  07 Apr 2011; Benedikt Böhm <hollow@gentoo.org>
-  -rabbitmq-server-2.0.0.ebuild, +rabbitmq-server-2.4.0.ebuild,
-  -files/rabbitmq-server.init, +files/rabbitmq-server.init-r2:
-  version bump wrt #347419
-
-*rabbitmq-server-2.1.0 (19 Sep 2010)
-
-  19 Sep 2010; Benedikt Böhm <hollow@gentoo.org>
-  -rabbitmq-server-1.8.0.ebuild, +rabbitmq-server-2.1.0.ebuild:
-  version bump wrt #337597; remove old ebuild
-
-  29 Aug 2010; Benedikt Böhm <hollow@gentoo.org>
-  rabbitmq-server-2.0.0.ebuild:
-  add missing dependency for man-page generation
-
-*rabbitmq-server-2.0.0 (28 Aug 2010)
-
-  28 Aug 2010; Benedikt Böhm <hollow@gentoo.org>
-  -rabbitmq-server-1.5.4-r2.ebuild, +rabbitmq-server-2.0.0.ebuild,
-  +files/rabbitmq-script-wrapper, +files/rabbitmq-server.init-r1:
-  version bump wrt #334543. also fixes #332391.
-
-  02 Aug 2010; Benedikt Böhm <hollow@gentoo.org>
-  files/rabbitmq-server.init:
-  fix "erlexec: HOME must be set" when starting from init
-
-*rabbitmq-server-1.8.0 (03 Jul 2010)
-
-  03 Jul 2010; Benedikt Böhm <hollow@gentoo.org>
-  -rabbitmq-server-1.5.4.ebuild, -rabbitmq-server-1.5.4-r1.ebuild,
-  +rabbitmq-server-1.8.0.ebuild, metadata.xml:
-  version bump
-
-  02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
-  Remove caleb from metadata.xml (#317071)
-
-*rabbitmq-server-1.5.4-r2 (21 Jun 2009)
-
-  21 Jun 2009; Caleb Tennis <caleb@gentoo.org>
-  +rabbitmq-server-1.5.4-r2.ebuild:
-  Add dev-python/simplejson as a dependency
-
-*rabbitmq-server-1.5.4-r1 (22 Apr 2009)
-
-  22 Apr 2009; Caleb Tennis <caleb@gentoo.org>
-  +rabbitmq-server-1.5.4-r1.ebuild:
-  Various fixes submitted by Luke Chamberlain (luke@re.gen.nz)
-
-*rabbitmq-server-1.5.4 (19 Apr 2009)
-
-  19 Apr 2009; Caleb Tennis <caleb@gentoo.org +files/rabbitmq-server.init,
-  +metadata.xml, +rabbitmq-server-1.5.4.ebuild:
-  Initial import
+  03 Sep 2012; Ultrabug <ultrabug@gentoo.org> -rabbitmq-server-2.8.1-r1.ebuild,
+  rabbitmq-server-2.8.4.ebuild, rabbitmq-server-2.8.5.ebuild,
+  +rabbitmq-server-2.8.6.ebuild, files/rabbitmq.service,
+  files/rabbitmq-script-wrapper:
+  Drop old. Add GPL-2 LICENSE fix #426092. Enhanced systemd service file fix
+  #419531 and init script fix #416345 thx to Maksim Melnikau. Fix #430510 VCS
+  fetching in compilation. Fix #430508 parallel building. Version bump.
 
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index b526955f56b5..a460ba74b513 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX rabbitmq-script-wrapper 1844 SHA256 46783bc7466f48d8ddc785c5aac2b94d723c811106b6d8251adee170558f316e SHA512 2bdd4972e4395a61b9f9db1a999f03114c98239ffd5199d8475efddb30eb641fe39f641eb9f17435e6db784909136f5be1153ca169a3c978916b01bc5d6e7813 WHIRLPOOL 25d737598848641051536045690155bed9944cad5d7388a0ff422f81dcb45ba65f883b9a2b52c449288a77a76f38e1fcf3b4a8bf5e0e34c4b640a13acadf26a1
+AUX rabbitmq-script-wrapper 1855 SHA256 993ac37f3ec0fe75c20ddbfedfc2e282ec7fbbcfe8a58df8a95852de1cd80720 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab WHIRLPOOL dc0d0a7aabac4cb50cc44c4dae697fc58477fbd42307339394d0befd2b8d8c206bd21d3c047d6ca526464708f28cc6d50b8110da8757d0f036c98e00348aea34
 AUX rabbitmq-server.init-r3 744 SHA256 76aa4fe4578c31fe076d7c48770b63ad8836996352a981c6bba415e67e071b5c SHA512 010576db46b05ceff9661a9841a6c21570667ffd0828bad8e02d547a31aa36c4c4cf0dad7d52721837bc2ebd5c19d83ef51a0618aea8ce9b476e08f103b2143d WHIRLPOOL b0779dcf66f0a06b6d465c0806a1bc9f58e64a47dc9ff9d3989dc7b4a6781ba0cf6a5d6344580fc066bb4f46a5ecbc33efbeaa003b3d401b4216e26bd5e24f0b
-AUX rabbitmq.service 190 SHA256 cb47608cd69d654f3064740ba95fe5c01b207fa071f24eaccbc1f63e5e6d67f4 SHA512 cff74ab697d6fb4891f413c9083a9b389a6e4d10b851ccaa751b3e846f526f33377b6292523571cda3e358c6ce3fecf57aa641b8aa5577193724470c83c6ccdd WHIRLPOOL 366debbf4582c33bc8f046a8ea8b4fccbdff8670669d62c24303acf4423ae90a7d89d0ff161f65bc244fb20666900500e81f3e8e0265b4aae16f036694fb80a0
-DIST rabbitmq-server-2.8.1.tar.gz 2644402 SHA256 b59f46d2cc4ce3427ba16e00cb9def7c51ca9f6b92473c6ae8fc43f6e4d60835
+AUX rabbitmq.service 314 SHA256 a1444878e941541cc413b9a7c50057e1374bddf858eccf64c2abbbcf0f04e882 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457 WHIRLPOOL 96061d6907e6b888eea9a05b9b4a4bafc641708e754eef61f57b6cb2490c4d50f5580fe52c0fe55d71819ef3cda9492d623c6e82ec33e1c577c52c7d9b0c16f3
 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
-EBUILD rabbitmq-server-2.8.1-r1.ebuild 2447 SHA256 41625172cac4a358e5057908f001856ac2bed821e30746afdc825db06774de21 SHA512 7436b21b294ef8988928f5c09b40775b6dc6656dcd04897f16627c0a595897907f82d2b2637e7fc4ad5f85efe6569aa0a9999772b67c79c57a9365482f978846 WHIRLPOOL 6bcd82a61dbd8b9adecbd5b9fa4f58dd4894129201270c49d6f7d006eaeb54b344df2243b354bcf47008da3ff8970c67f3a3b5b49bf35d1828ab4e992a822357
-EBUILD rabbitmq-server-2.8.4.ebuild 2446 SHA256 72834d3a900225d9ef72eb6c6df6637183c584dc1c73745d73ad9ad8c81345d1 SHA512 72c10a5a20a5cde2b5da33790a982c1234eb0e661ee216d44ddfefb5b0be64f96a69f03cfb27fca0d660f7ce094e57a9689fd4e7d1cdcc614bbc13c1ac8baf9c WHIRLPOOL e6d5db4a9715f722209e91a3dc3d076d37db1c79cb7ec7c370162f5913b9281b4247a0446171ebfc913d001c5ce0ecc9fe91aacb66d864cef536fc20cfe4f37e
-EBUILD rabbitmq-server-2.8.5.ebuild 2446 SHA256 5e53d0752c2eb032fce7d547c6576cfc28e859e0eba0c4a67914460f6ed34b20 SHA512 167e9fe9d5a350c1a3ab449afe9539d31cc3bae26921e38034d07291548544f4c5d937fdee481afbfe7f266558fd50aa62d9b84d0a74ef93b51fa0f56915152f WHIRLPOOL a6cc1a55095f18708b1d540e188e599bd69e600914b9c3afaec0037776b1e760d29e0d7f578d852d0a90452f791427d21a989d80db10f588ca9f55613073d297
-MISC ChangeLog 4075 SHA256 200561ade08bc8c2b13542eee104d98e47b9fc0bd56913a7be6938a67fe1c35e SHA512 db26e07365014acd8364a1710ef0e435c0474790b42f8b87e38c1a647794c1f95fdf70408ccc880aa2e0a76d9fa8ce3a793d105a45ce79f982def9177c415826 WHIRLPOOL dd6c1316cbc2403d4723c2b7510051e1084d984e41950fa87a31f08053c6d1332f0747c713971accd4041e65427f46c1a51e0135bfc606f42b634cc9454d96f6
+DIST rabbitmq-server-2.8.6.tar.gz 2788855 SHA256 146a24f2c336d304c465ac4243539b2e45838fb4b9900e8d84aca1ea800d593f SHA512 281ca90768c8483e7dea832b9699bc7470cdc9d70f942323cd556224b3bba60b72e1bc1376a0eed1e1005236c0c71e8fb04a961010759da981be1dd4ee163006 WHIRLPOOL af48428e075c52357dbfc024bc9e268386760eb5bb5c37161cc0f7cae33452063b209cfb15fb599d535adea94e8a1668456f3609ad68280dc5a59ff1d6f6e6b5
+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
 MISC metadata.xml 230 SHA256 bd8560ab21232bace10a233ea24414dacb36c87e37a3a10cdeeded266cbb5c8d SHA512 3c7c9badebcc814572f1be89f2cdffaa81f795e3a44ae4f67bc7332927d332844a8a076b0f34d0e84b31db5abef654001cf1e6efff9628fa56a06786c082e6c0 WHIRLPOOL 57f9c4a65d7791075c8859af3cbbff141cc74e426102fefd15029bf1c63d3cf8a2c496eb4fc4f59570d0b84151a0d7a0feba0599827e932702ecfd5b8598563d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAhEDsACgkQKiQSS7ZY+hNEZAEA2AE9B7X+l3crz9HRt1juF16y
-ZhuqA67sZRr+4qAaCh4BANmRYhHZc0pbX/qVC+9v/q1k1zsfXuATpc5gwWwwLwan
-=x4Hz
+iF4EAREIAAYFAlBE1DIACgkQKiQSS7ZY+hN/PgEAxbHJBEbYJ9IL4Y07KDuzh1uf
+smQ/qGtaXgKImOcJqpUA/ijYaOYDh3lpd3xkKlqFRTOBcAphmmSAFe91zkUN52i4
+=8Npc
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper b/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper
index 91b4b7c7898e..23f3d75a42cf 100644
--- a/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper
+++ b/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper
@@ -31,6 +31,7 @@
 ##
 
 # Escape spaces and quotes, because shell is revolting.
+CMDLINE=""
 for arg in "$@" ; do
 	# Escape quotes in parameters, so that they're passed through cleanly.
 	arg=$(sed -e 's/"/\\"/g' <<-END
diff --git a/net-misc/rabbitmq-server/files/rabbitmq.service b/net-misc/rabbitmq-server/files/rabbitmq.service
index 6bb26f62f447..9264b406713f 100644
--- a/net-misc/rabbitmq-server/files/rabbitmq.service
+++ b/net-misc/rabbitmq-server/files/rabbitmq.service
@@ -3,7 +3,11 @@ Description=RabbitMQ daemon
 
 [Service]
 Type=simple
-ExecStart=/usr/sbin/rabbitmq-server
+ExecStart=/usr/libexec/rabbitmq/rabbitmq-server
+ExecStop=/usr/libexec/rabbitmq/rabbitmqctl stop
+WorkingDirectory=/var/lib/rabbitmq
+User=rabbitmq
+Group=rabbitmq
 StandardOutput=syslog
 StandardError=syslog
 Restart=always
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild
index a071eace2050..a0c8377bf5c5 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4.ebuild,v 1.1 2012/07/23 10:13:38 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild,v 1.2 2012/09/03 16:00:40 ultrabug Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -11,7 +11,7 @@ DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker writte
 HOMEPAGE="http://www.rabbitmq.com/"
 SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz"
 
-LICENSE="MPL-1.1"
+LICENSE="GPL-2 MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild
index 089a9f10f010..47c6132370ff 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.5.ebuild,v 1.1 2012/08/07 12:55:12 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild,v 1.2 2012/09/03 16:00:40 ultrabug Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -11,7 +11,7 @@ DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker writte
 HOMEPAGE="http://www.rabbitmq.com/"
 SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz"
 
-LICENSE="MPL-1.1"
+LICENSE="GPL-2 MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -33,8 +33,15 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	# do not refetch plugins from their vcs
+	for f in $(find plugins-src/*-wrapper ${plugin} -type d -maxdepth 1); do
+		touch ${f}/.done
+	done
+}
+
 src_compile() {
-	emake all docs_all || die "emake all failed"
+	emake all docs_all
 	gunzip docs/*.gz
 }
 
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.8.1-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.8.6.ebuild
index 6fc8e998f80b..e1a724555301 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.8.1-r1.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-2.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1-r1.ebuild,v 1.1 2012/05/18 15:00:03 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.8.6.ebuild,v 1.1 2012/09/03 16:00:40 ultrabug Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -11,7 +11,7 @@ DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker writte
 HOMEPAGE="http://www.rabbitmq.com/"
 SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz"
 
-LICENSE="MPL-1.1"
+LICENSE="GPL-2 MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -33,8 +33,15 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	# do not refetch plugins from their vcs
+	for f in $(find plugins-src/*-wrapper ${plugin} -type d -maxdepth 1); do
+		touch ${f}/.done
+	done
+}
+
 src_compile() {
-	emake all docs_all || die "emake all failed"
+	emake all docs_all
 	gunzip docs/*.gz
 }