From: Tuan Van <langthang@gentoo.org>
Date: Wed, 22 Dec 2004 20:04:34 +0000 (+0000)
Subject: x86 stable and more. See ChangeLog.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ab86db4ef9d3e1daeed1192f9e7bc6c245d6e64;p=gentoo.git

x86 stable and more. See ChangeLog.
---

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index a6a79bb382ad..40a9e23805c4 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.13 2004/10/02 16:24:26 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.14 2004/12/22 20:04:34 langthang Exp $
+
+  22 Dec 2004; Tuan Van <langthang@gentoo.org> amavisd-new-20040701.ebuild:
+  add app-arch/cabextract to RDEPEND. Bug #65248.
+  apply courier patch. Bug #52291.
+  stable on x86 in preparing to abandon date versioning scheme.
 
   02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
   amavisd-new-20040701.ebuild:
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 3828476b2515..33b49ec129ae 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,13 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 8f6932db0e432e589c41d9928d4198a0 amavisd-new-20030616_p8.ebuild 2630
-MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
+MD5 98457f45127cfb912d090d1cee155933 amavisd-new-20040701.ebuild 4463
 MD5 1417aabd41c7b66e06f012fac0edad91 amavisd-new-20030616_p9.ebuild 2901
-MD5 b2536e71ba7495c5b71e9a21e20b4db5 amavisd-new-20040701.ebuild 4253
-MD5 e30721ec036b59221eaaae75607954d9 ChangeLog 6177
+MD5 105f4bd9354dcbc839f1b6ae11977f5a ChangeLog 6406
+MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 MD5 be145e653e6eb0e6bc8acea937573cb2 files/amavisd.conf 85678
-MD5 b9ac0b985d0cb7da0ab45fa22ebe38c8 files/lost_connection.patch 567
-MD5 3256d64018bee64fa34ed62fb93e44af files/sql_timeout.patch 3282
-MD5 0c677a1cb17705ea75841cabd5d14634 files/digest-amavisd-new-20030616_p8 75
+MD5 4b5c8018b70d0e6a8f52d37653996367 files/digest-amavisd-new-20040701 72
 MD5 1f1f4cf9c92f92f966361a8ac08aa543 files/amavisd.rc6 305
+MD5 3256d64018bee64fa34ed62fb93e44af files/sql_timeout.patch 3282
 MD5 f45025857b1aaeeb225782bf7f35c5c3 files/addr_extensions_in_sql.patch 10222
+MD5 0c677a1cb17705ea75841cabd5d14634 files/digest-amavisd-new-20030616_p8 75
 MD5 0a2364d819d448c49ea72dfe8c2a109a files/digest-amavisd-new-20030616_p9 75
-MD5 4b5c8018b70d0e6a8f52d37653996367 files/digest-amavisd-new-20040701 72
+MD5 b9ac0b985d0cb7da0ab45fa22ebe38c8 files/lost_connection.patch 567
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFByc7K5FrxP71izLARAp2nAKDXxChTzRwi3obyibwHskZLbhjcfwCgoFXs
+mZX7JQLDQmux7RZwAYvHDrI=
+=jnU0
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-20040701.ebuild b/mail-filter/amavisd-new/amavisd-new-20040701.ebuild
index afd3399a169f..6689a2de0709 100644
--- a/mail-filter/amavisd-new/amavisd-new-20040701.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-20040701.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-20040701.ebuild,v 1.6 2004/10/02 16:24:26 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-20040701.ebuild,v 1.7 2004/12/22 20:04:34 langthang Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${PN}-${PV/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha"
+KEYWORDS="x86 ~ppc ~amd64 ~sparc ~alpha"
 IUSE="ldap mysql postgres milter"
 
 DEPEND=">=sys-apps/sed-4
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}
 	app-arch/gzip
 	app-arch/bzip2
 	app-arch/arc
+	app-arch/cabextract
 	app-arch/freeze
 	app-arch/lha
 	app-arch/unarj
@@ -53,6 +54,15 @@ S="${WORKDIR}/${PN}-${PV/_*/}"
 
 AMAVIS_ROOT=/var/amavis
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if $(has_version mail-mta/courier) ; then
+		einfo "Patching with courier support."
+		epatch "amavisd-new-courier.patch" || die "patch failed"
+	fi
+}
+
 src_compile() {
 	if use milter ; then
 		cd "${S}/helper-progs"