mail-filter/amavisd-new: Fix depend and conf.d setting in amavisd-snmp

Package-Manager: portage-2.3.0_rc1

4 files changed, 14 insertions, 4 deletions

diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
index 3dcf29ef3898..3dcf29ef3898 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r1.ebuild
index d83e555c47ad..d83e555c47ad 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r1.ebuild
diff --git a/mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild
index c84f49183b4c..c84f49183b4c 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild
diff --git a/mail-filter/amavisd-new/files/amavisd-snmp.initd b/mail-filter/amavisd-new/files/amavisd-snmp.initd
index 97324190aaa4..fca5f12acf2c 100644
--- a/mail-filter/amavisd-new/files/amavisd-snmp.initd
+++ b/mail-filter/amavisd-new/files/amavisd-snmp.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,14 +9,24 @@ command="/usr/sbin/${name}-subagent"
 command_args="${amavis_snmp_args} -P ${pidfile}"
 start_stop_daemon_args="--interpreted"
 
+update_command() {
+	if [[ -x ${command}-zmq && ! $amavisd_snmp_command ]]; then
+		command="${command}-zmq"
+	elif [[ $amavisd_snmp_command ]]; then
+		command="$amavisd_snmp_command"
+	fi
+}
+
 depend() {
 	use logger
 	before amavisd-new snmpd
+	update_command
+	if [[ ${command##*-} == "zmq" ]]; then
+		need amavis-mc
+	fi
 }
 
 start_pre() {
-	if [[ -x ${command}-zmq && ! $amavisd_snmp_command ]]; then
-		command="${command}-zmq"
-	fi
+	update_command
 	checkpath -d -o amavis /run/amavis
 }