summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Kacian <ticho@gentoo.org>2008-01-08 13:46:14 +0000
committerAndrej Kacian <ticho@gentoo.org>2008-01-08 13:46:14 +0000
commit07e70d737581a5695e5738dd2f8d2aa8c5941896 (patch)
tree27cd0973f070e3d0b597a0bfb7f8d03d281c077d /mail-filter
parentKeyword ~x86 (diff)
downloadgentoo-2-07e70d737581a5695e5738dd2f8d2aa8c5941896.tar.gz
gentoo-2-07e70d737581a5695e5738dd2f8d2aa8c5941896.tar.bz2
gentoo-2-07e70d737581a5695e5738dd2f8d2aa8c5941896.zip
Require either sendmail or libmilter also in 2.4.1. Marked 2.5.2 stable on x86.
(Portage version: 2.1.4_rc9)
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/amavisd-new/ChangeLog8
-rw-r--r--mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild6
-rw-r--r--mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild6
3 files changed, 12 insertions, 8 deletions
diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index fe1257ea1dd7..d78536ec2667 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-filter/amavisd-new
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.113 2007/12/27 12:43:23 ticho Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.114 2008/01/08 13:46:14 ticho Exp $
+
+ 08 Jan 2008; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.4.1.ebuild,
+ amavisd-new-2.5.2.ebuild:
+ Require either sendmail or libmilter also in 2.4.1. Marked 2.5.2 stable on x86.
27 Dec 2007; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.4.1.ebuild,
amavisd-new-2.5.2.ebuild, amavisd-new-2.5.3.ebuild:
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
index 6ba765d8148b..d98fe99a2e3b 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.4.1.ebuild,v 1.13 2007/12/27 12:43:23 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.14 2008/01/08 13:46:14 ticho Exp $
inherit eutils
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}
ldap? ( >=dev-perl/perl-ldap-0.33 )
mysql? ( dev-perl/DBD-mysql )
postgres? ( dev-perl/DBD-Pg )
- milter? ( >=mail-mta/sendmail-8.12 )"
+ milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"
AMAVIS_ROOT="/var/amavis"
diff --git a/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild
index b42b0a1f8463..510317c24285 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.5.2.ebuild,v 1.3 2007/12/27 12:43:23 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild,v 1.4 2008/01/08 13:46:14 ticho Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
IUSE="courier ldap milter mysql postgres qmail"
DEPEND=">=sys-apps/sed-4