summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-10-18 18:47:16 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-10-18 18:47:16 +0000
commit542c221a0812627e0fc1332251c4d000e363c883 (patch)
tree9cf758c7bfb1d3649dc1ced95314e8f91fe9c9a4
parentVersion bump: EAPI=5 subslot support. (diff)
downloadgentoo-2-542c221a0812627e0fc1332251c4d000e363c883.tar.gz
gentoo-2-542c221a0812627e0fc1332251c4d000e363c883.tar.bz2
gentoo-2-542c221a0812627e0fc1332251c4d000e363c883.zip
Fix init script for munin-asyncd to use the correct user; also install the asyncd scripts when installing minimal.
(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)
-rw-r--r--net-analyzer/munin/ChangeLog9
-rw-r--r--net-analyzer/munin/files/munin-asyncd.init.24
-rw-r--r--net-analyzer/munin/munin-2.0.7-r2.ebuild (renamed from net-analyzer/munin/munin-2.0.7-r1.ebuild)5
3 files changed, 13 insertions, 5 deletions
diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 8d17bcbe80b6..9e94911b86c4 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-analyzer/munin
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.107 2012/10/04 17:18:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.108 2012/10/18 18:47:16 flameeyes Exp $
+
+*munin-2.0.7-r2 (18 Oct 2012)
+
+ 18 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> +munin-2.0.7-r2.ebuild,
+ -munin-2.0.7-r1.ebuild, files/munin-asyncd.init.2:
+ Fix init script for munin-asyncd to use the correct user; also install the
+ asyncd scripts when installing minimal.
*munin-2.0.7-r1 (04 Oct 2012)
diff --git a/net-analyzer/munin/files/munin-asyncd.init.2 b/net-analyzer/munin/files/munin-asyncd.init.2
index db0b47c7716c..bf9e06bdaa7f 100644
--- a/net-analyzer/munin/files/munin-asyncd.init.2
+++ b/net-analyzer/munin/files/munin-asyncd.init.2
@@ -1,12 +1,12 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-asyncd.init.2,v 1.1 2012/08/23 19:20:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-asyncd.init.2,v 1.2 2012/10/18 18:47:16 flameeyes Exp $
command=/usr/libexec/munin/munin-asyncd
command_args="--fork"
pidfile="/var/run/munin/munin-asyncd.pid"
-start_stop_daemon_args="--background --make-pidfile --user munin-asyncd"
+start_stop_daemon_args="--background --make-pidfile --user munin-async"
depend() {
need munin-node
diff --git a/net-analyzer/munin/munin-2.0.7-r1.ebuild b/net-analyzer/munin/munin-2.0.7-r2.ebuild
index 3ad446a8cc17..f300ff5f1db8 100644
--- a/net-analyzer/munin/munin-2.0.7-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.7-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.7-r1.ebuild,v 1.1 2012/10/04 17:18:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.7-r2.ebuild,v 1.1 2012/10/18 18:47:16 flameeyes Exp $
EAPI=4
@@ -138,7 +138,8 @@ src_install() {
keepdir ${dirs}
fowners munin:munin ${dirs}
- local install_targets="install-common-prime install-node-prime install-plugins-prime"
+ local install_targets="install-common-prime install-node-prime install-plugins-prime
+ install-async-prime"
use java && install_targets+=" install-plugins-java"
use minimal || install_targets=install