Require either sendmail or libmilter. Bug #161392, reported by steveb <steeeeeveee...

Package-Manager: portage-2.1.2-r4

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 52fa965080a09385c1813c27bfc3eab8bc34cc5d..5ba2231e1bdfdcddbfb35eec185aa9a27f20f8e0 100644 (file)
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/amavisd-new
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.99 2006/12/24 21:16:34 ticho Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.100 2007/01/26 22:17:13 ticho Exp $
+
+  26 Jan 2007; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.4.4.ebuild:
+  Require either sendmail or libmilter. Bug #161392, reported by steveb
+  <steeeeeveee@gmx.net>.
 
   24 Dec 2006; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.4.4.ebuild:
   Do not touch existing razor files. Should fix bug #144789 by Cédric Krier

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 24404ef255723134639b0fbdf9ac241ceb9399e7..ad2f552e021ef0453a94590a7530a08d7040964a 100644 (file)
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -58,14 +58,14 @@ EBUILD amavisd-new-2.4.3.ebuild 5133 RMD160 79ba46a33ad8b5cd0d240950b72b84f1d1d6
 MD5 2485dfbe653652d133eb1cf0e3fd4cf9 amavisd-new-2.4.3.ebuild 5133
 RMD160 79ba46a33ad8b5cd0d240950b72b84f1d1d6feed amavisd-new-2.4.3.ebuild 5133
 SHA256 3be17677141e51e919b988fcf300d844f188909f644621ae228a46f01920878d amavisd-new-2.4.3.ebuild 5133
-EBUILD amavisd-new-2.4.4.ebuild 4975 RMD160 d41b797b55c2d7ed502da4f33a5f77a209a85b3e SHA1 772e8c2e2b17ab0e9c7ca1e90676000c063f147d SHA256 6b651c31f8f8112c1fdb252aa8289d9f63454ac579e9fbf7621a51ac6a6bc459
-MD5 d590a31a2e349d18d117ec02035fd3d5 amavisd-new-2.4.4.ebuild 4975
-RMD160 d41b797b55c2d7ed502da4f33a5f77a209a85b3e amavisd-new-2.4.4.ebuild 4975
-SHA256 6b651c31f8f8112c1fdb252aa8289d9f63454ac579e9fbf7621a51ac6a6bc459 amavisd-new-2.4.4.ebuild 4975
-MISC ChangeLog 20703 RMD160 4957cb6c54dd004c800db88d586aa1ddeaeb7127 SHA1 00c39a29147028510abf832ece10da31e25dc9a9 SHA256 a3ff53bea7b42032494f279ea2d4a0257083e49b72f2246c78f05b8f305c1783
-MD5 d8408df7926f532985fe0f4d7a0c9ffb ChangeLog 20703
-RMD160 4957cb6c54dd004c800db88d586aa1ddeaeb7127 ChangeLog 20703
-SHA256 a3ff53bea7b42032494f279ea2d4a0257083e49b72f2246c78f05b8f305c1783 ChangeLog 20703
+EBUILD amavisd-new-2.4.4.ebuild 5004 RMD160 a565517c054353ff78eb5e045a52114830783565 SHA1 c4f90e7d8e3bb11ffd7a82f58e83ab00f14ec92f SHA256 2fe9166c7292fbb5b025e4d8f4a19795585fdc6bed755192085fc953b8a37ca9
+MD5 7d87ef4ef0d32b9b5c2f1db0532029e2 amavisd-new-2.4.4.ebuild 5004
+RMD160 a565517c054353ff78eb5e045a52114830783565 amavisd-new-2.4.4.ebuild 5004
+SHA256 2fe9166c7292fbb5b025e4d8f4a19795585fdc6bed755192085fc953b8a37ca9 amavisd-new-2.4.4.ebuild 5004
+MISC ChangeLog 20876 RMD160 ffe96b5189c228c5f4a65458802c676efa7a0088 SHA1 27d8243a75a7ddd41b37add4f6af0d2085b96d61 SHA256 f79a650087a9cfc8b93d0b85d909082910449d0d1919d4d2ab3666f6d928215c
+MD5 54ce7f55c5b1aed6be566cea77fff47a ChangeLog 20876
+RMD160 ffe96b5189c228c5f4a65458802c676efa7a0088 ChangeLog 20876
+SHA256 f79a650087a9cfc8b93d0b85d909082910449d0d1919d4d2ab3666f6d928215c ChangeLog 20876
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -91,7 +91,7 @@ SHA256 3efe36b42ef294cc88b43fd99e066f1599af37a38b5764681067bb76b601a091 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFju48QlM6RnzZP+IRAt/FAJ94yAfiaOHO8lbxWxsPpECOevsLYwCgscQK
-jXlz04nx7Wx7EaqYxssoo1o=
-=/3Ju
+iD8DBQFFun6FQlM6RnzZP+IRAhidAJ0WZq7EJnSdN2Ra/srOx9wL/X384QCguP/s
+UpPYPYcNybHOn8OfYwjQRdM=
+=ls5S
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
index 0911ebe978ab5bf650094b826f4c223f235ad9a7..49d3a2672caec57900d192aef38811e1edc9a521 100644 (file)
--- a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.4.ebuild,v 1.2 2006/12/24 21:16:34 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.3 2007/01/26 22:17:13 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"