fix install location wrt #399831; cleanup

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

7 files changed, 11 insertions, 288 deletions

diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog
index 1e6119863e99..4fe7d7bfe059 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.16 2012/04/07 08:10:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.17 2012/05/12 19:46:46 hollow Exp $
+
+  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)
 
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index f6e5bbf146a7..a4cc41b883cd 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,13 +1,6 @@
 AUX rabbitmq-script-wrapper 1844 RMD160 255586b0339a8200c63309eaefb952f67712eb0d SHA1 3b4f880d484541e749e3dd0d913adc6a21e4df23 SHA256 46783bc7466f48d8ddc785c5aac2b94d723c811106b6d8251adee170558f316e
-AUX rabbitmq-server.init-r2 639 RMD160 662f02bbab06237564d813bb2cd9f2eae8af96da SHA1 60834768b2a9419faec866b2e4d46de8f5c39153 SHA256 ab59f64ad7166a66454629f2e8a3c076f3f733ee361527d894ae31564ed0eaef
 AUX rabbitmq-server.init-r3 744 RMD160 eb810f5428ad16a3e2c143a84b9666abf49a535b SHA1 b2e6586dd21e8debbb8ff5e7cb8e59f1abf16626 SHA256 76aa4fe4578c31fe076d7c48770b63ad8836996352a981c6bba415e67e071b5c
-DIST rabbitmq-server-2.5.1.tar.gz 332560 RMD160 d2e2e5e2f0c88afceb5c56cda088340b6e624ad3 SHA1 25a14f4bb931b0772f0001b4b6e0c3e12d936593 SHA256 f5afeb8429508644738b68a158ed1f4a4dfc4bcbe1ebdab5ba818a75545e942f
-DIST rabbitmq-server-2.6.1.tar.gz 367491 RMD160 818cd8bfbf5593b0cdb4bd4a71d4b7124472f35c SHA1 628ec7453c0ee8ec3bad0780504e335b48f9b533 SHA256 0ab7b43a6b4cc5848242cdd4830b3c09018cfd920a2bfb00ebb89291c9cdd385
-DIST rabbitmq-server-2.7.9.tar.gz 2642742 RMD160 ae80ca62a171474b92bbbda7ce4b0fab83abc38d SHA1 fbd4dd68eba499725336cbbec1694e398f0cb763 SHA256 65cd16e9f14839a0b3f0eaba1aafe58e7ae425cf5d6fa479e1f5d16d305414b6
 DIST rabbitmq-server-2.8.1.tar.gz 2644402 RMD160 519fe864a36d27cf38a97479e621b15d9a8a6e5b SHA1 24f13c7a9b5d8daf57cb6844e06b605d934f7088 SHA256 b59f46d2cc4ce3427ba16e00cb9def7c51ca9f6b92473c6ae8fc43f6e4d60835
-EBUILD rabbitmq-server-2.5.1.ebuild 2254 RMD160 60884c8f8c7134447c06094472e44edd66e525ca SHA1 1711bad666fee11ebc9b213dc8730e6266b0d98a SHA256 5413c3e4f310830373ced5bb0e6bac18e951114433180a5ad36f21f9fbe68b99
-EBUILD rabbitmq-server-2.6.1.ebuild 2254 RMD160 d681a841a7466e6bde00230ad05f8b32a2a1be32 SHA1 86c65d1af14709b90ca302c24d04c60ffcb89529 SHA256 83f2bd1a5c13232c0016652fd06efcc36ff7f749dc1d6910cefc11023538cbf2
-EBUILD rabbitmq-server-2.7.9.ebuild 2413 RMD160 7b4bc90b13bf0d192b1ef21e18bb7a0cd2f266e5 SHA1 45680361c1983d54bd8da197b2d0652ad489b84d SHA256 0c2686eb3850bc6458e4b0afafe3b8c9c8fe6db96ecfd5e28b38c4be781d5c80
-EBUILD rabbitmq-server-2.8.1.ebuild 2414 RMD160 9c738d1731960688f9b3e2141aa0ce8101d351a6 SHA1 2f52c458e9259de74b96f274ecf8cf10c28ab9c6 SHA256 2a798b29f58b143f885ab5adf9f8be502f92e12b086737debc2470c62ebe5ba5
-MISC ChangeLog 3161 RMD160 a71bfe4a6893b21dd40a1f8fae26389d255fac7e SHA1 2968c4545c5ea1440fdfd1bcc3cf936bdb48352a SHA256 8d5d51939351aca1f6653f270ae342a7fc63df811e9f49dd92f81d08fe4cf57a
+EBUILD rabbitmq-server-2.8.1.ebuild 2389 RMD160 b90f9976e56e898043fa044673cbb05436cedfce SHA1 44e77691901bd1a586d8c9133c410660820676c4 SHA256 0e47e3392e2e655bec5486ec6b2a6cc64151e8f83d587e590ba492f03251f102
+MISC ChangeLog 3416 RMD160 d301d5f3795c7fb73bc81d695ff1edef6668e3b3 SHA1 cfc8d81ebd1aeb6f1ada67d26a7434548e9b5c92 SHA256 3ef14fc8f329724155c0b25efb1d9ccd055b65f2b27a83cdf64ee8b61c239552
 MISC metadata.xml 234 RMD160 cb149fcd7945b8906164cad81daf559757035cde SHA1 9bf4056cf71e3eb7153bb319e8bd24ede9a205b6 SHA256 9f3ea84c59dfbd2d2dd7f1e6f0b959540e27cc9caad4f77e6e76774ce98505a6
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2
deleted file mode 100644
index 34c632e1535a..000000000000
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 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-r2,v 1.2 2011/09/30 07:45:54 hollow Exp $
-
-depend() {
-	need net
-	use dns epmd
-}
-
-start() {
-	ebegin "Starting RabbitMQ"
-	setsid sh -c "/usr/sbin/rabbitmq-server >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err" &
-	/usr/sbin/rabbitmqctl wait &>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping RabbitMQ"
-	/usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err
-	eend $?
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-2.5.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.5.1.ebuild
deleted file mode 100644
index f393c08a3376..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.5.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 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.5.1.ebuild,v 1.2 2011/09/30 07:45:54 hollow Exp $
-
-EAPI="2"
-
-inherit eutils
-
-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="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}
-	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
-}
-
-src_compile() {
-	emake all docs_all || die "emake all failed"
-	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
-
-	einfo "Installing server scripts to /usr/sbin"
-	for script in rabbitmq-env rabbitmq-server rabbitmqctl; 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
-
-	# 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-r2 rabbitmq
-
-	# 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.6.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.6.1.ebuild
deleted file mode 100644
index 9f28367d4cfb..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.6.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 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.6.1.ebuild,v 1.1 2011/09/30 07:45:54 hollow Exp $
-
-EAPI="4"
-
-inherit eutils
-
-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="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}
-	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
-}
-
-src_compile() {
-	emake all docs_all || die "emake all failed"
-	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
-
-	einfo "Installing server scripts to /usr/sbin"
-	for script in rabbitmq-env rabbitmq-server rabbitmqctl; 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
-
-	# 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
-
-	# 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.7.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.7.9.ebuild
deleted file mode 100644
index a4cd1d94cbd3..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.7.9.ebuild
+++ /dev/null
@@ -1,88 +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.7.9.ebuild,v 1.2 2012/03/19 09:17:57 hollow Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-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="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)/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
-
-	# 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.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-2.8.1.ebuild
index 9d04171a2cc1..390ac4f8635e 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-2.8.1.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-2.8.1.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.ebuild,v 1.1 2012/04/07 08:10:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.8.1.ebuild,v 1.2 2012/05/12 19:46:46 hollow Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -40,7 +40,7 @@ src_compile() {
 
 src_install() {
 	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+	local targetdir="/usr/$(get_libdir)/rabbitmq"
 
 	einfo "Setting correct RABBITMQ_HOME in scripts"
 	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \