Moved milter dependency atom from RDEPEND to DEPEND and changed order, so libmilter is considered first. Bug #208090.

Package-Manager: portage-2.1.4.4

5 files changed, 33 insertions, 18 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index de5edc42c376..38907592e961 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.117 2008/02/22 14:34:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.118 2008/03/01 13:42:47 ticho Exp $
+
+  01 Mar 2008; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.4.1.ebuild,
+  amavisd-new-2.5.2.ebuild, amavisd-new-2.5.3.ebuild:
+  Moved milter dependency atom from RDEPEND to DEPEND and changed order, so
+  libmilter is considered first. Bug #208090.
 
   22 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   amavisd-new-2.5.2.ebuild:
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 771882855826..8ae1a39f2a61 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amavisd-new-2.4-qmail-lf-workaround.patch 722 RMD160 e7d9bfc83343ca63ffc56f85e0dd216c4a2aff30 SHA1 1b7b9a4fb8d299bc9de3e307fb5952428d8143fa SHA256 988aeb0c74c8d644f716532d8dafbe2a6ace6f0a2aa826cb4c41ece8be662c13
 AUX amavisd-new-2.4.1-amavisd.conf-gentoo.patch 5641 RMD160 1e2b587e22a9f51ae692de41325439fc4feb19ad SHA1 008a421db17efcd65fea6342128a4c069b1938e7 SHA256 2fdbdda5b293e5c3b10c74504a1368ea470e328155823caddfbf7d16f9e79036
 AUX amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878 RMD160 bf7faec0c54aa24bd689db9d1d22cccbdcff47b3 SHA1 18a44d7cf4e155206b26582abf4e3b92682275ea SHA256 b9db712af97ec836f1177fbeeaa284a4eb254f0a4eea1783606553273078fee3
@@ -5,8 +8,15 @@ AUX amavisd.rc6 333 RMD160 f325f40cdedd1cfff72e16c574ef499d4790d1bf SHA1 e026253
 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 5141 RMD160 dceda4b7e18fe6aa4753c6677a33eec6fbd5d93e SHA1 5cd59516c7205c1815e8724d7a97803c7ff0ff42 SHA256 13c113325ca8dee7a7444305fc4a3b20eeb3fb52c739723a7213ab72da3657ec
-EBUILD amavisd-new-2.5.2.ebuild 5131 RMD160 90e6ba7001271eab2a98f390a5c357ff3d1c4fb5 SHA1 e0c0ff2198810183d98a82c45f7188c537221aa1 SHA256 dd93cf0f9e6d5888aed31ffb8af87d9859efddce78f290952f82d410c6e6350d
-EBUILD amavisd-new-2.5.3.ebuild 5048 RMD160 53ae8e022c2d69349b1c91821d608f2f294a25ec SHA1 a7bdafe0066e473cc622e9c03ccb4a63a9fc581f SHA256 1dc52b0711d2e27c7abb5cbcf2cf7b124eae6123eea40bd58cdc6c282ac21c84
-MISC ChangeLog 25342 RMD160 46ade21d1f4f8b23f5020548f70003979b28735c SHA1 52fa88fe789ad01450144a6386edbae03f4e30ee SHA256 4d089092a77f184e0d32c2f5835b48b951fd561b7e51883e9d044c365cda7fd6
+EBUILD amavisd-new-2.4.1.ebuild 5141 RMD160 3b086005f6c232b1b6c69a3fed1f1b74590bd128 SHA1 3d36b230c57a2221a539a62eccb1af6929bb659f SHA256 6cff1dae46650077f1dc910d95a84b68dfa97dd10c01afbca9b392aef4fbcb98
+EBUILD amavisd-new-2.5.2.ebuild 5126 RMD160 f7ac4d0001db3bd422632b25d3da1a02112b4a18 SHA1 b19192f05622590597be3d257f838a032bf5849c SHA256 2435f0a990a6e4828e3042110f2b09419f18c3b6b5daa260202595239aec774c
+EBUILD amavisd-new-2.5.3.ebuild 5048 RMD160 2beca8cdcac289419735b2ddf9def528af0e89d3 SHA1 04e13379022b027962e6631c711bec609b3ff70b SHA256 6f304454b4ffe100727922897eb05961d8161524f07770e9602bdeb12703bbfe
+MISC ChangeLog 25588 RMD160 321a000ecdc9cafb5808ba450f7f70cef6841279 SHA1 71db4daea678b85b0e20a279ad931cdda77e1bc0 SHA256 79cd464819041d7ca19401451303f32707c63c269d9a501d2cc9b8a41d14a008
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHyV1hQlM6RnzZP+IRAjc1AKDEyxv8eNXfcIz4ZIDJGWaZNBpanwCePPtk
+togWlMOk0nPtRIoadVGdC0w=
+=SEvv
+-----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 d98fe99a2e3b..f51e7c315385 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-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.14 2008/01/08 13:46:14 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.15 2008/03/01 13:42:47 ticho Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="ldap mysql postgres milter"
 
 DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
+	>=dev-lang/perl-5.8.2
+	milter? ( || ( mail-filter/libmilter >=mail-mta/sendmail-8.12 ) )"
 
 RDEPEND="${DEPEND}
 	>=sys-apps/coreutils-5.0-r3
@@ -45,8 +46,7 @@ RDEPEND="${DEPEND}
 	virtual/mta
 	ldap? ( >=dev-perl/perl-ldap-0.33 )
 	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"
+	postgres? ( dev-perl/DBD-Pg )"
 
 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 fbd36cc74d48..cdc3b668e9e6 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-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.7 2008/02/22 14:34:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild,v 1.8 2008/03/01 13:42:47 ticho Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ KEYWORDS="alpha ~amd64 ppc ppc64 sparc x86"
 IUSE="courier ldap milter mysql postgres qmail"
 
 DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
+	>=dev-lang/perl-5.8.2
+	milter? ( || ( mail-filter/libmilter >=mail-mta/sendmail-8.12 ) )"
 
 RDEPEND="${DEPEND}
 	>=sys-apps/coreutils-5.0-r3
@@ -44,8 +45,7 @@ RDEPEND="${DEPEND}
 	virtual/mta
 	ldap? ( >=dev-perl/perl-ldap-0.33 )
 	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"
+	postgres? ( dev-perl/DBD-Pg )"
 
 AMAVIS_ROOT="/var/amavis"
 
diff --git a/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild
index af4d31a1d425..cbc0bc5e6e68 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.5.3.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.3.ebuild,v 1.2 2007/12/27 12:43:23 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild,v 1.3 2008/03/01 13:42:47 ticho Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="courier ldap milter mysql postgres qmail"
 
 DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
+	>=dev-lang/perl-5.8.2
+	milter? ( || ( mail-filter/libmilter >=mail-mta/sendmail-8.12 ) )"
 
 RDEPEND="${DEPEND}
 	>=sys-apps/coreutils-5.0-r3
@@ -44,8 +45,7 @@ RDEPEND="${DEPEND}
 	virtual/mta
 	ldap? ( >=dev-perl/perl-ldap-0.33 )
 	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"
+	postgres? ( dev-perl/DBD-Pg )"
 
 AMAVIS_ROOT="/var/amavis"