Make dev-libs/libpcre optional dependency, econf doesn't need to die, remove redundant die msg.

Package-Manager: portage-2.2.0_alpha31/cvs/Linux x86_64

3 files changed, 133 insertions, 16 deletions

diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog
index 6b0e94b77315..ef5198d6b28e 100644
--- a/sys-cluster/ganglia/ChangeLog
+++ b/sys-cluster/ganglia/ChangeLog
@@ -1,6 +1,12 @@
 # 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.41 2011/05/11 18:56:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.42 2011/05/23 09:11:52 xarthisius Exp $
+
+*ganglia-3.1.7-r3 (23 May 2011)
+
+  23 May 2011; Kacper Kowalik <xarthisius@gentoo.org> +ganglia-3.1.7-r3.ebuild:
+  Make dev-libs/libpcre optional dependency, econf doesn't need to die, remove
+  redundant die msg.
 
   11 May 2011; Markos Chandras <hwoarang@gentoo.org> ganglia-3.1.7-r2.ebuild:
   Stable on amd64 wrt bug #366679
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index 01d740ffc59a..68034fd4c003 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -12,22 +12,15 @@ DIST ganglia-3.1.2.tar.gz 1213196 RMD160 1f78cf1019759e12c3c65901fd74ac65dfddf4e
 DIST ganglia-3.1.7.tar.gz 1278023 RMD160 918d678ad234d477fc98427d96485a8111c64f06 SHA1 e234d64814af1c9f55f1cd039a5840039d175f85 SHA256 bb1a4953d72e7dace76010a30d6d332e4ac0991d1371dbbcbcc7b048e0a7e4bf
 EBUILD ganglia-3.1.2.ebuild 5443 RMD160 7d197d8e757da5f59f407f308cb6c913436a6684 SHA1 9e79e653bbc172900a5ba82e002308fb4bedd5ca SHA256 25ddc5a87a7908cde9448db3f391877c8eec074ca552127d550fc5f071025d92
 EBUILD ganglia-3.1.7-r2.ebuild 2939 RMD160 323f8bf5a265da65317f12bd5a18c4a22ec4f43e SHA1 b3cc2fad7d03efb2665a52e9df9426367ccfb8a0 SHA256 e6026c8b51202105eac62629699bf334bb18f0ffec671c8d4a06bb0ccf9732bb
-MISC ChangeLog 8749 RMD160 c5ba1a8d870390f0507ddafdf17c17d8d9efaf45 SHA1 6c7369db4eeaeb091ffb68253747542a160ee887 SHA256 9ebb12915e07569f59d419edf8df0e0aaa6766e3ec1101355353fdb9e21a7d45
+EBUILD ganglia-3.1.7-r3.ebuild 2957 RMD160 11213948efc293de5155b80795313717d8b825e6 SHA1 df232d38342fa8f35569a937cbd41c6ec329ac64 SHA256 b489571dd887d20a1c18f35fbd13473d46114ba70a9854bfdc61f362f6c9db6b
+MISC ChangeLog 8965 RMD160 62864047493b6b29b84b379b5bd287145435d250 SHA1 eec3c7c066fdfc36e5dc4f058bf9322e54eb0186 SHA256 e6d52d907c516269a5f7d3c865395528e999997da6472ba5f609ce13ac6aa5fa
 MISC metadata.xml 228 RMD160 8ddf3216a262f6e40c2c34d0bea65840e6b68360 SHA1 3957acb3b9d8e76b497d00cc8769a39b4d822bd0 SHA256 867e2c9cf08802c1ae7c8a1e84fafa792a531488dc15c7e8efd5596b33465d30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNytwAAAoJEPqDWhW0r/LCoEsP/RXygzGOquXcfihhSppbA1/S
-kTOVT4QuVe/pMw0zTCPDJnRXaG3QFWUkALFYTR+rgQ1emtXRTuB0xqiscWmWtFEn
-I5872Nuv0+jsSFQvPNSM36hC8tmSojU+801w9q0dFgh7G05HI85b15px5wmJjybd
-slxe83EFA4lCzk/vwWh6HaHLiWIkU/yQBqdYCJZueZgTDY4UJMpk8Wq2wvW1hhZA
-cyjqukAQbrn5wkJj3LS9WaNHPJ404xFFlZTssoC5RNjX9irLpKdhhUSXNsGwDPAY
-Ek/EdZ1+ZUGIWbTv5MY4sUqj7IBcUFQrENrQedMc+/gEIfMSzdb8ZZWh+X1IueEy
-bMtwjq+OJFHFaPA/5LoANClIbsV6xpobwaKk/9hEWgEzmCSHuNjo0eXk/R4NH2XO
-G0i4ImiOWwWXYJ895yRSce+A0uK+FzlXH5Z/S7NK2K56p0Wu6vdJwuAoVoPzIHEZ
-jXJenLnmafZPQ3Cpx3/kftSaXMwLQvb+N5tBgXAG51NNOcl/+sKxk0OvuwSRDJ+K
-kSWb2TMFmwcXRtFnjJrREvfcKYzlxbAKV8TlZE12yLcIcB3BK7WhXHTbj2HSOdop
-2sV0lqcP+A78tLQHzdFizhIsaxoKaRGU03370+ISd1bDwdMSeY5Vgfq3Cr2MFsdA
-7vCM75nMbOJzpAudahzk
-=rkLk
+iJwEAQECAAYFAk3aJOEACgkQIiMqcbOVdxQ+ogP/XsRLnYBzYWa7T+EfVry+aGCG
+knqWNrekdbGydPc/2fHQZdfEDJYFcn6MKTXLU7tBRgwvSawLpvng0nuLUqD62nMX
+8Cmfl8K2paEk7sehsh6CpqSMTJHDc9gBr20mi9hm+UfB8RyRdjvu5DFbxp0mtssb
+h65lPqzTKedo4aIDqBs=
+=fTXT
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ganglia/ganglia-3.1.7-r3.ebuild b/sys-cluster/ganglia/ganglia-3.1.7-r3.ebuild
new file mode 100644
index 000000000000..6e408d47c716
--- /dev/null
+++ b/sys-cluster/ganglia/ganglia-3.1.7-r3.ebuild
@@ -0,0 +1,118 @@
+# 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.1.7-r3.ebuild,v 1.1 2011/05/23 09:11:52 xarthisius 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() {
+	# 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
+
+	# 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 ChangeLog INSTALL NEWS README || 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
+	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"
+
+	use minimal || webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	use minimal || webapp_pkg_prerm
+}