[gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/, mail-filter/amavisd-new/files/

[Marc Schiffbauer]

commit:     577b994e0f43d9e4b772774e462793aea86f7414
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 14:11:50 2016 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 14:12:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=577b994e

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

Package-Manager: portage-2.3.0_rc1

 ...w-2.10.1-r3.ebuild => amavisd-new-2.10.1-r4.ebuild} |  0
 ...-new-2.11.0.ebuild => amavisd-new-2.11.0-r1.ebuild} |  0
 ...new-2.9.1-r1.ebuild => amavisd-new-2.9.1-r2.ebuild} |  0
 mail-filter/amavisd-new/files/amavisd-snmp.initd       | 18 ++++++++++++++----
 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
similarity index 100%
rename from mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild
rename to 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
similarity index 100%
rename from mail-filter/amavisd-new/amavisd-new-2.11.0.ebuild
rename to 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
similarity index 100%
rename from mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild
rename to 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 9732419..fca5f12 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
 }