Bump sys-cluster/ganglia-3.1.1: adds blocker on dev-db/firebird for #247213, add automatic configuration for the diskusage metric.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-gentoo-r1 x86_64

5 files changed, 243 insertions, 5 deletions

diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog
index a2dcb9f52a53..b29c8b5f4661 100644
--- a/sys-cluster/ganglia/ChangeLog
+++ b/sys-cluster/ganglia/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/ganglia
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.18 2008/08/31 17:38:52 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.19 2008/11/19 17:04:28 jsbronder Exp $
+
+*ganglia-3.1.1 (19 Nov 2008)
+
+  19 Nov 2008; Justin Bronder <jsbronder@gentoo.org>
+  +files/ganglia-3.1.1-ctype-c99.patch,
+  +files/ganglia-3.1.1-multidisk-group.patch, +ganglia-3.1.1.ebuild:
+  Bump sys-cluster/ganglia-3.1.1: adds blocker on dev-db/firebird for #247213,
+  add automatic configuration for the diskusage metric.
 
   31 Aug 2008; Justin Bronder <jsbronder@gentoo.org>
   ganglia-3.1.0-r1.ebuild:
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index 4839885744bf..17ce3246358c 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -3,22 +3,26 @@ 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 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.0.7.tar.gz 2855110 RMD160 d9ab3b5ff0be20e5c682ff5e070f759dcf74f635 SHA1 ad3929532ca60883292ba4388876bdc0ba845a35 SHA256 1bf2c929efabc81f320854642766018c522680cb845e11a9329fb9b90c550d80
 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-r1.ebuild 1929 RMD160 d3705cfd952646528e6f3839b994ab2e03d6eec1 SHA1 add04b2bb3d8033ed63c18da577b2ea34aa5e6bb SHA256 0e3ad3c8742d07dc0ba4305b17818a4acb189ac78211d3ca89a4d57ec13a2776
 EBUILD ganglia-3.0.6.ebuild 1670 RMD160 484bd6f1791715ed2a53cb3ba5a2573f5e8a914d SHA1 a451b6df6038a415b612beccfce8aec67e82478c SHA256 f1eb7f602202c3ab97c33f5349007aa2bbc3daa4f567221601a487ec5b346645
 EBUILD ganglia-3.0.7.ebuild 1910 RMD160 9ca0ce32d5b9add2ded72f656ae4122503f9d260 SHA1 0822924e212f37092c79cea4642a102302136a21 SHA256 a7209cb20c2ee1688caefd192ad5e0fb0f8d7a8d2b2c41b826cb2191b4b833e3
 EBUILD ganglia-3.1.0-r1.ebuild 3519 RMD160 33ec8b38d2dd32219f6e796ed2f2e0023146f19c SHA1 e2d75374b44dffb7410ec9deb06c511aebd46a4c SHA256 4490c3568a708f83277e9b5967f82947ca4dd4ec75771d7b03c6d5dba2e14873
 EBUILD ganglia-3.1.0.ebuild 3447 RMD160 924080569a7215614281551c83309a21d99dd111 SHA1 79a9b7a2705443780d5891a6a95adc2cfad1e48f SHA256 1fdc551a709c355a23248b104296f1540039db0c193bd8e47a8ece5b68411fee
-MISC ChangeLog 4529 RMD160 343dee714759bb7ae32770e24c6e8320b1901be1 SHA1 44f72d7b554492ea0896de8f80425dbd95f0cd63 SHA256 1c3761a6ffcadf6ce08448e3fbf4833d5f3fd781667bb4079a094c42d42c704f
+EBUILD ganglia-3.1.1.ebuild 5190 RMD160 f866f7e46447d84b0386f5e313dd3ad5451300a2 SHA1 fe13b5c6e16b966a113ca3e00bbf01bd1337fe20 SHA256 53190bf30dab8ef931fc797b563a45a75c91f07f7aeefa0630ccf4c491ff2a64
+MISC ChangeLog 4857 RMD160 cd2dd620f9ab0b85574737a4c384beb8390faaac SHA1 88584acbfff344e48dc3edd30b37d6d56a98a739 SHA256 00738e20595e99aad9472c28dd616595b106288c00683b7f8872675bfbefe08e
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki61zsACgkQ4MrvBE1wQ8lZgACdHtegLC6aI9skq+xwurobrRfn
-bx4An1Ss2N0XHZTUS9kCoBWyAFYZTPyB
-=OJLR
+iEYEARECAAYFAkkkRyoACgkQ4MrvBE1wQ8kshQCdHC5iI3/OvkBYfBc2oDakKcnV
+WYQAoILsHBGPMJaZxonjQoOVX2g4Dayv
+=gDX9
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ganglia/files/ganglia-3.1.1-ctype-c99.patch b/sys-cluster/ganglia/files/ganglia-3.1.1-ctype-c99.patch
new file mode 100644
index 000000000000..e462de57a941
--- /dev/null
+++ b/sys-cluster/ganglia/files/ganglia-3.1.1-ctype-c99.patch
@@ -0,0 +1,13 @@
+diff -urN a/ganglia-3.1.1/libmetrics/linux/metrics.c b/ganglia-3.1.1/libmetrics/linux/metrics.c
+--- a/ganglia-3.1.1/libmetrics/linux/metrics.c	2008-08-25 13:44:57.000000000 -0400
++++ b/ganglia-3.1.1/libmetrics/linux/metrics.c	2008-11-18 21:33:01.370635031 -0500
+@@ -3,6 +3,9 @@
+ #ifndef __USE_GNU
+ #define __USE_GNU
+ #endif
++#ifndef __USE_ISOC99
++#define __USE_ISOC99
++#endif
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>
diff --git a/sys-cluster/ganglia/files/ganglia-3.1.1-multidisk-group.patch b/sys-cluster/ganglia/files/ganglia-3.1.1-multidisk-group.patch
new file mode 100644
index 000000000000..e908764131e1
--- /dev/null
+++ b/sys-cluster/ganglia/files/ganglia-3.1.1-multidisk-group.patch
@@ -0,0 +1,11 @@
+diff -urN a/ganglia-3.1.1/gmond/python_modules/disk/multidisk.py b/ganglia-3.1.1/gmond/python_modules/disk/multidisk.py
+--- a/ganglia-3.1.1/gmond/python_modules/disk/multidisk.py	2008-08-25 13:44:57.000000000 -0400
++++ b/ganglia-3.1.1/gmond/python_modules/disk/multidisk.py	2008-11-18 21:40:41.768077035 -0500
+@@ -92,6 +92,7 @@
+         'slope': slope,
+         'format': fmt,
+         'description': desc, 
++        'groups': 'disk',
+         'mount': line[1]}
+     return d
+     
diff --git a/sys-cluster/ganglia/ganglia-3.1.1.ebuild b/sys-cluster/ganglia/ganglia-3.1.1.ebuild
new file mode 100644
index 000000000000..48133228987b
--- /dev/null
+++ b/sys-cluster/ganglia/ganglia-3.1.1.ebuild
@@ -0,0 +1,202 @@
+# 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.1 2008/11/19 17:04:28 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 )
+	!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}
+}
+
+
+
+