Clean up old ebuilds/files.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

7 files changed, 11 insertions, 454 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/Manifest b/sys-cluster/ganglia/Manifest
index 371f76791472..8b4007450fd4 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,26 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ganglia-3.1-gmond-python-tcpconn-concurrency.patch 1714 RMD160 fa0b5602420ff96743cdce0252d4091700855cc1 SHA1 f75b60c84ed11052e960dd7ebad98d34c30a7aa2 SHA256 068429c839ddddcf8a1d149ba1bd7eea8938c765a2673e9b3875df9cb88bcfb3
-AUX ganglia-3.1.0-gmetad-hierarchical.patch 481 RMD160 a5293da532de60ca4d1c80538cffa1b0c435955f SHA1 6dd26d86eccc6798fd0f53eb1f29de1d6410022b SHA256 e87656c3e89fba7dd17920274aba0e3d19dae6c2d6b90fb49256e45b6ab93d0e
 AUX ganglia-3.1.1-ctype-c99.patch 437 RMD160 19083e2102e7ed73725f9800d73e655b84c58dd8 SHA1 bb56f766c475c5d6e23259673e85311887c39c5e SHA256 385397d0e6b3810f19fe420fbb7db70ab9978089fe8388eed2ea6a8d8deafcf8
 AUX ganglia-3.1.1-multidisk-group.patch 482 RMD160 d46699b88fed699c8864b10ebb4eca0a06965a0f SHA1 f942d0427469b9acb51e8eb38de18cdaf80f4b51 SHA256 fd4f3a3798cc99cd0bd93eb238d6c7f381b65c8329852b5a9fa07005c85a6639
 AUX ganglia-3.1.1-process_path-overflow-r1.patch 1364 RMD160 0f04fa5f9cfeae7261352d3d4fab631b0b0283d0 SHA1 5f1a302d40c06ad8af199c09e9e16eda4354b996 SHA256 aedce482577f8a5941e54d8392e223b546c3c69790699b0ee0c9c2e4b5500c46
 AUX gmetad.rc 328 RMD160 bfe287d90db7f26cd13978c99eabc6f7783b7073 SHA1 73d49ca4f669d914c87e2cdd9a4ad74bf1a75eb5 SHA256 c25c3dac00012f83e45819d6d0fb79bcf4e1ec773ad705b38127aade7c2a08c7
 AUX gmond.rc 322 RMD160 98ac6011a603e3286ffe5c2368620ae0630a013f SHA1 d304b1849ea1abf14360915b3978e781b8e0cbed SHA256 ea3bd50fe4bfc18254fdfb69c81ec0bfad0c552a2f9a3d3aee4732f644695d7d
-DIST ganglia-3.0.6.tar.gz 2854746 RMD160 ef3b29af23bc3e30b58736e0e6c08f4047b6eb70 SHA1 5dd3cc3fe2eade8ae012bbafd65e40a7d29bc995 SHA256 590c0c5e1b7b7a27cc1234093cf8caaac6b000f8035d9985459aaa7dcf2c2cb5
-DIST ganglia-3.1.0.tar.gz 1175129 RMD160 92fee8fc2ffe6d058be2dc73bba6697dc2a226db SHA1 00b8901d2ff253564ef4a46918c1e28ea65e506a SHA256 87e367bd8de0d1ca87a7bc16477f99900b7e0dd87db7485aeb4f2e5766576b90
 DIST ganglia-3.1.1.tar.gz 1152883 RMD160 c4047d61f42f56d5328d10f39d52d5193636f36b SHA1 1209af0f67ca594e071d791ed110833141013693 SHA256 cc6955f0b086f40dc646e3d0d9f152854d1dcd19dea81b9bff16b38f3819f75c
-EBUILD ganglia-3.0.6.ebuild 1670 RMD160 484bd6f1791715ed2a53cb3ba5a2573f5e8a914d SHA1 a451b6df6038a415b612beccfce8aec67e82478c SHA256 f1eb7f602202c3ab97c33f5349007aa2bbc3daa4f567221601a487ec5b346645
-EBUILD ganglia-3.1.0-r1.ebuild 3519 RMD160 33ec8b38d2dd32219f6e796ed2f2e0023146f19c SHA1 e2d75374b44dffb7410ec9deb06c511aebd46a4c SHA256 4490c3568a708f83277e9b5967f82947ca4dd4ec75771d7b03c6d5dba2e14873
 EBUILD ganglia-3.1.1-r2.ebuild 5343 RMD160 542b2772bf5f4adcefa7cfae05a147d2b9acc6ad SHA1 6baf7615c0cfb17cc47d870ae3f400c11bd60d05 SHA256 58becfa1090572a9a285b8de0d8e0b0e9948b6ce6072b7a02515eb93c9c94114
-EBUILD ganglia-3.1.1.ebuild 5184 RMD160 255425aa44cc380876b0093f521a6b5f46208aa8 SHA1 61f86df52a3b7aa2288ba9d1d5248bd5cbd4f9dd SHA256 2707ceea40304ac02595348d8a37d97634e047df9c9c3a293c7a2356e64799cf
-MISC ChangeLog 5734 RMD160 276d54f456787d5c9d28929d19b9864b70ad6e55 SHA1 0b50307f10ae9857413a08d967b8b51bec1cae55 SHA256 61cd7d463e7aa96a849603a7a6509f41dba9f67d2ee70c16b5e65a34f2c4aa45
+MISC ChangeLog 6006 RMD160 96ebf43dfd246419fd574a726514db5cb323be97 SHA1 6e7a8ba97a64f0ded3c462b8dc126eba8a668b74 SHA256 b1ddb24333fc0d3136c48092d953f079bd0e5c711ed68319af1b06eea4999a04
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkl3nsoACgkQkKaRLQcq0GL/6QCeP/JYzeDqGLJpazz+uTN4+0ZR
-pjMAnjnq7mIHG3Y5NnziW70oP4tRp45A
-=Q+C+
+iEYEARECAAYFAkmgYv0ACgkQ4MrvBE1wQ8lE9QCfYvE8/rYs6HcJMe5hA2NdENgZ
+atgAnjU0KQeUgiN0F6Vzlu3rIsXhZHjN
+=LIdx
 -----END PGP SIGNATURE-----
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}
-}