version bump, drop old

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

5 files changed, 12 insertions, 285 deletions

diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog
index 8af34929a392..93a9572cf78e 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.26 2013/03/15 16:42:39 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.27 2013/05/21 07:31:10 ultrabug Exp $
+
+*rabbitmq-server-3.1.0 (21 May 2013)
+
+  21 May 2013; Ultrabug <ultrabug@gentoo.org> -rabbitmq-server-2.8.4.ebuild,
+  -rabbitmq-server-2.8.5.ebuild, -rabbitmq-server-2.8.6.ebuild,
+  -rabbitmq-server-3.0.1.ebuild, +rabbitmq-server-3.1.0.ebuild:
+  Version bump, drop old
 
 *rabbitmq-server-3.0.4 (15 Mar 2013)
 
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild
deleted file mode 100644
index a0c8377bf5c5..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.8.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.2 2012/09/03 16:00:40 ultrabug Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils python 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_set_active_version 2
-	python_pkg_setup
-}
-
-src_compile() {
-	emake all docs_all || die "emake all failed"
-	gunzip docs/*.gz
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/rabbitmq"
-
-	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
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild
deleted file mode 100644
index 47c6132370ff..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.8.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.2 2012/09/03 16:00:40 ultrabug Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils python 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_set_active_version 2
-	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
-	gunzip docs/*.gz
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/rabbitmq"
-
-	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
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.8.6.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.8.6.ebuild
deleted file mode 100644
index e1a724555301..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.8.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.6.ebuild,v 1.1 2012/09/03 16:00:40 ultrabug Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils python 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_set_active_version 2
-	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
-	gunzip docs/*.gz
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/rabbitmq"
-
-	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
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.0.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.1.0.ebuild
index c6831a1aeb19..fc475e1be2eb 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.0.1.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.1.0.ebuild
@@ -1,11 +1,13 @@
 # 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.0.1.ebuild,v 1.1 2013/01/11 15:05:23 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.1.0.ebuild,v 1.1 2013/05/21 07:31:10 ultrabug Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2"
 
-inherit eutils python systemd
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit eutils python-r1 systemd
 
 DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang."
 HOMEPAGE="http://www.rabbitmq.com/"
@@ -29,7 +31,6 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	enewgroup rabbitmq
 	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python_set_active_version 2
 }
 
 src_compile() {