Depend on gmp library unconditionally. Bug #169059, reported by Rob Terhaar <rterhaar at allovermedia.com>.

Package-Manager: portage-2.1.2-r11

4 files changed, 27 insertions, 24 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 2556f0b5bfa1..4d78460b2c6f 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.207 2007/03/02 15:18:08 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.208 2007/03/03 11:49:36 ticho Exp $
+
+  03 Mar 2007; Andrej Kacian <ticho@gentoo.org> clamav-0.90.ebuild,
+  clamav-0.90.1.ebuild:
+  Depend on gmp library unconditionally. Bug #169059, reported by Rob Terhaar
+  <rterhaar at allovermedia.com>.
 
 *clamav-0.90.1 (02 Mar 2007)
 
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 33b2f0a0a897..9281788f60ee 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -46,18 +46,18 @@ EBUILD clamav-0.88.7.ebuild 3432 RMD160 e96b060fd6cdb828ed19f25fcb66606a09949c27
 MD5 28a0ef2c2910d9e96558ca1c3e33f239 clamav-0.88.7.ebuild 3432
 RMD160 e96b060fd6cdb828ed19f25fcb66606a09949c27 clamav-0.88.7.ebuild 3432
 SHA256 cee9e104b7e6a6f3c2d4659b6b92825ece9078ff941b91ceac1b29ed0c245a78 clamav-0.88.7.ebuild 3432
-EBUILD clamav-0.90.1.ebuild 4253 RMD160 99602a1820a3c21ff858c40a31d1ee6b97c6b554 SHA1 074d84eccf41d027879693e7f778a466064fdc0f SHA256 b4419cc7d1131ff1d3f61eabf859552deee54e00f098dddbe268af3e7b8f7da8
-MD5 d1487a0ea3b6eef8de1380e21dbbdfcf clamav-0.90.1.ebuild 4253
-RMD160 99602a1820a3c21ff858c40a31d1ee6b97c6b554 clamav-0.90.1.ebuild 4253
-SHA256 b4419cc7d1131ff1d3f61eabf859552deee54e00f098dddbe268af3e7b8f7da8 clamav-0.90.1.ebuild 4253
-EBUILD clamav-0.90.ebuild 3960 RMD160 090411bc9162ea3b2cc9044436bfc4073fabf779 SHA1 8389f458f0acdfe7ecf44aa812906c965f14ac15 SHA256 8b753ad510bb8414b8dc59681b206ab112f0ba86ac4348d443c8bb63077681d7
-MD5 d32f863ef2d82845cf6a7397a7ca74b7 clamav-0.90.ebuild 3960
-RMD160 090411bc9162ea3b2cc9044436bfc4073fabf779 clamav-0.90.ebuild 3960
-SHA256 8b753ad510bb8414b8dc59681b206ab112f0ba86ac4348d443c8bb63077681d7 clamav-0.90.ebuild 3960
-MISC ChangeLog 32475 RMD160 19957cc784da089d4e2849cec453d0c4bb70a168 SHA1 6e23e3e1fb6db5a9a472ea7bb91b35f4151a89d1 SHA256 691d53a9392466f636f8d802ad7d054d9eeda1746d2b0e07a817db821f64c0b5
-MD5 d718df92e05604b6a8f039b83603d031 ChangeLog 32475
-RMD160 19957cc784da089d4e2849cec453d0c4bb70a168 ChangeLog 32475
-SHA256 691d53a9392466f636f8d802ad7d054d9eeda1746d2b0e07a817db821f64c0b5 ChangeLog 32475
+EBUILD clamav-0.90.1.ebuild 4213 RMD160 53fbd93f6c46e3406941cfadf8133da673ba1ecb SHA1 f29c247e1024436549a946d28acf810752586846 SHA256 8b1e2defe423f11448befbd772dba9823f4fef3f2f90707c56f470c320aebfa5
+MD5 80eaa8415a2a9fa60c4432f22dc26cf9 clamav-0.90.1.ebuild 4213
+RMD160 53fbd93f6c46e3406941cfadf8133da673ba1ecb clamav-0.90.1.ebuild 4213
+SHA256 8b1e2defe423f11448befbd772dba9823f4fef3f2f90707c56f470c320aebfa5 clamav-0.90.1.ebuild 4213
+EBUILD clamav-0.90.ebuild 3921 RMD160 633d0a020576b51857e586d54ada4914273a7fa4 SHA1 06da79472bf55ae19c30a45dc0601d0b7a47b8a7 SHA256 380d2e3d88ccb398966ce3f4eb2bda300ad0ad875da477efbe8f90e052ca6269
+MD5 7d9228731f4340580dd1bb09b760be82 clamav-0.90.ebuild 3921
+RMD160 633d0a020576b51857e586d54ada4914273a7fa4 clamav-0.90.ebuild 3921
+SHA256 380d2e3d88ccb398966ce3f4eb2bda300ad0ad875da477efbe8f90e052ca6269 clamav-0.90.ebuild 3921
+MISC ChangeLog 32680 RMD160 7480d1ff3d630decad329227f24565361e67807c SHA1 b7685b1a94436e71bfa8090bcb6d89d2b5a3b4d6 SHA256 89057bdfe27c7e189cd0096e05e9c7d8756f614a0c83d27add3794727562a8e2
+MD5 49aed005e28c31c1690d23e47f26b464 ChangeLog 32680
+RMD160 7480d1ff3d630decad329227f24565361e67807c ChangeLog 32680
+SHA256 89057bdfe27c7e189cd0096e05e9c7d8756f614a0c83d27add3794727562a8e2 ChangeLog 32680
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -86,7 +86,7 @@ SHA256 be92b57874b8c81e9831142039d6ee58ab3aaf3feae75d26a4a5d1d821a21757 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF6EA+QlM6RnzZP+IRAmcXAJ9YVjHjiksS6nQVV89bnCtDfDekLgCgkyow
-QIrcfAe9xGMh8eyan5748sg=
-=8K9y
+iD8DBQFF6WDfQlM6RnzZP+IRAhPFAJ9fFoVBa+68L0roEAeoAbJYlTWOBQCfbfMm
+u0UXTKXr/iDLvqZMKH1zyt0=
+=9P4I
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.90.1.ebuild b/app-antivirus/clamav/clamav-0.90.1.ebuild
index 898828ed66a9..c18704723cb1 100644
--- a/app-antivirus/clamav/clamav-0.90.1.ebuild
+++ b/app-antivirus/clamav/clamav-0.90.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/app-antivirus/clamav/clamav-0.90.1.ebuild,v 1.1 2007/03/02 15:18:08 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90.1.ebuild,v 1.2 2007/03/03 11:49:36 ticho Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
@@ -11,14 +11,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 crypt curl gmp logrotate mailwrapper milter selinux"
+IUSE="bzip2 crypt curl logrotate mailwrapper milter selinux"
 
 DEPEND="virtual/libc
 	bzip2? ( app-arch/bzip2 )
 	crypt? ( >=dev-libs/gmp-4.1.2 )
 	curl? ( >=net-misc/curl-7.10.0 )
-	gmp? ( dev-libs/gmp )
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	dev-libs/gmp
 	>=sys-libs/zlib-1.2.1-r3
 	>=sys-apps/sed-4"
 RDEPEND="${DEPEND}
@@ -66,7 +66,6 @@ src_compile() {
 	econf ${myconf} \
 		$(use_enable bzip2) \
 		$(use_with curl libcurl) \
-		$(use_enable gmp dsig) \
 		--disable-experimental \
 		--with-dbdir=/var/lib/clamav || die
 	emake || die
diff --git a/app-antivirus/clamav/clamav-0.90.ebuild b/app-antivirus/clamav/clamav-0.90.ebuild
index 8866603e526b..f864ae2890ff 100644
--- a/app-antivirus/clamav/clamav-0.90.ebuild
+++ b/app-antivirus/clamav/clamav-0.90.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/app-antivirus/clamav/clamav-0.90.ebuild,v 1.9 2007/02/25 11:27:25 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90.ebuild,v 1.10 2007/03/03 11:49:36 ticho Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
@@ -11,14 +11,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="bzip2 crypt curl gmp logrotate mailwrapper milter selinux"
+IUSE="bzip2 crypt curl logrotate mailwrapper milter selinux"
 
 DEPEND="virtual/libc
 	bzip2? ( app-arch/bzip2 )
 	crypt? ( >=dev-libs/gmp-4.1.2 )
 	curl? ( >=net-misc/curl-7.10.0 )
-	gmp? ( dev-libs/gmp )
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	dev-libs/gmp
 	>=sys-libs/zlib-1.2.1-r3
 	>=sys-apps/sed-4"
 RDEPEND="${DEPEND}
@@ -66,7 +66,6 @@ src_compile() {
 	econf ${myconf} \
 		$(use_enable bzip2) \
 		$(use_with curl libcurl) \
-		$(use_enable gmp dsig) \
 		--disable-experimental \
 		--with-dbdir=/var/lib/clamav || die
 	emake || die