fix #546812, version bump, drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

5 files changed, 45 insertions, 127 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/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
 }