summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2013-03-23 22:02:25 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2013-03-23 22:02:25 +0000
commitcaed837b3163bf0e3f9d270a9ac482a62058d074 (patch)
treece8df35ccb39d8d365c4a8b195673244008cc220 /net-analyzer/munin
parentStable for x86, wrt bug #458988 (diff)
downloadgentoo-2-caed837b3163bf0e3f9d270a9ac482a62058d074.tar.gz
gentoo-2-caed837b3163bf0e3f9d270a9ac482a62058d074.tar.bz2
gentoo-2-caed837b3163bf0e3f9d270a9ac482a62058d074.zip
Version bump and remove old.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'net-analyzer/munin')
-rw-r--r--net-analyzer/munin/ChangeLog8
-rw-r--r--net-analyzer/munin/munin-2.0.12.ebuild (renamed from net-analyzer/munin/munin-2.0.10-r2.ebuild)11
2 files changed, 13 insertions, 6 deletions
diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index d18513777ef4..75910df1e3be 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/munin
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.139 2013/03/22 17:23:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.140 2013/03/23 22:02:25 flameeyes Exp $
+
+*munin-2.0.12 (23 Mar 2013)
+
+ 23 Mar 2013; Diego E. Pettenò <flameeyes@gentoo.org> +munin-2.0.12.ebuild,
+ -munin-2.0.10-r2.ebuild:
+ Version bump and remove old.
22 Mar 2013; Agostino Sarubbo <ago@gentoo.org> munin-2.0.11.1.ebuild:
Stable for ppc, wrt bug #462316
diff --git a/net-analyzer/munin/munin-2.0.10-r2.ebuild b/net-analyzer/munin/munin-2.0.12.ebuild
index 538fd79510e0..bb484eff5b1f 100644
--- a/net-analyzer/munin/munin-2.0.10-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.10-r2.ebuild,v 1.1 2013/01/23 19:22:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.12.ebuild,v 1.1 2013/03/23 22:02:25 flameeyes Exp $
EAPI=5
@@ -26,7 +26,7 @@ REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )"
# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
DEPEND_COM="dev-lang/perl[berkdb]
- sys-process/procps
+ kernel_linux? ( sys-process/procps )
doc? ( dev-python/sphinx )
asterisk? ( dev-perl/Net-Telnet )
irc? ( dev-perl/Net-IRC )
@@ -178,8 +178,9 @@ src_install() {
# with.
rm -rf "${D}"/run
- # remove the plugins for non-Gentoo package managers
- rm "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+ # remove the plugins for non-Gentoo package managers; use -f so that
+ # it doesn't fail when installing on non-Linux platforms.
+ rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
insinto /etc/munin/plugin-conf.d/
newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
@@ -366,7 +367,7 @@ pkg_postinst() {
if use cgi; then
chown $(usex apache apache munin) \
"${ROOT}"/var/cache/munin-cgi \
- "${ROOT}"/var/log/munin-cgi-{graph,html}.log
+ "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
if use apache; then
elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"