Remove old versions.

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

3 files changed, 9 insertions, 207 deletions

diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog
index 4eec1cee84f4..3c74c1fc3d94 100644
--- a/sys-cluster/ganglia/ChangeLog
+++ b/sys-cluster/ganglia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/ganglia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.30 2009/06/20 16:02:50 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.31 2009/06/20 16:05:32 jsbronder Exp $
+
+  20 Jun 2009; Justin Bronder <jsbronder@gentoo.org>
+  -ganglia-3.1.1-r2.ebuild:
+  Remove old versions.
 
   20 Jun 2009; Justin Bronder <jsbronder@gentoo.org> ganglia-3.1.2.ebuild:
   Require php with pcre enabled when building the server. #273703.
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index 6de6b0c15980..b673a25c6969 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -6,16 +6,14 @@ AUX ganglia-3.1.1-multidisk-group.patch 482 RMD160 d46699b88fed699c8864b10ebb4ec
 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.1.1.tar.gz 1152883 RMD160 c4047d61f42f56d5328d10f39d52d5193636f36b SHA1 1209af0f67ca594e071d791ed110833141013693 SHA256 cc6955f0b086f40dc646e3d0d9f152854d1dcd19dea81b9bff16b38f3819f75c
 DIST ganglia-3.1.2.tar.gz 1213196 RMD160 1f78cf1019759e12c3c65901fd74ac65dfddf4e3 SHA1 be5db246eb755d8c450140d1c80afef4f1179fe1 SHA256 278f6fcf2299ceb8cacff999e54f96987e8d09064b1d43469108985bdeba6f12
-EBUILD ganglia-3.1.1-r2.ebuild 5343 RMD160 542b2772bf5f4adcefa7cfae05a147d2b9acc6ad SHA1 6baf7615c0cfb17cc47d870ae3f400c11bd60d05 SHA256 58becfa1090572a9a285b8de0d8e0b0e9948b6ce6072b7a02515eb93c9c94114
 EBUILD ganglia-3.1.2.ebuild 5368 RMD160 172cc7b710099163ffd3a513893f6ddf11c49a17 SHA1 a6f0fc97a87bb34bd434a0c80dc78006a719180a SHA256 95df198fe7365fcb645c1f438b807f2f653d8e49f95f285926ca48a6094614b1
-MISC ChangeLog 6732 RMD160 f54db16bc30d78bc38f1b6d86ae1274293862bae SHA1 f6beb56176cefc5c7e6639dcd5ee05efb42d45c4 SHA256 3e2cfa8b9191e57ee083901b2b7e98b45585af766d6151daeb7c018f0de83ced
+MISC ChangeLog 6837 RMD160 f1bb2d2b881ec3d693d188e91fc4675ae1fc0cf8 SHA1 b1be3de7131e8af100b813f8cb6b7fc9514f1340 SHA256 cd31587ac5d5d7ba2cbf11b86caa99791f3dff01af376af55e65a10debff7d46
 MISC metadata.xml 231 RMD160 37dd476ccaceaa37796cf29fd01af8fcfa2b4c61 SHA1 87cab1ccad4db7724c4292e4f32dd19accdcf2fa SHA256 b5305a12d2e3e9f9fdf645e98b0108c1bd8f5b5da32589a25bf7b0f0d74f1213
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko9CDUACgkQ4MrvBE1wQ8nNKACeKlstg8z9/uWoDuXVBWmSjZBW
-Im4An2GIo/v+aWgj4drgmkN1NTfySxl3
-=Fib/
+iEYEARECAAYFAko9CNEACgkQ4MrvBE1wQ8mu6QCfRmtUrL7FKBzQbQMiSvQjd6hr
+OhcAnj7RLTEkHRDnFLv6KMyeoUQRlIoM
+=LL0d
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ganglia/ganglia-3.1.1-r2.ebuild b/sys-cluster/ganglia/ganglia-3.1.1-r2.ebuild
deleted file mode 100644
index cd169302aa50..000000000000
--- a/sys-cluster/ganglia/ganglia-3.1.1-r2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2009 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-r2.ebuild,v 1.2 2009/01/21 22:16:30 maekke 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
-	# Shouldn't be needed for 3.1.2
-	# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=223
-	epatch "${FILESDIR}"/${P}-process_path-overflow-r1.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}
-}