From b5a1266b5e62f8b8a90b31e578dcecb989da6cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sat, 10 May 2014 07:51:07 +0200 Subject: [PATCH] [mail-filter/amavisd-new] bump, fix spamassassin and clamav exclusion for systemd, fix IUSE --- mail-filter/amavisd-new/Manifest | 2 +- ...ew-2.8.2_rc1.ebuild => amavisd-new-2.9.0.ebuild} | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) rename mail-filter/amavisd-new/{amavisd-new-2.8.2_rc1.ebuild => amavisd-new-2.9.0.ebuild} (92%) diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest index a4370b0..e1b7961 100644 --- a/mail-filter/amavisd-new/Manifest +++ b/mail-filter/amavisd-new/Manifest @@ -1 +1 @@ -DIST amavisd-new-2.8.2-rc1.tar.xz 739016 SHA256 08abdfeab90481d1a61b005d989b46b14567a6c9b612fdc725b5425574ddbf6e SHA512 ca381e9cbdf4bead864ab22df585681c6f737c3412664cf2eb59326907d767bccee6846baae5f177dff57c30548347af637ea63197166c753b927fb57a7b24dc WHIRLPOOL da32731370dac54e122fc77ff2e10b3b247eab348e5ec9dfc9794d60b5d46c144ab8dd05dd33f81f29eafa9aa6666e12da6b3ba9737b70eeaf0b589117150adc +DIST amavisd-new-2.9.0.tar.xz 752344 SHA256 a33b1bbb9a4ae9d00340291081e22dc7be00e60cd2dac6a93c17785cbc517fdd SHA512 490f249b47638368c4e39b1e90a0654c965ed0c3102495c152c1f365a2fb962078a2bcfb57dccbf0fa8008494d85414734a6cde2aeded7aeda6bf4c1201de59d WHIRLPOOL 31a979bc573b051217101fa317894dabbe5ad75f0d636ae3c720f9c184c9295cddc3acc532950e524348103596113cefd2660cf12753f08837cc9ef931f44f16 diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.2_rc1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.9.0.ebuild similarity index 92% rename from mail-filter/amavisd-new/amavisd-new-2.8.2_rc1.ebuild rename to mail-filter/amavisd-new/amavisd-new-2.9.0.ebuild index 444b7fe..d2a430c 100644 --- a/mail-filter/amavisd-new/amavisd-new-2.8.2_rc1.ebuild +++ b/mail-filter/amavisd-new/amavisd-new-2.9.0.ebuild @@ -2,19 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit eutils systemd user -MY_P="${P/_/-}" DESCRIPTION="High-performance interface between the MTA and content checkers." HOMEPAGE="http://www.ijs.si/software/amavisd/" -SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz" +SRC_URI="http://www.ijs.si/software/amavisd/${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" @@ -58,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 ) @@ -67,7 +67,6 @@ RDEPEND="${DEPEND} zmq? ( dev-perl/ZMQ-LibZMQ2 )" AMAVIS_ROOT="/var/amavis" -S="${WORKDIR}/${MY_P}" src_prepare() { if use courier ; then @@ -116,8 +115,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 spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service keepdir "${AMAVIS_ROOT}" keepdir "${AMAVIS_ROOT}/db"