Version bump, enhance init script wrt #495090 thx to Evgeniy

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

4 files changed, 113 insertions, 9 deletions

diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog
index e3ff2fb0077c..ceaf9a7865a2 100644
--- a/net-misc/rabbitmq-server/ChangeLog
+++ b/net-misc/rabbitmq-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/rabbitmq-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.33 2013/11/08 13:10:51 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.34 2013/12/24 15:09:57 ultrabug Exp $
+
+*rabbitmq-server-3.2.2 (24 Dec 2013)
+
+  24 Dec 2013; Ultrabug <ultrabug@gentoo.org> +rabbitmq-server-3.2.2.ebuild,
+  files/rabbitmq-server.init-r3:
+  Version bump, enhance init script wrt #495090 thx to Evgeniy
 
 *rabbitmq-server-3.2.1 (08 Nov 2013)
 
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 8858d8ebd9d0..7ed6514cb4f7 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -2,20 +2,22 @@
 Hash: SHA256
 
 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-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.3.tar.gz 3531924 SHA256 ebb8b0dba8ef82e5523194072f465f2abe451783e09255bf1474c560667a67a5 SHA512 f6230dd87bae9ed8df0196ca59e6d7308a08b0c7158ba8935792fdffe245ec6c2b427f1cba83ab87d8fea67f95ce799337931964a9288613468eda8c71230bc4 WHIRLPOOL fd34c08507580bdde20d908a7e3e2612aee34f2d6fc6f1adf016180cfa28b2f0081bd35d72ac621b4d2aa460b6c8db9389908fee80fa24e9771c6cf025edf7a6
 DIST rabbitmq-server-3.1.4.tar.gz 3562602 SHA256 46184bfef01f5c5a40746f29d10f0964feffb4aa4bfc62f28dcb11483441d0f9 SHA512 6cb7bc184515d5ece7dca7f9d5230fa6898e67584b51b1440ddb1450197beb2cb0db8e9c4e04a9c89697a93a67975fb884480401376bb2d7aab81491c51251a7 WHIRLPOOL fc6ee5a17da3f9a91dd7c3d16f2da0da6d4e4995b407b10052cad0f617a4af4cc3336a8034e8d528cb40f6f5265f2623bd2bb98bdd787b55367c4283ed4ebf42
 DIST rabbitmq-server-3.2.1.tar.gz 3583903 SHA256 0e30f6a1368c819a4c1f0d9a08cae6dc3c25942a46cb0f04047bbea689e93e49 SHA512 abcff9dd2c42324e53169486b379d6d9a4e945029e65f83ea5da603399bb2a62b62c6ef087607f0c8825443811c4186813c80eebc2d76af9be62505cde474868 WHIRLPOOL 3ca33c1164d55b414e2a9af5473f8884f42377fce13bb0126499b179d051677f4c73e73c333427e79357021f96f6ec70ee2679a5a3c15edb1225e51a819bb895
+DIST rabbitmq-server-3.2.2.tar.gz 3583974 SHA256 c6f985d2bf69de60fa543ebfff190f233d2ab8faee78a10cfb065b4e4d1406ba SHA512 bced51c448e6465218ea01745059002cdc6bd5db5e3cfdbf3a98cc190b189336b31545e265b5c48b6365d3f8e7f9f4e127a9325563794cbd6f4e937ed62df841 WHIRLPOOL ffd18dc2b58a58edb6008c014ee937ede549f651f5c28072f362ff43a618331ffd3c439e2d2fecbd1acde9dd8a1a3bc98f219e7efa1d24ceb9d434a93c1ee573
 EBUILD rabbitmq-server-3.1.3.ebuild 2698 SHA256 18848c557571495885e2db57e09dc89056673ae6ad2f1391346e05949e9e42f5 SHA512 2e586ada356adcdf77db2ebe7689db48a8031af2f86a0fe7da3b2e5489946789c69cd0e5ab9eddcaebb5610f613227439963670769ec0724a6f8a07d9c7b756e WHIRLPOOL 5a49c19f893ac3a0bfb6a4baaabae8fe0e7d7b09daa53753fb0e19b3208ad433e69b29c4d1127112b6fcc40095fe73a8235511cffc56c7cef8f8a7d1984509b8
 EBUILD rabbitmq-server-3.1.4.ebuild 2698 SHA256 00aa98e61076db1c26ab1c05837e888651cd0b86200efea130eaaa681a036da0 SHA512 b31eb329135ebbe4cb81b67390f375291d7b0588c62bca7236e51103cd51dd3c45a452414c55af154b1f626c050a8a777fb8b131c074bdff59675b7e476d6c7a WHIRLPOOL 87165ee0e9a806beff3c46a81c83282d5ea1acb550a985f6fffa41cd72b1aa9c569eecae3a5f197fff88f5704556a2520dac3b823e7a0692823d64b9f6a3e3ae
 EBUILD rabbitmq-server-3.2.1.ebuild 2700 SHA256 dd09b38a7b7ddce4d455cc2b98cb03b0de20869cc2970a607ac1cae378f2a52f SHA512 66ae6b8e249e537911d1c0038bce8fdef88a1957c5056a0c03058558e5c6c933cd0420641e6ff54f129a681801ba2c732617ce26b1fa861b00f8a272a3e3a625 WHIRLPOOL 95be98a83348e5d5c00bb524ad15bc278f69cf38aaceede3302b25c9e84a0b62eb49f994aa06ca75637cbad79cad02d3eb7a97b64b42c01a32c9a889c041796b
-MISC ChangeLog 2442 SHA256 f20475f0f4122ac6d5f59fcade1eb799306bfddeef66db3fc07577854b317d4b SHA512 f26e498b45bb16d9a33109a3935b521f303cc6cc8b7676e8cabfe2f0d11d358920ffefa78541e9f1229ff575f8217e430b5a23e35c3a27533085444ec811f071 WHIRLPOOL dc3c43389c083d796b648ebab910021182fafcf09d5b6dab03d6fec24f9595b4c6a61d90c0d8deaf21564a91572452e7c07cb7ad84ab6696ce86667f44caf77b
+EBUILD rabbitmq-server-3.2.2.ebuild 2700 SHA256 95b8c824601ece39eaa818abab24d0a419bfd321d4e96f5569542bcf3db5437d SHA512 0aca806ae050464587492780fe1f97c4d90811577038daba724a627b316c559d6c4879cfb8b594ef31bfd9e5b2b6b29ebff2d288f8158f69dfc9c5c937204e36 WHIRLPOOL 428a39f7fc3077872383831f7465e5ddd2f0a14bc48d423ecdaac401e6585372cf79710c87811a2e80960a10a113bbcea4804e2861de21c094e7c5b8c0262e53
+MISC ChangeLog 2654 SHA256 e8b1a49bb3b2ec505f78fc5a6e1c36ab79e09324d40e61e1dd20df3f4ea89744 SHA512 bcba5b5a896e9ccbbdefc4dce2d07540a3a479e9bc8e002e8770346782b37581861900ad2b1f9019cbf8ea65b682596dcf39307f1141c3151ee413458382bdc9 WHIRLPOOL 11b43f67fe72f3011e41769656b971d285572559f4feac05924850f57a4f75d28374afdb21a8e2ceed51214413da7587de24092e2d6a1ffa47608587cddf4c17
 MISC metadata.xml 230 SHA256 bd8560ab21232bace10a233ea24414dacb36c87e37a3a10cdeeded266cbb5c8d SHA512 3c7c9badebcc814572f1be89f2cdffaa81f795e3a44ae4f67bc7332927d332844a8a076b0f34d0e84b31db5abef654001cf1e6efff9628fa56a06786c082e6c0 WHIRLPOOL 57f9c4a65d7791075c8859af3cbbff141cc74e426102fefd15029bf1c63d3cf8a2c496eb4fc4f59570d0b84151a0d7a0feba0599827e932702ecfd5b8598563d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJ84uIACgkQKiQSS7ZY+hNqowD+NBwQoyO/dv0BPTZ4v9o9q85N
-zTfd0UNP8U+/cYW4eMkA/1uaRR2HiBiLykGQ74Sf8IhGFRvgwjYNQbewCZqUX2AH
-=clT0
+iF4EAREIAAYFAlK5o8sACgkQKiQSS7ZY+hPmJwEA7D5e7cfEHLjoLqzTJBXLDjYr
+KUJwP1OshAeqhIOF50ABAJgZb28tqgTZlKuoDlIiBBfmn3+2PU5x4y/la0u3Vnhm
+=C4l+
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
index f3fbaf861b9f..b1231a91f72e 100755
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
+++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3,v 1.1 2011/09/30 07:45:54 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3,v 1.2 2013/12/24 15:09:57 ultrabug Exp $
 
 depend() {
 	need net
@@ -18,6 +18,6 @@ start() {
 
 stop() {
 	ebegin "Stopping RabbitMQ"
-	/usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err
+	/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.2.2.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.2.2.ebuild
new file mode 100644
index 000000000000..9b917a8080cd
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.2.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 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.2.ebuild,v 1.1 2013/12/24 15:09:57 ultrabug Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils python-single-r1 systemd
+
+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
+}