Version bump, handle setup for dwoo

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

3 files changed, 144 insertions, 2 deletions

diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog
index e0ac02c1b357..5fbff3a60cd8 100644
--- a/sys-cluster/ganglia/ChangeLog
+++ b/sys-cluster/ganglia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/ganglia
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.44 2011/06/23 20:16:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.45 2011/09/27 02:13:53 jsbronder Exp $
+
+*ganglia-3.2.0 (27 Sep 2011)
+
+  27 Sep 2011; Justin Bronder <jsbronder@gentoo.org> +ganglia-3.2.0.ebuild:
+  Version bump, handle setup for dwoo
 
   23 Jun 2011; Brent Baude <ranger@gentoo.org> ganglia-3.1.7-r2.ebuild:
   Marking ganglia-3.1.7-r2 ppc for bug 366679
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index dda5f6dfdc93..0c23a4efad93 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 ganglia-3.1.1-process_path-overflow-r1.patch 1364 RMD160 0f04fa5f9cfeae7261352d3d4fab631b0b0283d0 SHA1 5f1a302d40c06ad8af199c09e9e16eda4354b996 SHA256 aedce482577f8a5941e54d8392e223b546c3c69790699b0ee0c9c2e4b5500c46
@@ -7,8 +10,17 @@ AUX gmond.rc 345 RMD160 076613bff272ddb1e8e192805edad009e00f2af4 SHA1 bc57ed84f0
 AUX gmond.rc-2 472 RMD160 ff0f7e7c7a18b2dac3181e87224dc88a19c95015 SHA1 53661f78be1033f7b077dc795e2e4da47748bc71 SHA256 27327531dbae7299efd1afeee61cb2d17a3a1ec999896e1589d5ca89692ab251
 DIST ganglia-3.1.2.tar.gz 1213196 RMD160 1f78cf1019759e12c3c65901fd74ac65dfddf4e3 SHA1 be5db246eb755d8c450140d1c80afef4f1179fe1 SHA256 278f6fcf2299ceb8cacff999e54f96987e8d09064b1d43469108985bdeba6f12
 DIST ganglia-3.1.7.tar.gz 1278023 RMD160 918d678ad234d477fc98427d96485a8111c64f06 SHA1 e234d64814af1c9f55f1cd039a5840039d175f85 SHA256 bb1a4953d72e7dace76010a30d6d332e4ac0991d1371dbbcbcc7b048e0a7e4bf
+DIST ganglia-3.2.0.tar.gz 1366106 RMD160 7b2f646d8ad4582cfb1ec48d192dd9bdbb526323 SHA1 6ff0e87b96d891bd0c057e75d5fc2bc752e68cd1 SHA256 9867153c550a65099544fae82ff3514e4ae8b172a360e4b5320e269eb32dae48
 EBUILD ganglia-3.1.2.ebuild 5443 RMD160 7d197d8e757da5f59f407f308cb6c913436a6684 SHA1 9e79e653bbc172900a5ba82e002308fb4bedd5ca SHA256 25ddc5a87a7908cde9448db3f391877c8eec074ca552127d550fc5f071025d92
 EBUILD ganglia-3.1.7-r2.ebuild 2935 RMD160 c68b81e59b00e5e5ada8ae77c545a34c619a2b57 SHA1 b78d72131c642e639c9535e5fe54692ee510cab3 SHA256 d08f504593e28140b75b6918bc450c6f97a321a53ca9226a9b77d68c67cadd17
 EBUILD ganglia-3.1.7-r3.ebuild 2957 RMD160 11213948efc293de5155b80795313717d8b825e6 SHA1 df232d38342fa8f35569a937cbd41c6ec329ac64 SHA256 b489571dd887d20a1c18f35fbd13473d46114ba70a9854bfdc61f362f6c9db6b
-MISC ChangeLog 9190 RMD160 75eb77f3cb36b3061cbb3c8c6d24b6cca449f782 SHA1 0edeb89f7ecb3e8f067ee33c95fc2f80ac9f478b SHA256 58b0d05a30fdb52ce40a8d8095cb7161b302e3ba5191f5027d52b567111f645f
+EBUILD ganglia-3.2.0.ebuild 3217 RMD160 552b5164ac6fb04dcd3ebd16e9edfbe336307f86 SHA1 b4aaa4f90ee5ccd93274e68645fba659415f7502 SHA256 378194f4910c073f9f32b22bc7ad21864b800a17bf483469cd55da1452994a37
+MISC ChangeLog 9338 RMD160 706aacd5fd349c27fb4c68c6821220905f23df11 SHA1 9a3fe1b880591d7bf236e0335e32e9d63d190bd8 SHA256 29c2966072fd43c0221b8d956887cf5e47497b1439895eccfe1b0e0a354fbae8
 MISC metadata.xml 228 RMD160 8ddf3216a262f6e40c2c34d0bea65840e6b68360 SHA1 3957acb3b9d8e76b497d00cc8769a39b4d822bd0 SHA256 867e2c9cf08802c1ae7c8a1e84fafa792a531488dc15c7e8efd5596b33465d30
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk6BMXQACgkQ4MrvBE1wQ8mXbwCeMK8jT2EVvhVxHWHiP/hJqvM6
+e/wAn3rC8pkN/l/hnGB35Z9N8G+c1DzV
+=wv5z
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/ganglia/ganglia-3.2.0.ebuild b/sys-cluster/ganglia/ganglia-3.2.0.ebuild
new file mode 100644
index 000000000000..b48269882274
--- /dev/null
+++ b/sys-cluster/ganglia/ganglia-3.2.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.2.0.ebuild,v 1.1 2011/09/27 02:13:53 jsbronder Exp $
+
+EAPI="3"
+WEBAPP_OPTIONAL="yes"
+
+PYTHON_DEPEND="python? 2"
+WEBAPP_MANUAL_SLOT="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"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="minimal vhosts 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
+		${WEBAPP_DEPEND}
+		dev-lang/php[gd,xml,ctype,cgi]
+		|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
+		media-fonts/dejavu
+	)"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+	use minimal || webapp_pkg_setup
+}
+
+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} \
+		$(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 STATUS || 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
+		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-2 gmetad
+		keepdir /var/lib/ganglia/rrds
+		fowners nobody:nobody /var/lib/ganglia/rrds
+
+		keepdir /var/lib/ganglia/dwoo
+		fowners nobody:nobody /var/lib/ganglia/dwoo
+		fperms 777 /var/lib/ganglia/dwoo
+	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"
+
+	local dwoo_stat=$(stat --format %U:%G:%a ${ROOT}var/lib/ganglia/dwoo)
+	if [[ ${dwoo_stat} == nobody:nobody:777 ]]; then
+		elog
+		elog "${ROOT}var/lib/ganglia/dwoo is owned by nobody:nobody with permissions 777"
+		elog "You may wish to change this to only be writable by the webserver user"
+		elog
+	fi
+	use minimal || webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	use minimal || webapp_pkg_prerm
+}