diff options
| author |   Justin Bronder <jsbronder@gentoo.org> | 2011-05-06 23:26:49 +0000 |
|---|---|---|
| committer | Justin Bronder <jsbronder@gentoo.org> | 2011-05-06 23:26:49 +0000 |
| commit | 802ca70d27a15167099095972858932a8809f84f (patch) | |
| tree | 9eb752cc8caebd8951d16efd3d4259ac687c6e38 /sys-cluster | |
| parent | version bump (diff) | |
| download | gentoo-2-802ca70d27a15167099095972858932a8809f84f.tar.gz gentoo-2-802ca70d27a15167099095972858932a8809f84f.tar.bz2 gentoo-2-802ca70d27a15167099095972858932a8809f84f.zip | |
Disable modpython by default, add python module directory (#358359). Remove unnecessary postrm cleanup.
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/ganglia/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild | 14 |
2 files changed, 13 insertions, 9 deletions
diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog index 7e43610f2bc2..2716b630c5f9 100644 --- a/sys-cluster/ganglia/ChangeLog +++ b/sys-cluster/ganglia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/ganglia -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.39 2010/08/25 01:53:52 jsbronder Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.40 2011/05/06 23:26:49 jsbronder Exp $ + + 06 May 2011; Justin Bronder <jsbronder@gentoo.org> ganglia-3.1.7-r2.ebuild: + Disable modpython by default, add python module directory (#358359). Remove + unnecessary postrm cleanup. *ganglia-3.1.7-r2 (25 Aug 2010) diff --git a/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild b/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild index aaf9ae622206..7676d232dabe 100644 --- a/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild +++ b/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# 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-r2.ebuild,v 1.1 2010/08/25 01:53:52 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild,v 1.2 2011/05/06 23:26:49 jsbronder Exp $ EAPI="3" WEBAPP_OPTIONAL="yes" @@ -46,6 +46,10 @@ 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() { @@ -66,6 +70,7 @@ src_install() { 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 @@ -110,8 +115,3 @@ pkg_postinst() { pkg_prerm() { use minimal || webapp_pkg_prerm } - -pkg_postrm() { - [ -d "${ROOT}"/usr/$(get_libdir)/ganglia ] && \ - rmdir "${ROOT}"/usr/$(get_libdir)/ganglia 2>/dev/null -} |