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 | 8830b5a4928771b740afbf4fa0250392fa21a020 (patch) | |
| tree | f25f8e7b29cfb99ef28a72bbc50a1e8d936692ae /sys-cluster/ganglia | |
| parent | version bump (diff) | |
| download | historical-8830b5a4928771b740afbf4fa0250392fa21a020.tar.gz historical-8830b5a4928771b740afbf4fa0250392fa21a020.tar.bz2 historical-8830b5a4928771b740afbf4fa0250392fa21a020.zip | |
Disable modpython by default, add python module directory (#358359). Remove unnecessary postrm cleanup.
Package-Manager: portage-2.1.9.46/cvs/Linux x86_64
Diffstat (limited to 'sys-cluster/ganglia')
| -rw-r--r-- | sys-cluster/ganglia/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-cluster/ganglia/Manifest | 14 | ||||
| -rw-r--r-- | sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild | 14 |
3 files changed, 19 insertions, 17 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/Manifest b/sys-cluster/ganglia/Manifest index 5c5e703a0289..2cea319d28f6 100644 --- a/sys-cluster/ganglia/Manifest +++ b/sys-cluster/ganglia/Manifest @@ -11,15 +11,13 @@ AUX gmond.rc-2 472 RMD160 ff0f7e7c7a18b2dac3181e87224dc88a19c95015 SHA1 53661f78 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 EBUILD ganglia-3.1.2.ebuild 5443 RMD160 7d197d8e757da5f59f407f308cb6c913436a6684 SHA1 9e79e653bbc172900a5ba82e002308fb4bedd5ca SHA256 25ddc5a87a7908cde9448db3f391877c8eec074ca552127d550fc5f071025d92 -EBUILD ganglia-3.1.7-r2.ebuild 2835 RMD160 f382bd0c2c68394b655d3146a2844acea3822476 SHA1 bf442ab922d8f435ce66c987a65e35fadff60dc2 SHA256 9ab32e125866812683bc7762595d218f2146b6066f445c6c3b175ed74d382b49 -MISC ChangeLog 8450 RMD160 cafc1245686ba14ddb22276b2cb63ef19812d858 SHA1 f7328d278f8060405b1a2a69f7befd830369acd9 SHA256 099ae3c2cccd85ec2915f3fce4def845eb4e823a1e5a1747f713a0d0652b64d3 +EBUILD ganglia-3.1.7-r2.ebuild 2941 RMD160 59f9b2353678915ae6eb41eeeee545e03825dca7 SHA1 2670bb4a32be1c2cf9d2b9d3fc810d9401592eff SHA256 c41b91949740003b4feaa8db116d5d6a0ada2c322bfbf5414e570222f42b9b83 +MISC ChangeLog 8637 RMD160 3608e3c992fbd1e5014e68c04410b1e1edf6443e SHA1 f29802a5716a76c30fde7a38ae56d8bcd1ad7f77 SHA256 1ca6fca79023aee176f5e82ff6fa5e6c66be72114fe7ea6b30b39c400cbf1154 MISC metadata.xml 228 RMD160 8ddf3216a262f6e40c2c34d0bea65840e6b68360 SHA1 3957acb3b9d8e76b497d00cc8769a39b4d822bd0 SHA256 867e2c9cf08802c1ae7c8a1e84fafa792a531488dc15c7e8efd5596b33465d30 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQECAAYFAkyKiYQACgkQIiMqcbOVdxQHFAP/UFAuYgn4ivINai0X8/8sgeeo -4ChnucOO5MX/bg5pcT2Ll6UrRAUtqJ9OvAlEkJVnGF/Jc5nRwlE9qM1KD6dFa0An -lzVl/nENXReGCBXJVhTGxZ8M1VWL/QMYzEACGGo/Oav8xbL0+2/6DURT55xqYpHr -aGrYDFw4PUHTUnEYMkg= -=pMX9 +iEYEARECAAYFAk3Eg8QACgkQ4MrvBE1wQ8k80ACeOP30+U/Re8UWAqcMHiKdqjSQ +668AoKH12PmzIdoi/Ivcg+vn2/aVzkYp +=2HWs -----END PGP SIGNATURE----- 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 -} |