Depend on either app-arch/rar or app-arch/unrar, since they both provide the unrar binary which amavis uses. Bug #202919 by Frittella Laurento <mrfree at infinito.it>.

(Portage version: 2.1.4_rc9)

4 files changed, 13 insertions, 7 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 7c6c8b175255..fe1257ea1dd7 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,12 @@
 # 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.112 2007/12/27 12:21:42 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.113 2007/12/27 12:43:23 ticho Exp $
+
+  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:
+  Depend on either app-arch/rar or app-arch/unrar, since they both provide the
+  unrar binary which amavis uses. Bug #202919 by Frittella Laurento <mrfree at
+  infinito.it>.
 
 *amavisd-new-2.5.3 (27 Dec 2007)
 
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 77fec030f325..6ba765d8148b 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
 # 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.12 2007/12/27 12:21:42 ticho Exp $
+# $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 $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 	app-arch/freeze
 	app-arch/lha
 	app-arch/unarj
-	app-arch/unrar
+	|| ( app-arch/unrar app-arch/rar )
 	app-arch/zoo
 	dev-perl/Archive-Tar
 	>=dev-perl/Archive-Zip-1.14
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 3afc00cb1cd2..b42b0a1f8463 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
 # 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.2 2007/12/27 12:21:42 ticho Exp $
+# $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 $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 	app-arch/freeze
 	app-arch/lha
 	app-arch/unarj
-	app-arch/unrar
+	|| ( app-arch/unrar app-arch/rar )
 	app-arch/zoo
 	>=dev-perl/Archive-Zip-1.14
 	>=dev-perl/Compress-Zlib-1.35
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 6826314656a2..af4d31a1d425 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
 # 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.1 2007/12/27 12:21:42 ticho Exp $
+# $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 $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 	app-arch/freeze
 	app-arch/lha
 	app-arch/unarj
-	app-arch/unrar
+	|| ( app-arch/unrar app-arch/rar )
 	app-arch/zoo
 	>=dev-perl/Archive-Zip-1.14
 	>=dev-perl/Compress-Zlib-1.35