public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-cluster/ganglia: ChangeLog ganglia-3.1.7.ebuild
@ 2010-04-23  3:50 Justin Bronder (jsbronder)
  0 siblings, 0 replies; only message in thread
From: Justin Bronder (jsbronder) @ 2010-04-23  3:50 UTC (permalink / raw
  To: gentoo-commits

jsbronder    10/04/23 03:50:43

  Modified:             ChangeLog
  Added:                ganglia-3.1.7.ebuild
  Log:
  Version and EAPI bump, add support for prefix. Remove warning for older versions of ganglia that are no longer in the tree.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.35                 sys-cluster/ganglia/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/ganglia/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/ganglia/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/ganglia/ChangeLog?r1=1.34&r2=1.35

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog	9 Jan 2010 18:37:03 -0000	1.34
+++ ChangeLog	23 Apr 2010 03:50:43 -0000	1.35
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/ganglia
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.34 2010/01/09 18:37:03 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.35 2010/04/23 03:50:43 jsbronder Exp $
+
+*ganglia-3.1.7 (23 Apr 2010)
+
+  23 Apr 2010; Justin Bronder <jsbronder@gentoo.org> +ganglia-3.1.7.ebuild:
+  Version and EAPI bump, add support for prefix. Remove warning for older
+  versions of ganglia that are no longer in the tree.
 
 *ganglia-3.1.2-r1 (09 Jan 2010)
 



1.1                  sys-cluster/ganglia/ganglia-3.1.7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7.ebuild?rev=1.1&content-type=text/plain

Index: ganglia-3.1.7.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7.ebuild,v 1.1 2010/04/23 03:50:43 jsbronder Exp $

EAPI="3"
WEBAPP_OPTIONAL="yes"
inherit eutils multilib webapp 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}
		dev-lang/php[gd,xml,ctype,pcre,cgi]
		media-fonts/dejavu
	)"

pkg_setup() {
	use minimal || webapp_pkg_setup
}

src_prepare() {
	# This patch just gives a group to the disk statistics.
	# I.E. it's just cosmetics
	epatch "${FILESDIR}"/${PN}-3.1.1-multidisk-group.patch
}

src_configure() {
	econf \
		--enable-gexec \
		--sysconfdir="${EPREFIX}"/etc/${PN} \
		$(use_enable python) \
		$(use_with !minimal gmetad) || die "econf failed"
}

src_install() {
	emake DESTDIR="${D}" install || die "emake install failed"

	newinitd "${FILESDIR}"/gmond.rc gmond
	doman {mans/*.1,gmond/*.5} || die "Failed to install manpages"
	dodoc AUTHORS ChangeLog INSTALL NEWS README || die

	dodir /etc/ganglia/conf.d
	gmond/gmond -t > "${ED}"/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

	if ! use minimal; then
		webapp_src_preinst
		insinto "${MY_HTDOCSDIR}"
		doins -r web/*
		webapp_configfile "${MY_HTDOCSDIR}"/conf.php
		webapp_src_install

		# webapp_src_install stomps on permissions, so do that
		# stuff first.
		insinto /etc/ganglia
		doins gmetad/gmetad.conf
		doman mans/gmetad.1

		newinitd "${FILESDIR}"/gmetad.rc 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 "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 "${ROOT}"/usr/$(get_libdir)/ganglia ] && \
		rmdir "${ROOT}"/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}
}






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-04-23  3:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-23  3:50 [gentoo-commits] gentoo-x86 commit in sys-cluster/ganglia: ChangeLog ganglia-3.1.7.ebuild Justin Bronder (jsbronder)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox