Version bump, thanks to Carlo Marcelo Arenas Belon for help with the ebuild. #233440

Package-Manager: portage-2.1.4.4

4 files changed, 191 insertions, 2 deletions

diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog
index a3e5baebb36d..6f2b365c0183 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.15 2008/03/28 19:36:17 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.16 2008/08/04 23:17:11 jsbronder Exp $
+
+*ganglia-3.1.0 (04 Aug 2008)
+
+  04 Aug 2008; Justin Bronder <jsbronder@gentoo.org>
+  +files/ganglia-3.1-gmond-python-tcpconn-concurrency.patch,
+  +ganglia-3.1.0.ebuild:
+  Version bump, thanks to Carlo Marcelo Arenas Belon for help with the ebuild.
+  #233440
 
   28 Mar 2008; Justin Bronder <jsbronder@gentoo.org> ganglia-3.0.7.ebuild:
   Correctly depend on httpd-php-5 without breaking the cache.
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index e528a65f7540..81aabaabed2f 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ganglia-3.1-gmond-python-tcpconn-concurrency.patch 1714 RMD160 fa0b5602420ff96743cdce0252d4091700855cc1 SHA1 f75b60c84ed11052e960dd7ebad98d34c30a7aa2 SHA256 068429c839ddddcf8a1d149ba1bd7eea8938c765a2673e9b3875df9cb88bcfb3
 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
 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
-MISC ChangeLog 3755 RMD160 7ba292c262fca704849e8eaa357a4f5e5249c26d SHA1 d1830daf525ed105f8ea751709626a87b09ae9d5 SHA256 e8089bf2bbc2cd3996d5b1339fac8d45488e3380b4308ed7f67bfd4849f75b23
+EBUILD ganglia-3.1.0.ebuild 3447 RMD160 924080569a7215614281551c83309a21d99dd111 SHA1 79a9b7a2705443780d5891a6a95adc2cfad1e48f SHA256 1fdc551a709c355a23248b104296f1540039db0c193bd8e47a8ece5b68411fee
+MISC ChangeLog 4014 RMD160 253c1663f016ec0b35359a2b2186a7768ced6003 SHA1 51dc399f27cf23b69bbac992a108804e7bbc2456 SHA256 230f6b440b085a5aa48a203f762f57b3314376faace2f4826e8047f91fae7bf4
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiXjOoACgkQ4MrvBE1wQ8mgNgCgqqwpPHuMUNCd44DL2k6jTnlI
+lNoAniyukYJDpt0lxbsUEZJ3pGW2qJ+e
+=fGbf
+-----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
new file mode 100644
index 000000000000..2b1832b36128
--- /dev/null
+++ b/sys-cluster/ganglia/files/ganglia-3.1-gmond-python-tcpconn-concurrency.patch
@@ -0,0 +1,41 @@
+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/ganglia-3.1.0.ebuild b/sys-cluster/ganglia/ganglia-3.1.0.ebuild
new file mode 100644
index 000000000000..803e80b00ea3
--- /dev/null
+++ b/sys-cluster/ganglia/ganglia-3.1.0.ebuild
@@ -0,0 +1,127 @@
+# 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.ebuild,v 1.1 2008/08/04 23:17:11 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
+}
+
+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
+}