Depend on either libmilter or sendmail also in 0.90 RC ebuilds. Bug #152541 by Milan Holzäpfel <public at mjh.name>.

Package-Manager: portage-2.1.2_rc1-r1

4 files changed, 25 insertions, 20 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 3937b794c33e..d7029235dd51 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.177 2006/11/05 20:06:14 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.178 2006/11/05 20:09:17 ticho Exp $
+
+  05 Nov 2006; Andrej Kacian <ticho@gentoo.org> clamav-0.90_rc1.ebuild,
+  clamav-0.90_rc2.ebuild:
+  Depend on either libmilter or sendmail also in 0.90 RC ebuilds. Bug #152541
+  by Milan Holzäpfel <public at mjh.name>.
 
 *clamav-0.88.6 (05 Nov 2006)
 
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 2d86fe23ace3..465e7092e3fc 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -25,18 +25,18 @@ EBUILD clamav-0.88.6.ebuild 3435 RMD160 739df06aebb701792e13afd543d4af85c68771c3
 MD5 8a5a66beb8e8979481cdfb7b4d2f26ab clamav-0.88.6.ebuild 3435
 RMD160 739df06aebb701792e13afd543d4af85c68771c3 clamav-0.88.6.ebuild 3435
 SHA256 c8695549c8d5ca2ea731f28d94ec8c99b1d874f7e00ac6b7d8fb5f9e09a06f11 clamav-0.88.6.ebuild 3435
-EBUILD clamav-0.90_rc1.ebuild 3600 RMD160 ec680a7013ea787e2d43ccb316c1c41d65827244 SHA1 d76eecb58c026fb4d24d7bc7dcae11e3e5fb145c SHA256 bc76f52623de2d8e7514569da2b63f0d90efae6e5823f805f22c8e7f8684e178
-MD5 8167dff09b4f03ec6d803676ad63b63a clamav-0.90_rc1.ebuild 3600
-RMD160 ec680a7013ea787e2d43ccb316c1c41d65827244 clamav-0.90_rc1.ebuild 3600
-SHA256 bc76f52623de2d8e7514569da2b63f0d90efae6e5823f805f22c8e7f8684e178 clamav-0.90_rc1.ebuild 3600
-EBUILD clamav-0.90_rc2.ebuild 3592 RMD160 d5f28da6ad030db324c45c1980878216ffe0310f SHA1 e80991c2ddcde0f4ddb775f3d1210f74623a57fb SHA256 a43390128c1d70d6c44b1a6c7e627f043fe731d05ffcf6c8662cd800079b9b37
-MD5 ec9b4eb7bb44a0bacfee79c547abfde5 clamav-0.90_rc2.ebuild 3592
-RMD160 d5f28da6ad030db324c45c1980878216ffe0310f clamav-0.90_rc2.ebuild 3592
-SHA256 a43390128c1d70d6c44b1a6c7e627f043fe731d05ffcf6c8662cd800079b9b37 clamav-0.90_rc2.ebuild 3592
-MISC ChangeLog 27893 RMD160 a28762b8b82dfeefb7c935fc5f316a778eb2d52f SHA1 1161eda9fb2c47f2662e63e3e78a4a5e99116919 SHA256 fcb1a1afb92336efe834e3f0317e254312c48766878a36d537dccbd5a12d81f2
-MD5 fbb53e6265754eddc9a15a57319b437c ChangeLog 27893
-RMD160 a28762b8b82dfeefb7c935fc5f316a778eb2d52f ChangeLog 27893
-SHA256 fcb1a1afb92336efe834e3f0317e254312c48766878a36d537dccbd5a12d81f2 ChangeLog 27893
+EBUILD clamav-0.90_rc1.ebuild 3625 RMD160 4e6b66d56697ee318ecd1b2a1bb9c262414c3dcb SHA1 8415c7471f7a28615bdff027540c985c935f038c SHA256 285ccca14e99e1c36a6a8a10827fc90e8d9afea16af8ddf7bf1d20e4e0422165
+MD5 8e5f3d6a6998b3389efbaf509ae78ade clamav-0.90_rc1.ebuild 3625
+RMD160 4e6b66d56697ee318ecd1b2a1bb9c262414c3dcb clamav-0.90_rc1.ebuild 3625
+SHA256 285ccca14e99e1c36a6a8a10827fc90e8d9afea16af8ddf7bf1d20e4e0422165 clamav-0.90_rc1.ebuild 3625
+EBUILD clamav-0.90_rc2.ebuild 3617 RMD160 290333bb8e9f3883348eba81c02d6fc16211cf6f SHA1 285b4833f1e18057103e469783073189f1feb67f SHA256 ae6bdd2c01cdebc1d0f33918c9b4e7e897ca57cdf34e1510bef9227def2e2cea
+MD5 f0d5f9953ea3425600104e0b5f3f2efe clamav-0.90_rc2.ebuild 3617
+RMD160 290333bb8e9f3883348eba81c02d6fc16211cf6f clamav-0.90_rc2.ebuild 3617
+SHA256 ae6bdd2c01cdebc1d0f33918c9b4e7e897ca57cdf34e1510bef9227def2e2cea clamav-0.90_rc2.ebuild 3617
+MISC ChangeLog 28114 RMD160 a4875f2c2273de450032e83f0123dec4d5634c50 SHA1 1212ef993dd429af03885e21091297f400b501b0 SHA256 1b3c38df7d591b51f0f1b9bbb15c0dcefbc6c6601fd6dd98703c0395d15535da
+MD5 e44fb44483c1c59f2c40d981e4238b5c ChangeLog 28114
+RMD160 a4875f2c2273de450032e83f0123dec4d5634c50 ChangeLog 28114
+SHA256 1b3c38df7d591b51f0f1b9bbb15c0dcefbc6c6601fd6dd98703c0395d15535da ChangeLog 28114
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -56,7 +56,7 @@ SHA256 c0187965a68f4423a6d8937f911dde49a724751f436f51741c150f4ac5ee16b6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFTkRCQlM6RnzZP+IRAuueAKCuScwP3g4Ygol5TbWwTeVnczPyyACgmPTv
-6jQmHci5AiQWbuw732RmxsU=
-=CrdI
+iD8DBQFFTkUjQlM6RnzZP+IRAgIzAKCAXMQiWXlO4JU4/4nNe4M/DanUEQCcDrGu
+l/acr/G2rvMjY2l+HV4kFH4=
+=1uma
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.90_rc1.ebuild b/app-antivirus/clamav/clamav-0.90_rc1.ebuild
index 8c102e5a36ce..5c5b9e11ab02 100644
--- a/app-antivirus/clamav/clamav-0.90_rc1.ebuild
+++ b/app-antivirus/clamav/clamav-0.90_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90_rc1.ebuild,v 1.2 2006/10/16 11:02:09 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90_rc1.ebuild,v 1.3 2006/11/05 20:09:17 ticho Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
@@ -16,7 +16,7 @@ IUSE="crypt milter selinux mailwrapper"
 
 DEPEND="virtual/libc
 	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( mail-mta/sendmail )
+	milter? || ( mail-filter/libmilter mail-mta/sendmail )
 	>=sys-libs/zlib-1.2.1-r3
 	>=net-misc/curl-7.10.0
 	>=sys-apps/sed-4"
diff --git a/app-antivirus/clamav/clamav-0.90_rc2.ebuild b/app-antivirus/clamav/clamav-0.90_rc2.ebuild
index 229c1132d954..1f52b2787e34 100644
--- a/app-antivirus/clamav/clamav-0.90_rc2.ebuild
+++ b/app-antivirus/clamav/clamav-0.90_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90_rc2.ebuild,v 1.1 2006/10/31 01:07:21 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90_rc2.ebuild,v 1.2 2006/11/05 20:09:17 ticho Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
@@ -16,7 +16,7 @@ IUSE="crypt milter selinux mailwrapper"
 
 DEPEND="virtual/libc
 	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( mail-mta/sendmail )
+	milter? || ( mail-filter/libmilter mail-mta/sendmail )
 	>=sys-libs/zlib-1.2.1-r3
 	>=net-misc/curl-7.10.0
 	>=sys-apps/sed-4"