Require either sendmail or libmilter also in 2.4.1. Marked 2.5.2 stable on x86.

Package-Manager: portage-2.1.4_rc9

4 files changed, 27 insertions, 23 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/Manifest b/mail-filter/amavisd-new/Manifest
index 3ca8c2328cb0..f90b95e18aa0 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -20,22 +20,22 @@ SHA256 9a93b96b95314d46e3d68d9e50b667758689c214c4398436e1959b42eeddb5f2 files/am
 DIST amavisd-new-2.4.1.tar.gz 841988 RMD160 edd91dde774838345159064ef6012f7927d5aa6c SHA1 1de9fdac377c58a29a93c8a246553c8e363b212c SHA256 c067cbae60ccff3932574fcaf7971c04b118f6b2e9fe6db772d33538b53b0a54
 DIST amavisd-new-2.5.2.tar.gz 788546 RMD160 b7bc998ac34428b62cf74e1c114b295a9f322652 SHA1 2465131448ce10dac8511450695ff63bc565e6db SHA256 5f590850c505017c2633f47ced483aae23ec857e2a782f763eb16f9f9f3fceef
 DIST amavisd-new-2.5.3.tar.gz 789275 RMD160 49b97ff3782b42f8aaba7beb73440398d83638d9 SHA1 2e1460ad505ad4251a876ec506d021a392c7c0c0 SHA256 f724654e15eab3fabce22873a5f2a0fcf2db9374ca84979cf066a29360ee533d
-EBUILD amavisd-new-2.4.1.ebuild 5112 RMD160 c40e9e25a071f59efdfc0fc9f19f63581e45af5b SHA1 b212129f4db110f7c9d62188b48e1f60f954b58c SHA256 31bd1f08ae46576607535650a6e9358bcef9cd312bb0441d04922a3d5cdd195a
-MD5 bae9df40fd8366a1f1461f0b386d3af1 amavisd-new-2.4.1.ebuild 5112
-RMD160 c40e9e25a071f59efdfc0fc9f19f63581e45af5b amavisd-new-2.4.1.ebuild 5112
-SHA256 31bd1f08ae46576607535650a6e9358bcef9cd312bb0441d04922a3d5cdd195a amavisd-new-2.4.1.ebuild 5112
-EBUILD amavisd-new-2.5.2.ebuild 5131 RMD160 bf47caf16048667ca021ecdf069804de1f7c324b SHA1 0fb7518847a77ef8e8f3dee068ec37c477e29105 SHA256 e573ec26d139b15b0552dc2c7251b4d176f7ddf5e211fd735f4805b63b54a7b3
-MD5 d6be3e94eeeeafcba12a7c5d0545e280 amavisd-new-2.5.2.ebuild 5131
-RMD160 bf47caf16048667ca021ecdf069804de1f7c324b amavisd-new-2.5.2.ebuild 5131
-SHA256 e573ec26d139b15b0552dc2c7251b4d176f7ddf5e211fd735f4805b63b54a7b3 amavisd-new-2.5.2.ebuild 5131
+EBUILD amavisd-new-2.4.1.ebuild 5141 RMD160 dceda4b7e18fe6aa4753c6677a33eec6fbd5d93e SHA1 5cd59516c7205c1815e8724d7a97803c7ff0ff42 SHA256 13c113325ca8dee7a7444305fc4a3b20eeb3fb52c739723a7213ab72da3657ec
+MD5 64413447cbc654eca419c6f12857aee5 amavisd-new-2.4.1.ebuild 5141
+RMD160 dceda4b7e18fe6aa4753c6677a33eec6fbd5d93e amavisd-new-2.4.1.ebuild 5141
+SHA256 13c113325ca8dee7a7444305fc4a3b20eeb3fb52c739723a7213ab72da3657ec amavisd-new-2.4.1.ebuild 5141
+EBUILD amavisd-new-2.5.2.ebuild 5130 RMD160 e739376fd0474d860acc130eace97e0ea89513ab SHA1 08a15ce276161c28cb19779c072f12444f746a74 SHA256 28f1f41e6a3c387aafc50d01cada1c6eb03e940b8d2f69cbf6d42eeb0a163be8
+MD5 c419ac110445c356b12f2b968d69bb38 amavisd-new-2.5.2.ebuild 5130
+RMD160 e739376fd0474d860acc130eace97e0ea89513ab amavisd-new-2.5.2.ebuild 5130
+SHA256 28f1f41e6a3c387aafc50d01cada1c6eb03e940b8d2f69cbf6d42eeb0a163be8 amavisd-new-2.5.2.ebuild 5130
 EBUILD amavisd-new-2.5.3.ebuild 5048 RMD160 53ae8e022c2d69349b1c91821d608f2f294a25ec SHA1 a7bdafe0066e473cc622e9c03ccb4a63a9fc581f SHA256 1dc52b0711d2e27c7abb5cbcf2cf7b124eae6123eea40bd58cdc6c282ac21c84
 MD5 68f048667ae949d2491535d69e037357 amavisd-new-2.5.3.ebuild 5048
 RMD160 53ae8e022c2d69349b1c91821d608f2f294a25ec amavisd-new-2.5.3.ebuild 5048
 SHA256 1dc52b0711d2e27c7abb5cbcf2cf7b124eae6123eea40bd58cdc6c282ac21c84 amavisd-new-2.5.3.ebuild 5048
-MISC ChangeLog 24838 RMD160 5d9194f7dffd62a4f2c849a3a832c3c9b14531f7 SHA1 8f51eb9f8405d37c55c4cc70f72f8da93274d9ce SHA256 3505838efd14a9d4c5ec43dd348d5eb5c9d9e0276339db92408c3416bc96a3e1
-MD5 d10e033fb27fc6898e465ffd5a21be89 ChangeLog 24838
-RMD160 5d9194f7dffd62a4f2c849a3a832c3c9b14531f7 ChangeLog 24838
-SHA256 3505838efd14a9d4c5ec43dd348d5eb5c9d9e0276339db92408c3416bc96a3e1 ChangeLog 24838
+MISC ChangeLog 25023 RMD160 4e86432fff23b660dc48a688628c86ef0dd6e186 SHA1 0b4dc8a6222421c76d4e49824ea8af1a9ad20b3f SHA256 13c7c879d872a03ea2a2612e244a60251000780707c295ae012a7e8f0724576c
+MD5 1a811cc5b9c18ebdcf4b7c07abf6b87f ChangeLog 25023
+RMD160 4e86432fff23b660dc48a688628c86ef0dd6e186 ChangeLog 25023
+SHA256 13c7c879d872a03ea2a2612e244a60251000780707c295ae012a7e8f0724576c ChangeLog 25023
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -52,7 +52,7 @@ SHA256 cd4da2ef6e605382f19d947b091ac793a4bdca2afc28b3b8c7e5a929f9ce6eb7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHc53yQlM6RnzZP+IRAvHOAKCZonOcAY154t8plk6+jOKRYn9DwgCghM5U
-+T+thAkz2z2mT3Izqm0g3Ko=
-=lpwt
+iD8DBQFHg36tQlM6RnzZP+IRAiXVAJ9b3vOiNB6AfiynRs3UUG4kSQSy8ACcC3aw
+GLOHJtITSqADgnw0YP83Iks=
+=izjj
 -----END PGP SIGNATURE-----
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