summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-02-15 14:34:54 +0000
committerPacho Ramos <pacho@gentoo.org>2014-02-15 14:34:54 +0000
commit408bde27a04aa919d8351a1d43c5a37a2f0890a4 (patch)
tree076707f23a84aa85e956639a3a9c60d2172c36af /mail-filter
parentStable for HPPA (bug #501344). (diff)
downloadgentoo-2-408bde27a04aa919d8351a1d43c5a37a2f0890a4.tar.gz
gentoo-2-408bde27a04aa919d8351a1d43c5a37a2f0890a4.tar.bz2
gentoo-2-408bde27a04aa919d8351a1d43c5a37a2f0890a4.zip
Fix the clamav support
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/amavisd-new/ChangeLog5
-rw-r--r--mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild9
2 files changed, 9 insertions, 5 deletions
diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 02bb5d25f1d2..2e6a2300d574 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for mail-filter/amavisd-new
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.200 2014/02/15 13:16:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.201 2014/02/15 14:34:54 pacho Exp $
+
+ 15 Feb 2014; Pacho Ramos <pacho@gentoo.org> amavisd-new-2.8.1-r1.ebuild:
+ Fix the clamav support
*amavisd-new-2.8.1-r1 (15 Feb 2014)
diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
index 33d6111608d8..3b357654681c 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild,v 1.1 2014/02/15 13:16:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild,v 1.2 2014/02/15 14:34:54 pacho Exp $
EAPI=4
inherit eutils systemd user
@@ -13,7 +13,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
DEPEND=">=sys-apps/sed-4
>=dev-lang/perl-5.8.2"
@@ -57,6 +57,7 @@ RDEPEND="${DEPEND}
dev-perl/Convert-BinHex
>=dev-perl/Mail-DKIM-0.31
virtual/mta
+ clamav? ( app-antivirus/clamav )
ldap? ( >=dev-perl/perl-ldap-0.33 )
mysql? ( dev-perl/DBD-mysql )
postgres? ( dev-perl/DBD-Pg )
@@ -115,8 +116,8 @@ src_install() {
newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
systemd_dounit "${FILESDIR}/amavisd.service"
- use clamd || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
- use spamassasin || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+ use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+ use spamassasin || sed -i -e '/Wants=spamassasin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
keepdir "${AMAVIS_ROOT}"
keepdir "${AMAVIS_ROOT}/db"