cleanup

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4D7043C9)

3 files changed, 5 insertions, 187 deletions

diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog
index 4bd64327427e..b6b726966129 100644
--- a/sys-cluster/ganglia/ChangeLog
+++ b/sys-cluster/ganglia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/ganglia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.63 2014/12/30 17:34:23 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.64 2014/12/30 17:37:54 jsbronder Exp $
+
+  30 Dec 2014; Justin Bronder <jsbronder@gentoo.org> -ganglia-3.3.7.ebuild,
+  -ganglia-3.6.0.ebuild:
+  cleanup
 
   30 Dec 2014; Justin Bronder <jsbronder@gentoo.org> ganglia-3.6.0-r1.ebuild:
   Unconditionally disable systemd unit building until the make rule is fixed
diff --git a/sys-cluster/ganglia/ganglia-3.3.7.ebuild b/sys-cluster/ganglia/ganglia-3.3.7.ebuild
deleted file mode 100644
index 058b0400e42a..000000000000
--- a/sys-cluster/ganglia/ganglia-3.3.7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.3.7.ebuild,v 1.6 2012/09/22 13:48:56 blueness Exp $
-
-EAPI="3"
-WEBAPP_OPTIONAL="yes"
-
-PYTHON_DEPEND="python? 2"
-
-inherit eutils multilib 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"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="minimal pcre python examples"
-
-DEPEND="dev-libs/confuse
-	dev-libs/expat
-	>=dev-libs/apr-1.0
-	!dev-db/firebird
-	pcre? ( dev-libs/libpcre )"
-
-RDEPEND="
-	${DEPEND}
-	!minimal? ( net-analyzer/rrdtool )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Disable modpython by default (#358359)
-	sed -i '/ *params/N;s,\( *\)\(params = "[^"]*"\),\1\2\n\1enabled = no,' \
-		gmond/modules/conf.d/modpython.conf.in || die
-}
-
-src_configure() {
-	econf \
-		--enable-gexec \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--enable-static=no \
-		$(use_enable python) \
-		$(use_with pcre libpcre) \
-		$(use_with !minimal gmetad)
-}
-
-src_install() {
-	local exdir=/usr/share/doc/${P}
-
-	emake DESTDIR="${D}" install || die
-
-	newinitd "${FILESDIR}"/gmond.rc-2 gmond
-	doman {mans/*.1,gmond/*.5} || die "Failed to install manpages"
-	dodoc AUTHORS INSTALL NEWS README || die
-
-	dodir /etc/ganglia/conf.d
-	use python && dodir /usr/$(get_libdir)/ganglia/python_modules
-	gmond/gmond -t > "${ED}"/etc/ganglia/gmond.conf
-
-	if use examples; then
-		insinto ${exdir}/cmod-examples
-		doins gmond/modules/example/*.c
-		if use python; then
-			# Installing as an examples per upstream.
-			insinto ${exdir}/pymod-examples
-			doins gmond/python_modules/*/*.py
-			insinto ${exdir}/pymod-examples/conf.d
-			doins gmond/python_modules/conf.d/*.pyconf
-		fi
-	fi
-
-	if ! use minimal; then
-		insinto /etc/ganglia
-		doins gmetad/gmetad.conf
-		doman mans/gmetad.1
-
-		newinitd "${FILESDIR}"/gmetad.rc-2 gmetad
-		keepdir /var/lib/ganglia/rrds
-		fowners nobody:nobody /var/lib/ganglia/rrds
-	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 "The web frontend for Ganglia has been split off.  Emerge"
-	elog "sys-cluster/ganglia-web if you need it."
-}
diff --git a/sys-cluster/ganglia/ganglia-3.6.0.ebuild b/sys-cluster/ganglia/ganglia-3.6.0.ebuild
deleted file mode 100644
index d30951f67c21..000000000000
--- a/sys-cluster/ganglia/ganglia-3.6.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.6.0.ebuild,v 1.1 2013/06/22 01:04:28 jsbronder Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-
-inherit eutils multilib 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"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="minimal pcre python examples"
-
-DEPEND="dev-libs/confuse
-	dev-libs/expat
-	>=dev-libs/apr-1.0
-	!dev-db/firebird
-	pcre? ( dev-libs/libpcre )"
-
-RDEPEND="
-	${DEPEND}
-	!minimal? ( net-analyzer/rrdtool )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-gexec \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--enable-static=no \
-		$(use_enable python) \
-		$(use_with pcre libpcre) \
-		$(use_with !minimal gmetad)
-}
-
-src_install() {
-	local exdir=/usr/share/doc/${P}
-
-	emake DESTDIR="${D}" install || die
-
-	newinitd "${FILESDIR}"/gmond.rc-2 gmond
-	doman {mans/*.1,gmond/*.5} || die "Failed to install manpages"
-	dodoc AUTHORS INSTALL NEWS README || die
-
-	dodir /etc/ganglia/conf.d
-	use python && dodir /usr/$(get_libdir)/ganglia/python_modules
-	gmond/gmond -t > "${ED}"/etc/ganglia/gmond.conf
-
-	if use examples; then
-		insinto ${exdir}/cmod-examples
-		doins gmond/modules/example/*.c
-		if use python; then
-			# Installing as an examples per upstream.
-			insinto ${exdir}/pymod-examples
-			doins gmond/python_modules/*/*.py
-			insinto ${exdir}/pymod-examples/conf.d
-			doins gmond/python_modules/conf.d/*.pyconf
-		fi
-	fi
-
-	if ! use minimal; then
-		insinto /etc/ganglia
-		doins gmetad/gmetad.conf
-		doman mans/gmetad.1
-
-		newinitd "${FILESDIR}"/gmetad.rc-2 gmetad
-		keepdir /var/lib/ganglia/rrds
-		fowners nobody:nobody /var/lib/ganglia/rrds
-	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 "The web frontend for Ganglia has been split off.  Emerge"
-	elog "sys-cluster/ganglia-web if you need it."
-}