Clean up old ebuilds/files.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

6 files changed, 7 insertions, 443 deletions

diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog
index 27358c205df9..ae6da3fb9b88 100644
--- a/sys-cluster/ganglia/ChangeLog
+++ b/sys-cluster/ganglia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/ganglia
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.23 2009/01/21 22:16:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.24 2009/02/21 20:24:19 jsbronder Exp $
+
+  21 Feb 2009; Justin Bronder <jsbronder@gentoo.org>
+  -files/ganglia-3.1.0-gmetad-hierarchical.patch,
+  -files/ganglia-3.1-gmond-python-tcpconn-concurrency.patch,
+  -ganglia-3.0.6.ebuild, -ganglia-3.1.0-r1.ebuild, -ganglia-3.1.1.ebuild:
+  Clean up old ebuilds/files.
 
   21 Jan 2009; Markus Meier <maekke@gentoo.org> ganglia-3.1.1-r2.ebuild:
   x86 stable, bug #255366
diff --git a/sys-cluster/ganglia/files/ganglia-3.1-gmond-python-tcpconn-concurrency.patch b/sys-cluster/ganglia/files/ganglia-3.1-gmond-python-tcpconn-concurrency.patch
deleted file mode 100644
index 2b1832b36128..000000000000
--- a/sys-cluster/ganglia/files/ganglia-3.1-gmond-python-tcpconn-concurrency.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: gmond/python_modules/network/tcpconn.py
-===================================================================
---- gmond/python_modules/network/tcpconn.py	(revision 1622)
-+++ gmond/python_modules/network/tcpconn.py	(working copy)
-@@ -245,19 +245,14 @@
-                 tempconns[conn] = 0
- 
-             #Call the netstat utility and split the output into separate lines
--            fd_poll = select.poll()
--            self.popenChild = popen2.Popen3("netstat -t -a")
--            fd_poll.register(self.popenChild.fromchild)
-+            self.popenChild = popen2.Popen3("netstat -t -a -n")
-+            lines = self.popenChild.fromchild.readlines()
- 
--            poll_events = fd_poll.poll()
--
--            if (len(poll_events) == 0):             # Timeout
--                continue
--
--            for (fd, events) in poll_events:
--                lines = self.popenChild.fromchild.readlines()
--
--            self.popenChild.wait()
-+            try:
-+                self.popenChild.wait()
-+            except OSError, e:
-+                if e.errno == 10: # No child process
-+                    continue
-             
-             #Iterate through the netstat output looking for the 'tcp' keyword in the tcp_at 
-             # position and the state information in the tcp_state_at position. Count each 
-@@ -300,7 +295,8 @@
-             _glock.release()
-             
-             #Wait for the refresh_rate period before collecting the netstat data again.
--            time.sleep(_refresh_rate)
-+            if not self.shuttingdown:
-+                time.sleep(_refresh_rate)
-             
-         #Set the current state of the thread after a shutdown has been indicated.
-         self.running = False
diff --git a/sys-cluster/ganglia/files/ganglia-3.1.0-gmetad-hierarchical.patch b/sys-cluster/ganglia/files/ganglia-3.1.0-gmetad-hierarchical.patch
deleted file mode 100644
index 1f367e6c7368..000000000000
--- a/sys-cluster/ganglia/files/ganglia-3.1.0-gmetad-hierarchical.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: gmetad/process_xml.c
-===================================================================
---- gmetad/process_xml.c	(revision 1634)
-+++ gmetad/process_xml.c	(working copy)
-@@ -724,7 +724,11 @@
-     
-     if (!xmldata->host_alive) 
-         return 0;
--    
-+
-+    /* Only keep extra element details if we are the authority on this cluster. */
-+    if (!authority_mode(xmldata))
-+       return 0;
-+
-     hashkey.data = (void*) name;
-     hashkey.size =  strlen(name) + 1;
-     
diff --git a/sys-cluster/ganglia/ganglia-3.0.6.ebuild b/sys-cluster/ganglia/ganglia-3.0.6.ebuild
deleted file mode 100644
index ad3dd6600be3..000000000000
--- a/sys-cluster/ganglia/ganglia-3.0.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.0.6.ebuild,v 1.2 2008/01/05 11:34:10 maekke Exp $
-
-DESCRIPTION="Ganglia is a scalable distributed monitoring system for high-performance computing systems such as clusters and grids"
-HOMEPAGE="http://ganglia.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ganglia/${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="test minimal"
-
-DEPEND="!minimal? ( net-analyzer/rrdtool )
-	test? ( >=dev-libs/check-0.8.2 )"
-RDEPEND="!minimal? ( net-analyzer/rrdtool )"
-
-src_compile() {
-	econf \
-		--enable-gexec \
-		$(use_with !minimal gmetad) || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto /etc
-	doman mans/{gmetric.1,gmond.1,gstat.1}
-	doman gmond/gmond.conf.5
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-	newinitd "${FILESDIR}"/gmond.rc gmond
-
-	if ! use minimal; then
-		doins gmetad/gmetad.conf
-		doman mans/gmetad.1
-		keepdir /var/lib/ganglia/rrds
-		fowners nobody:nobody /var/lib/ganglia/rrds
-		newinitd "${FILESDIR}"/gmetad.rc gmetad
-		insinto /usr/share/${PN}/
-		doins -r web
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "This package doesn't include a configuration file for gmond."
-	elog "You could generate a default template by running:"
-	elog "    /usr/sbin/gmond -t > /etc/gmond.conf"
-	elog "and customize it from there or provide your own."
-
-	if ! use minimal; then
-		elog
-		elog "All the files necessary for the PHP frontend have been installed"
-		elog "into ${ROOT}usr/share/${PN}/web/."
-	fi
-}
diff --git a/sys-cluster/ganglia/ganglia-3.1.0-r1.ebuild b/sys-cluster/ganglia/ganglia-3.1.0-r1.ebuild
deleted file mode 100644
index 8c221c0e091f..000000000000
--- a/sys-cluster/ganglia/ganglia-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.0-r1.ebuild,v 1.2 2008/08/31 17:38:52 jsbronder Exp $
-
-WEBAPP_OPTIONAL="yes"
-inherit multilib webapp depend.php python
-
-DESCRIPTION="A scalable distributed monitoring system for clusters and grids"
-HOMEPAGE="http://ganglia.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ganglia/${P}.tar.gz"
-LICENSE="BSD"
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="minimal vhosts python"
-
-DEPEND="
-	dev-libs/confuse
-	dev-libs/expat
-	>=dev-libs/apr-1.0
-	python? ( >=dev-lang/python-2.3 )"
-
-RDEPEND="
-	${DEPEND}
-	!minimal? ( net-analyzer/rrdtool
-		${WEBAPP_DEPEND}
-		=virtual/httpd-php-5* )"
-
-pkg_setup() {
-	if ! use minimal ; then
-		require_gd
-		require_php_with_use xml ctype
-		webapp_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/ganglia-3.1-gmond-python-tcpconn-concurrency.patch
-	epatch "${FILESDIR}"/${P}-gmetad-hierarchical.patch
-}
-
-src_compile() {
-	econf \
-		--enable-gexec \
-		$(use_enable python) \
-		$(use_with !minimal gmetad) || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/gmond.rc gmond
-	doman mans/{gmetric.1,gmond.1,gstat.1}
-	doman gmond/gmond.conf.5
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-	dodir /etc/ganglia/conf.d
-	gmond/gmond -t > "${D}"/etc/ganglia/gmond.conf
-
-	if use python; then
-		# Sadly, there is no install target for any of this.
-		mv gmond/modules/python/README "${T}"/README.python_modules
-		dodoc "${T}"/README.python_modules
-		insinto /etc/ganglia/conf.d
-		# multidisk/diskusage python metric skipped until fixed for gentoo
-		doins gmond/modules/conf.d/modpython.conf
-		doins gmond/python_modules/conf.d/tcpconn.pyconf
-		dodir /usr/$(get_libdir)/ganglia/python_modules
-		insinto /usr/$(get_libdir)/ganglia/python_modules
-		doins gmond/python_modules/network/tcpconn.py
-	fi
-
-	insinto /etc/ganglia
-	if ! use minimal; then
-		doins gmetad/gmetad.conf
-		doman mans/gmetad.1
-		keepdir /var/lib/ganglia/rrds
-		fowners nobody:nobody /var/lib/ganglia/rrds
-		newinitd "${FILESDIR}"/gmetad.rc gmetad
-
-		webapp_src_preinst
-		insinto "${MY_HTDOCSDIR}"
-		doins -r web/*
-
-		webapp_configfile "${MY_HTDOCSDIR}"/conf.php
-		webapp_src_install
-	fi
-}
-
-pkg_preinst() {
-	if has_version '<sys-cluster/ganglia-3.1.0'; then
-		elog "Previous ganglia installation detected."
-		elog "Copying gmetad configuration to /etc/ganglia"
-		elog "You may have to remove /etc/gmond.conf yourself."
-		mkdir -p "${D}"/etc/ganglia
-		[ -f "${ROOT}"etc/gmetad.conf ] \
-			&& cp "${ROOT}"etc/gmetad.conf "${D}"/etc/ganglia
-	fi
-}
-
-pkg_postinst() {
-	elog "A default configuration file for gmond has been generated"
-	elog "for you as a template by running:"
-	elog "    /usr/sbin/gmond -t > /etc/ganglia/gmond.conf"
-	elog "customize it from there or provide your own but be aware"
-	elog "the format has changed since 3.0 and so you won't be able"
-	elog "to use your current configuration (if you generated any)"
-	elog "in /etc/gmond.conf directly"
-
-	use minimal || webapp_pkg_postinst
-
-	use python && \
-		python_mod_optimize /usr/$(get_libdir)/ganglia/python_modules/
-}
-
-pkg_prerm() {
-	use minimal || webapp_pkg_prerm
-}
-
-pkg_postrm() {
-	use python && \
-		python_mod_cleanup /usr/$(get_libdir)/ganglia/python_modules/
-	[ -d /usr/$(get_libdir)/ganglia ] && \
-		rmdir /usr/$(get_libdir)/ganglia 2>/dev/null
-}
diff --git a/sys-cluster/ganglia/ganglia-3.1.1.ebuild b/sys-cluster/ganglia/ganglia-3.1.1.ebuild
deleted file mode 100644
index d2660c1a5412..000000000000
--- a/sys-cluster/ganglia/ganglia-3.1.1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.1.ebuild,v 1.2 2008/12/31 03:42:42 mr_bones_ Exp $
-
-WEBAPP_OPTIONAL="yes"
-inherit multilib webapp depend.php python
-
-DESCRIPTION="A scalable distributed monitoring system for clusters and grids"
-HOMEPAGE="http://ganglia.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ganglia/${P}.tar.gz"
-LICENSE="BSD"
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="minimal vhosts python"
-
-DEPEND="
-	dev-libs/confuse
-	dev-libs/expat
-	>=dev-libs/apr-1.0
-	python? ( >=dev-lang/python-2.3 )
-	!dev-db/firebird"
-
-RDEPEND="
-	${DEPEND}
-	!minimal? ( net-analyzer/rrdtool
-		${WEBAPP_DEPEND}
-		=virtual/httpd-php-5* )"
-
-pkg_setup() {
-	if ! use minimal ; then
-		require_gd
-		require_php_with_use xml ctype
-		webapp_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ctype-c99.patch
-	epatch "${FILESDIR}"/${P}-multidisk-group.patch
-}
-
-src_compile() {
-	econf \
-		--enable-gexec \
-		$(use_enable python) \
-		$(use_with !minimal gmetad) || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/gmond.rc gmond
-	doman mans/{gmetric.1,gmond.1,gstat.1}
-	doman gmond/gmond.conf.5
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-	dodir /etc/ganglia/conf.d
-	gmond/gmond -t > "${D}"/etc/ganglia/gmond.conf
-
-	# Sadly, there is no install target for any of this.
-	if use python; then
-		# We install the multidisk module, but not the configuration
-		# as this needs to be generated later.  See pkg_config
-		local gmond_py="disk/multidisk network/tcpconn"
-		local gmond_py_conf="tcpconn"
-		newdoc gmond/modules/python/README README.python_modules
-		insinto /etc/ganglia/conf.d
-		doins gmond/modules/conf.d/modpython.conf
-		for i in ${gmond_py_conf}; do
-			doins gmond/python_modules/conf.d/${i}.pyconf
-		done
-		dodir /usr/$(get_libdir)/ganglia/python_modules
-		insinto /usr/$(get_libdir)/ganglia/python_modules
-		for i in ${gmond_py}; do
-			doins gmond/python_modules/${i}.py
-		done
-
-	fi
-
-	insinto /etc/ganglia
-	if ! use minimal; then
-		doins gmetad/gmetad.conf
-		doman mans/gmetad.1
-		keepdir /var/lib/ganglia/rrds
-		fowners nobody:nobody /var/lib/ganglia/rrds
-		newinitd "${FILESDIR}"/gmetad.rc gmetad
-
-		webapp_src_preinst
-		insinto "${MY_HTDOCSDIR}"
-		doins -r web/*
-
-		webapp_configfile "${MY_HTDOCSDIR}"/conf.php
-		webapp_src_install
-	fi
-}
-
-pkg_preinst() {
-	if has_version '<sys-cluster/ganglia-3.1.0'; then
-		elog "Previous ganglia installation detected."
-		elog "Copying gmetad configuration to /etc/ganglia"
-		elog "You may have to remove /etc/gmond.conf yourself."
-		mkdir -p "${D}"/etc/ganglia
-		[ -f "${ROOT}"etc/gmetad.conf ] \
-			&& cp "${ROOT}"etc/gmetad.conf "${D}"/etc/ganglia
-	fi
-}
-
-pkg_postinst() {
-	elog "A default configuration file for gmond has been generated"
-	elog "for you as a template by running:"
-	elog "    /usr/sbin/gmond -t > /etc/ganglia/gmond.conf"
-	elog "customize it from there or provide your own but be aware"
-	elog "the format has changed since 3.0 and so you won't be able"
-	elog "to use your current configuration (if you generated any)"
-	elog "in /etc/gmond.conf directly"
-	elog
-	elog "If you require disk {usage,total} statistics, please run"
-	elog "    emerge --config ${PN}"
-	elog "then check ${ROOT}etc/ganglia/conf.d/diskusage.pyconf"
-	elog "for correctness."
-
-	use minimal || webapp_pkg_postinst
-
-	use python && \
-		python_mod_optimize /usr/$(get_libdir)/ganglia/python_modules/
-}
-
-pkg_prerm() {
-	use minimal || webapp_pkg_prerm
-}
-
-pkg_postrm() {
-	use python && \
-		python_mod_cleanup /usr/$(get_libdir)/ganglia/python_modules/
-	[ -d /usr/$(get_libdir)/ganglia ] && \
-		rmdir /usr/$(get_libdir)/ganglia 2>/dev/null
-}
-
-pkg_config() {
-	local disk_used_metrics disk_total_metrics i
-	local disk_pyconf="${ROOT}"etc/ganglia/conf.d/diskusage.pyconf
-
-	if ! use python; then
-		einfo "No configuration necessary :)"
-		exit 0
-	fi
-
-	if [ ! -w ${disk_pyconf} ]; then
-		eerror "Cannot write to ${disk_pyconf}"
-		exit 1
-	fi
-
-	ebegin "Generating disk used/total metric configuration to ${disk_pyconf}"
-	disk_used_metrics=$(${ROOT}/usr/sbin/gmond -m | awk '/-disk_used/{print $1}')
-	disk_total_metrics=$(${ROOT}/usr/sbin/gmond -m | awk '/-disk_total/{print $1}')
-	cat > ${disk_pyconf} <<-EOF
-		#/* Disk usage collection groups for
-		#    multidisk python module */
-		#
-		# Autogenerated by pkg_config in the Gentoo ganglia ebuild.
-
-		modules {
-		  module {
-		    name = "multidisk"
-		    language = "python"
-		  }
-		}
-
-		collection_group {
-		  collect_every = 10
-		  time_threshold = 50
-	EOF
-	for i in ${disk_used_metrics}; do
-		printf \
-			"\n  metric {\n    name = \"%s\"\n    value_threshold = 1.0\n  }" \
-			${i} >> ${disk_pyconf}
-	done
-	printf "\n}\n\n" >> ${disk_pyconf}
-
-	# Get the disk total metrics.
-	cat >> ${disk_pyconf} <<-EOF
-		collection_group {
-		  collect_once = yes
-		  time_threshold = 20
-	EOF
-	for i in ${disk_total_metrics}; do
-		printf \
-			"\n  metric {\n    name = \"%s\"\n  }" \
-			${i} >> ${disk_pyconf}
-	done
-	printf "\n}\n" >> ${disk_pyconf}
-}