Fix bug #212304

Package-Manager: portage-2.1.4.4

4 files changed, 88 insertions, 3 deletions

diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog
index 1b913be09c66..df8492dfdf71 100644
--- a/sys-cluster/ganglia/ChangeLog
+++ b/sys-cluster/ganglia/ChangeLog
@@ -1,6 +1,12 @@
 # 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.12 2008/01/31 06:46:49 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.13 2008/03/07 01:59:55 jsbronder Exp $
+
+*ganglia-3.0.6-r1 (07 Mar 2008)
+
+  07 Mar 2008; Justin Bronder <jsbronder@gentoo.org>
+  +ganglia-3.0.6-r1.ebuild:
+  Fix bug #212304, thanks to jakub for the initial patch.
 
   31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   -ganglia-2.5.7.ebuild, -ganglia-3.0.1.ebuild, -ganglia-3.0.2.ebuild,
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index 2051a5bf7bde..8d008ff9bb18 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,6 +1,7 @@
 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
+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
-MISC ChangeLog 3309 RMD160 a7c9131aa06637c54cdc99c90e23beb56c4056fe SHA1 a1dc09559a4bc66122a2855a21695da97558f993 SHA256 e5c570dcb07dc9040c4399851c43652fa25944d5e74e7eb42be517071fef554a
+MISC ChangeLog 3482 RMD160 812a1ddc33cb1fc123830a6dc3289826df0b912a SHA1 f8a91b6596fd0056e9d5be3c0f42a71119d99f03 SHA256 8816733e79905489497855c4ca8afdec2657f67cc6c8a5d13797745581fc968d
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
diff --git a/sys-cluster/ganglia/ganglia-3.0.6-r1.ebuild b/sys-cluster/ganglia/ganglia-3.0.6-r1.ebuild
new file mode 100644
index 000000000000..244a5a85f45f
--- /dev/null
+++ b/sys-cluster/ganglia/ganglia-3.0.6-r1.ebuild
@@ -0,0 +1,78 @@
+# 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.0.6-r1.ebuild,v 1.1 2008/03/07 01:59:55 jsbronder Exp $
+
+WEBAPP_OPTIONAL="yes"
+inherit webapp depend.php
+
+DESCRIPTION="Ganglia is a scalable distributed monitoring system for high-performance computing systems such as 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="test minimal vhosts"
+
+RDEPEND="!minimal? ( net-analyzer/rrdtool
+		    ${WEBAPP_DEPEND} )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.8.2 )"
+
+! use minimal && need_php5_httpd
+
+pkg_setup() {
+	if ! use minimal ; then
+		require_gd
+		require_php_with_use xml ctype
+		webapp_pkg_setup
+	fi
+}
+
+src_compile() {
+	econf \
+		--enable-gexec \
+		$(use_with !minimal gmetad) || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	insinto /etc
+	doman mans/{gmetric.1,gmond.1,gstat.1}
+	doman gmond/gmond.conf.5
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	newinitd "${FILESDIR}"/gmond.rc gmond
+
+	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_postinst() {
+	elog
+	elog "This package doesn't include a configuration file for gmond."
+	elog "You could generate a default template by running:"
+	elog "    /usr/sbin/gmond -t > /etc/gmond.conf"
+	elog "and customize it from there or provide your own."
+
+	use minimal || webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	use minimal || webapp_pkg_prerm
+}
diff --git a/sys-cluster/pvfs2/Manifest b/sys-cluster/pvfs2/Manifest
index f47dc57c2552..244998f9688a 100644
--- a/sys-cluster/pvfs2/Manifest
+++ b/sys-cluster/pvfs2/Manifest
@@ -26,7 +26,7 @@ DIST pvfs2-1.5.1.tar.gz 3295116 RMD160 fcb2c61318efa73a55e19a592f1b6c429a34ea4d
 EBUILD pvfs2-1.5.1.ebuild 1468 RMD160 a7de71a915066f145ea65bad2aec48b293d817c5 SHA1 a536ab73b5d3c5cb49e61aa2ea1abbc37ef8a8a8 SHA256 257db85531d0c2b9901bb52a27de40692062f55e2490d726667c185bf1c77da0
 EBUILD pvfs2-2.6.3-r1.ebuild 4005 RMD160 3e45a20b3d0aabc2df1bb3a3b99a37cae57397aa SHA1 073f0da03cd690132f25615dcdefa04e181cb97a SHA256 df6d2c30336519fd8cf748b0f0325607222236ab6c05fcd24224f1cfdaab7f62
 EBUILD pvfs2-2.6.3.ebuild 3915 RMD160 26cb233eccf04755023fd4d04da3cc7640e1efd0 SHA1 903bc83e4034775e6d4431a7c35a063bb81ae3f4 SHA256 821b6a2dd2d47937762c5409c55478e80baca6f3f7cc5448193210ea26af0a3b
-EBUILD pvfs2-2.7.0-r1.ebuild 5303 RMD160 c8b139013ed3f0fb5dbea102fc9b4ac5e9088e13 SHA1 82499912d07db42d4bc92f6eb013e8bd798b9065 SHA256 fd4a47c4a5b8ae026bd8bbdee67c09cc9b8cc10deda4df79d73d41e8bcca918a
+EBUILD pvfs2-2.7.0-r1.ebuild 5302 RMD160 ff1585e3cafbd072fdfd18ef4942c2a2dd574847 SHA1 4df15b8f29abb2a4673fd076cf3672c2ce625bd3 SHA256 81d109034be63ac7cee7fbd53e6044f961a3c08c89ece45ee6734221b7a4d98c
 EBUILD pvfs2-2.7.0.ebuild 6494 RMD160 08741f5f38e94dd0458022cec524044c8f9b55c1 SHA1 9a8bf1eea55ae5b0be6e2a317cbca5ab75b749c8 SHA256 444c130adb3c920c950dd83f970b89fc1c1fb327818ccc3e40d96f92bc799ecf
 MISC ChangeLog 3020 RMD160 1f7e88a0861db8278ac872f23fa79786cb6d4d97 SHA1 2c21da49aff0ad3a06bd36c4a4ccddd418fc4313 SHA256 9196161639bcabe004f4b3e9e3c65ce4dd647932a12a2d6db094166840103f96
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3