fix #546812, version bump, drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

6 files changed, 53 insertions, 149 deletions

diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog
index a786270eae34..0127a1a7c987 100644
--- a/net-misc/rabbitmq-server/ChangeLog
+++ b/net-misc/rabbitmq-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rabbitmq-server
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.49 2015/04/08 18:04:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.50 2015/04/30 10:38:43 ultrabug Exp $
+
+*rabbitmq-server-3.5.1 (30 Apr 2015)
+
+  30 Apr 2015; Ultrabug <ultrabug@gentoo.org> -rabbitmq-server-3.1.4.ebuild,
+  -rabbitmq-server-3.2.3.ebuild, rabbitmq-server-3.2.4.ebuild,
+  rabbitmq-server-3.3.4.ebuild, +rabbitmq-server-3.5.1.ebuild:
+  fix doc perms #546812 thx to Coacher, version bump, drop old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> rabbitmq-server-3.1.4.ebuild,
   rabbitmq-server-3.2.3.ebuild, rabbitmq-server-3.2.4.ebuild:
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index cfca5c5d3da5..64e7e76c93e3 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -4,32 +4,18 @@ Hash: SHA256
 AUX rabbitmq-script-wrapper 1855 SHA256 993ac37f3ec0fe75c20ddbfedfc2e282ec7fbbcfe8a58df8a95852de1cd80720 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab WHIRLPOOL dc0d0a7aabac4cb50cc44c4dae697fc58477fbd42307339394d0befd2b8d8c206bd21d3c047d6ca526464708f28cc6d50b8110da8757d0f036c98e00348aea34
 AUX rabbitmq-server.init-r3 768 SHA256 6d2ca0d4024b2a7daa1b41bb3903235ecd394f25c2c76b249bfdfd8c3192e8c3 SHA512 99c9869f3e8ba68edca6b379824c1c68f74d2cb8f78c96d84a16b644f5068754e69aa290a5c7110fad34d2b3d4d5512783ba29a90b50f6707c63bcd674bcadf3 WHIRLPOOL 94129ed1038d0acaf2219274c7d03448dbf9c280171104973f9c1d6002a9420051920c1f3ca068e761d333be8c4502e5809fe0041d590ab8d6cb24330026b832
 AUX rabbitmq.service 314 SHA256 a1444878e941541cc413b9a7c50057e1374bddf858eccf64c2abbbcf0f04e882 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457 WHIRLPOOL 96061d6907e6b888eea9a05b9b4a4bafc641708e754eef61f57b6cb2490c4d50f5580fe52c0fe55d71819ef3cda9492d623c6e82ec33e1c577c52c7d9b0c16f3
-DIST rabbitmq-server-3.1.4.tar.gz 3562602 SHA256 46184bfef01f5c5a40746f29d10f0964feffb4aa4bfc62f28dcb11483441d0f9 SHA512 6cb7bc184515d5ece7dca7f9d5230fa6898e67584b51b1440ddb1450197beb2cb0db8e9c4e04a9c89697a93a67975fb884480401376bb2d7aab81491c51251a7 WHIRLPOOL fc6ee5a17da3f9a91dd7c3d16f2da0da6d4e4995b407b10052cad0f617a4af4cc3336a8034e8d528cb40f6f5265f2623bd2bb98bdd787b55367c4283ed4ebf42
-DIST rabbitmq-server-3.2.3.tar.gz 3586619 SHA256 eb2c73338f4c477ea4ba496c4c5e18793b42f3abbd23010133b0163f85faf868 SHA512 e138393cdd510cd428544a4272d6ccf4e9e4e70132c34f21923041f5f426a5639654945c8eac485dfdb89d8e69dc87cee6fa9d4cbec786e2453595ce3d04abad WHIRLPOOL fa4ff801aa391bd115bfda8023dee48ac4a33684d4e1e461296dabb9f092ced10878023edd6a11a38f5ef79d00363f76c3015de316b46f8c45c8710fbb37aed0
 DIST rabbitmq-server-3.2.4.tar.gz 3588097 SHA256 a930f92b362df2f292ec5f0281aa2011eb0c668faf6e24c4653a9fc53ec43b9f SHA512 573fc9fa2956061f91dc093664d98b569157e4f6cfb0d772731d1de6b1f84dd713169b515e28ede3383ac3baabfb912679cd7f021786316d487afc8305cb3457 WHIRLPOOL abecf0a7aaf3ab6d39475ec7f032a4ddbb078f98bf68c5996816fe1bc4bb40fa2052396e782ea8d450b1268b0f1187c5638dcd71aa859b6578025a930a2cca73
 DIST rabbitmq-server-3.3.4.tar.gz 3499481 SHA256 741005b566178de0c0bb9782f6bbc5aa115cfb652b994538fa95904586d5d68e SHA512 c0b76b239fd4e1a80a2646c1d222f6155480a40bb04eaf1b78c1367a5953a36ec626e300399e2ab9478167dab464b1826ec5490167f2cbc14767fccdc4002015 WHIRLPOOL 18793c2dee1a82ba142bddac44d3c9b744d8faccd60c129730e1ec6dfa59b793a76b6508ee63073b89e7904ca74b0130a04e1778d96f373aa7d7a0d290278901
-EBUILD rabbitmq-server-3.1.4.ebuild 2678 SHA256 8e65b29b27f123c5bb63a81d80026172c615eb42c44a3ccc07884aca969dd30b SHA512 6215e6a3f48c06cda585e02f1d4977c8ebb4f62670da766065e0c32722e76a1e54b5e1cec64241b2269cab3710b4065b6ca9f20db812cb9b52c7be2029d24702 WHIRLPOOL d5c0fcca42854b3e4c116ea610fff39087b3cd92cb9cf6db89f25dfa4f7b032e4e69697b7b4ae9e8436048efae874392a1996dd785c099cda1dc3388c22b8089
-EBUILD rabbitmq-server-3.2.3.ebuild 2678 SHA256 55521f0b883efa36017f4f209e0434f2605c68690397c16509d541f0a4af3559 SHA512 ebf1befcc1488994bc78f1af08dc6bb7478f28b5424b447615a5ef9840edb5dfe53d7721d69e41979b22b8bee11da44f97e6a4a0814d8c65b5c5dafd05800da1 WHIRLPOOL 76f561ec015c2bae7997e16217fc0e50dacea5a4417729079c9ea845b8cfd420da0b1c334c9fedf62194df0935b7e217175a2ef88ba47ec61822fb25142e484f
-EBUILD rabbitmq-server-3.2.4.ebuild 2676 SHA256 1364b93ae02f5367323dcb757169cc9701eee8dba4af90e81e429502f3477f2d SHA512 a2e5cabf975c54d7f74c2cd44b397f928c0eb7dc5ae22da4b136e1af851519dc6e213820e2b120a626f924e59156e53be4d3c6cf43f9f068daa057233e1f5598 WHIRLPOOL 56d20bbdd085fbbfeedb0a32d5dc2a8025e4e17770411ee75e567ead1ad6f78bad6247e4dd52f049bacc1b9100b603648c169af6a1843e461ec34b4d622b5db1
-EBUILD rabbitmq-server-3.3.4.ebuild 2919 SHA256 aaeea614daf4c1dfcc4a42f5413d84077dfed5f9f31bfd8550862a8cfb9645b8 SHA512 ff459fcf24e874b2f4e371fcfd153471492335952c64d188f9b104727e88dcb584d7ca60b3f2ce851871867ac770f01c6f5f13afe29fb85f22aae98b897bed88 WHIRLPOOL 296e514046c0f79bc3b27acf11f4f66d97da59f75fa0baaa7da2c824ebf6067e3a1f47fb4dc1d5d24bbbf4f9fd64f8789f32a83d03fd39ba218156786083be64
-MISC ChangeLog 8859 SHA256 df827c6ac948e54748338f2e98963e2c90bc1f806ac417b53df91c2b27177e0e SHA512 952021f8f7aa4415e382bc45980233ff35e74e5b43875e0001f384bebe7a12d4c4e43822d24eedcbcb5366284f77668aaffb35789c9c097d5d42150b3cf1901f WHIRLPOOL 751f4e0ce9d7dd4524720f036da5e4e3474e7c76c3403b283f89a18f1a8c64fd5c4ccd10343df3ce2c54ab15a1e8b78e9b77502cca317f4d93117dcbad6d2ec7
+DIST rabbitmq-server-3.5.1.tar.gz 3723354 SHA256 bda603b37ba933eab2b7fd9cdb9b138b793ad030cd5cb7824bc794754b76ca0d SHA512 866a6b6cb379ccbb958f758316d5c6b5139078bb061a3397b9ba29b9f306a795b158b0b8421d5c05d51add2188af9b5d8459b6218de4d44289d720b0c8bd28e2 WHIRLPOOL 826086270215dd284996b6cc65e6d756455809881a4e3c761fcd4dcad963b3bd0236062e8d10d34cad97daf249e9d7262f462d75e5a484ffee7dcd60f63e5f0c
+EBUILD rabbitmq-server-3.2.4.ebuild 2678 SHA256 188ec1347d4f26910a9ce9db75cba1aeb4e7ef15c0cde0908a608fa0c8750385 SHA512 070bf8779828d5e7cefcd218867c246abc7a32804c87eb703a3112c849141df694aab5ae15c225d33d6517e5cc0971428f69b71e39454d950e54716b4d753790 WHIRLPOOL d349167d1965a04c1c4266e7a7581ebbaebb3d81472df67252cd8daa95afc86d21430daf40eba08985ca0b5395d710170a82754612fc2595261ccd5fc8e0c0a3
+EBUILD rabbitmq-server-3.3.4.ebuild 2921 SHA256 bc941978369acabca3c301de4e7da69dde70a02518f2bab4f70bd3e6f26ac043 SHA512 8c3cff8309956a4871d159dabf307b954a65072963c7ab34b21ed0f100e9340f56f910c45c4520575914f38bb22b77d9cbfee5c215be791a2a58aaa3f5fd7f02 WHIRLPOOL 495e56c81c2e57ecac8e9c73f1d1c7fc25ec00bbbcce352a3bdd1eb7bb9dc9deb5181cf91cb7986ccb0ad338b71f9ec6be3b9027fb2294bc418fe5769a819be7
+EBUILD rabbitmq-server-3.5.1.ebuild 2921 SHA256 b3f0c4490e630116bb818c62867b20166bcc7e67db3d20694fc2f26569277462 SHA512 9fa64008905c5d656ed633355260fb7f933c3fcd3f50726bc39908e7c81845f410bcf1fc19ae8123aaaa04829fe6cf72fd4c5e666c35091f873cdec9927001d6 WHIRLPOOL 1cea13890dc25fdb81c472dea2952c3c94120552b4db6d0e1ef5cdc7a7554e867fa92fce9b6af0cd285d3dc99fa5f3a417b25b571968863ca6c095ba3985c4ce
+MISC ChangeLog 9166 SHA256 3f547396a9562a9787de4a72aae3560d31b0c8eb2052615fbf0a0ce5b89264de SHA512 fd3ad69baac56f7075cf5bd7b03524c4092c7d4cd5e79dac4dde9544d159b2cfeb2b269207497d9e76fe4a022a3bbfccc0ca15d9a62bda3a33afa6cc7aab7b0b WHIRLPOOL 2c4734f3740bd0318b40af2fd0f92db281f13701125bcfcf5e7c98034be161dda546c61ef6cee36a9e3eccf5d29f03f3d4ded0204c52f569f93900a560ae48d3
 MISC metadata.xml 230 SHA256 bd8560ab21232bace10a233ea24414dacb36c87e37a3a10cdeeded266cbb5c8d SHA512 3c7c9badebcc814572f1be89f2cdffaa81f795e3a44ae4f67bc7332927d332844a8a076b0f34d0e84b31db5abef654001cf1e6efff9628fa56a06786c082e6c0 WHIRLPOOL 57f9c4a65d7791075c8859af3cbbff141cc74e426102fefd15029bf1c63d3cf8a2c496eb4fc4f59570d0b84151a0d7a0feba0599827e932702ecfd5b8598563d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJW3QXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOe5UP/1ii40JAcG3pekgf3ZmH4+ZK
-cUHAhCtibPT9SaXHKzAPQEiukw94f90GImlfRR8jmWADhym84yC4K61kf5R2QV8y
-+34piXMKKT0Rt/djSVcTrZo2CbNdo1i2vJTKJM64wzlzqTmnL4W4+PjWwqz08mIV
-ZMmXP6TMCtMxEKy39D81FdxXDBQnl7jWUVD5RMVtznBzVJtEyc8UgD0gnan0Y0vM
-OqlZaJWB58b5aHZ+qP9VNQppX14VHDTCV42MBFLEwfZqajX5CpC6hSZXsf1/a1nD
-ulXExbxhYXbRodb/pFH+Yoza2jap4c52Ov3Bme5sV7XAimfSdJrSthCgFjnGMJN0
-5qhWVyjVpYDqT7LkNcCkphBv8Gs3QdG20VniECr7ERAKohXxKW7pLUxbiEEwYzWo
-OddrUdb1tPGl94uU7ucfwrP8fklqWB3VpcQBAZoe3pf64/WLhbDbjDPJLJebaiG+
-cRZfqGOjUxhjVIkjWw0clRls1P9XvZS01mpXBPrTBnLN26V/g1vwIyMD5vLSkTqQ
-W+NHpNRJFTMQtdQFbI/hDt/hqPK7/5JfGPHE4UN5IdBe07LOEUPdjdw4QSgloF/q
-C3ikrgFJZB3VGZXIrNEJlqHHcS8LUJ6R67ITi7o1ep4SRyf34ERfZdI3XqpWpcy/
-FSIoWG7qEOfKv1FlCnRX
-=jOcI
+iF4EAREIAAYFAlVCBjQACgkQKiQSS7ZY+hMgfgD/URM/qUgUhOyBF6JnpIkRJnYg
+DKLps1+QJu49lwSIFAUA/juPwNFfbASzNDM/jITzJS11AAZ1IVVd9133zH1NRdmL
+=i2Yf
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.2.3.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.2.3.ebuild
deleted file mode 100644
index cfb77183c918..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.2.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.2.3.ebuild,v 1.4 2015/04/08 18:04:50 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-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.gz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~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
-	dev-python/simplejson
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs_all
-	gunzip docs/*.gz
-}
-
-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
-
-	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
-
-	# 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}
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	doman docs/*.[15]
-	dodoc README
-}
-
-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
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.2.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.2.4.ebuild
index 37cb3a4a086a..02e5e32ffcba 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.2.4.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.2.4.ebuild,v 1.6 2015/04/08 18:04:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.2.4.ebuild,v 1.7 2015/04/30 10:38:43 ultrabug Exp $
 
 EAPI="5"
 
@@ -57,14 +57,6 @@ src_install() {
 		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
 	done
 
-	# 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}
-
 	# install the init script
 	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
 	systemd_dounit "${FILESDIR}/rabbitmq.service"
@@ -72,6 +64,14 @@ src_install() {
 	# 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() {
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.3.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.3.4.ebuild
index 5b2a3c112311..7da8d1d88da5 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.3.4.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.3.4.ebuild,v 1.5 2015/01/02 00:16:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.3.4.ebuild,v 1.6 2015/04/30 10:38:43 ultrabug Exp $
 
 EAPI="5"
 
@@ -57,14 +57,6 @@ src_install() {
 		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
 	done
 
-	# 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}
-
 	# install the init script
 	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
 	systemd_dounit "${FILESDIR}/rabbitmq.service"
@@ -72,6 +64,14 @@ src_install() {
 	# 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() {
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.1.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.5.1.ebuild
index 6338d947eddf..821847a3d45d 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.1.4.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.5.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.1.4.ebuild,v 1.6 2015/04/08 18:04:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.5.1.ebuild,v 1.1 2015/04/30 10:38:43 ultrabug Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils python-single-r1 systemd user
+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/"
@@ -24,13 +24,13 @@ DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
 	dev-libs/libxslt
-	dev-python/simplejson
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
 "
 
 pkg_setup() {
 	enewgroup rabbitmq
 	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-single-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_compile() {
@@ -44,7 +44,7 @@ src_install() {
 
 	einfo "Setting correct RABBITMQ_HOME in scripts"
 	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i scripts/rabbitmq-env
+		-i scripts/rabbitmq-env || die
 
 	einfo "Installing Erlang modules to ${targetdir}"
 	insinto "${targetdir}"
@@ -57,14 +57,6 @@ src_install() {
 		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
 	done
 
-	# 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}
-
 	# install the init script
 	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
 	systemd_dounit "${FILESDIR}/rabbitmq.service"
@@ -72,6 +64,14 @@ src_install() {
 	# 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() {
@@ -92,4 +92,10 @@ pkg_preinst() {
 		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
 }