[gentoo-commits] gentoo-x86 commit in sys-cluster/ganglia: ChangeLog ganglia-3.1.7-r2.ebuild

[Justin Bronder (jsbronder)]

jsbronder    11/05/06 23:26:49

  Modified:             ChangeLog ganglia-3.1.7-r2.ebuild
  Log:
  Disable modpython by default, add python module directory (#358359).  Remove unnecessary postrm cleanup.
  
  (Portage version: 2.1.9.46/cvs/Linux x86_64)

Revision  Changes    Path
1.40                 sys-cluster/ganglia/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ChangeLog?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ChangeLog?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ChangeLog?r1=1.39&r2=1.40

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ChangeLog	25 Aug 2010 01:53:52 -0000	1.39
+++ ChangeLog	6 May 2011 23:26:49 -0000	1.40
@@ -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@g.o> 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)
 



1.2                  sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild?r1=1.1&r2=1.2

Index: ganglia-3.1.7-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ganglia-3.1.7-r2.ebuild	25 Aug 2010 01:53:52 -0000	1.1
+++ ganglia-3.1.7-r2.ebuild	6 May 2011 23:26:49 -0000	1.2
@@ -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 @@
 	# 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 @@
 	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_prerm() {
 	use minimal || webapp_pkg_prerm
 }
-
-pkg_postrm() {
-	[ -d "${ROOT}"/usr/$(get_libdir)/ganglia ] && \
-		rmdir "${ROOT}"/usr/$(get_libdir)/ganglia 2>/dev/null
-}