Added iconv support to ebuild. Added patch to fix bad dynamic linking by Raphael Marichez <falco at gentoo org>, so the build is actually usable. Bug #213762.

Package-Manager: portage-2.1.4.4

5 files changed, 60 insertions, 33 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 91a338750a68..698c83958904 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.283 2008/04/15 13:55:39 falco Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.284 2008/04/17 19:37:47 ticho Exp $
+
+  17 Apr 2008; Andrej Kacian <ticho@gentoo.org>
+  +files/clamav-0.93-buildfix.patch, files/clamav-0.93-nls.patch,
+  clamav-0.93.ebuild:
+  Added iconv support to ebuild. Added patch to fix bad dynamic linking by
+  Raphael Marichez <falco at gentoo org>, so the build is actually usable.
+  Bug #213762.
 
 *clamav-0.93 (15 Apr 2008)
 
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index d57f6025a452..bb6801d2cff1 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -6,7 +6,8 @@ AUX clamav-0.90-nls.patch 2531 RMD160 442990f305b47bd0eb4c459e9ed054612259992e S
 AUX clamav-0.91.2-CVE-2007-5759.patch 1852 RMD160 13ff700734cca239c7960dbd1a0e7a9c4c6d4b72 SHA1 48707d513348dd87ff74beaff7370a91a097acec SHA256 78ce1337e563b6db5d7604efb14aebf9b9bf02330dd67c4d50a6e231f1921e0d
 AUX clamav-0.91.2-CVE-2007-6336.patch 1002 RMD160 dd72433cba5bea2b163a09d82fc5c45d14a980ae SHA1 482fa318c9d1172c1a2b3a652936e8a417e11817 SHA256 c4a09b072fa4c4f0c3fde0c8a93984e081dd702454fd990abc93a45529b01dca
 AUX clamav-0.91.2-CVE-2007-6337.patch 891 RMD160 491e27ad67741a04891e522ec2f4f7ba25f91381 SHA1 e02199c35043a1811a077e7fb6a7044dd820d12b SHA256 d6552c8990fc82fd8072b0e331ec7c1bf4ef7f3899d2edf7a2b9991bd6f2337a
-AUX clamav-0.93-nls.patch 2427 RMD160 ed9774010e39f6b076c6236b06cb6c04a04f73c7 SHA1 97299f46c2f0c9bff3e07ee803dbc3f2812292ba SHA256 317a2b4935f199113685ed4d7bf4555e2bb67fd46c7ef2cb7fa2daeaa084c1a1
+AUX clamav-0.93-buildfix.patch 936 RMD160 ce5c8297fdbd3d9fc306003d6010dba45de89c45 SHA1 e6ed67358100019c7fc78ff454cb964549330616 SHA256 d5e45ae6f9a4faee8325bbb0cbdabb8a6023130fc4e78085415c25fcbeb6b7d2
+AUX clamav-0.93-nls.patch 2405 RMD160 b95a897cdd6a007cd6b70fde233fd29e5244ad50 SHA1 7cec15f8723f842e03f1a35ded5e094826844bde SHA256 59e44aaf1a9a0aa1d94ed2d0177e886c3376506f666587a753ef20022d049dd8
 AUX clamav-milter.README.gentoo 1124 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b SHA1 0b9b86a0e7732eaaf7f880859265754f7a4efd3a SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11
 AUX clamav.logrotate 355 RMD160 f59cd8ce96da8210aa858ee59ee3b6940e3253a6 SHA1 5fbd9364997400681d5a93cb50cac8a0f188e56f SHA256 ab91f784d5098d2162be9277e3a006bdb392d9d89975838ad4ac7dfd8b418170
 AUX clamd.conf 234 RMD160 b517b05e587637cbdd443f7ca3625d582e32722f SHA1 564b1e2f6cf85567f69f2e20cbc942967fa6304b SHA256 17bf4fe3596dc5b145e4163d85181e2edcaa214df3cf9072d852ba0e7a569891
@@ -20,17 +21,13 @@ EBUILD clamav-0.91.2.ebuild 4235 RMD160 1b50e9d66a1f75306ae8117ff8e2cb2ed86df1d4
 EBUILD clamav-0.92.1-r1.ebuild 4270 RMD160 b336c4e7bd8d6f4db47870acde83010b8c723b1f SHA1 45553748226c45c8d7dc4d0652c37823b31a8f3f SHA256 a87f065e3871d429b389c2ca20dfdfd4a0870de4b492d6c094f118bc5cac4a03
 EBUILD clamav-0.92.1.ebuild 4238 RMD160 984692c8f0655fc8937df0f2a43850d5e5abecfa SHA1 607c0124ff5f7a9171299bf1f447d55c14a706cf SHA256 08d2a538a130bf27ac0c06901bb7e0f3dea9335a7c2c84ebd9115808283cf0b2
 EBUILD clamav-0.92.ebuild 4109 RMD160 87289f95ba172c645c8afa967e09a6aa04fb0403 SHA1 aa06e152e7119cf6ded5aeea320d67f6e3591dee SHA256 676ed0507dcb0f743fa87027ec2daff4343d9a7ec4c1dcd08662150bc7266928
-EBUILD clamav-0.93.ebuild 4279 RMD160 4babef90b4e4c25198db91f74998936563ebdf8e SHA1 45d0d7dde7b08c238c4ede7d120744317406813d SHA256 a01eb4bc9ac49e7cec8eb305337783cfc1a2bfe50362d45045b69d2380a5dff1
-MISC ChangeLog 43206 RMD160 c9f715f37105cba2de41909a4636657b8da009b1 SHA1 9d1244376a9cf1c930303a32e306b3f9be4427eb SHA256 e95ccfb4a27fa0be80af7a26b8a36cee96a2b0dccf737e73ecad54b2368ee1a6
+EBUILD clamav-0.93.ebuild 4372 RMD160 f29a72af04cfbbf8e6fc68038b3958fd2675474b SHA1 bcdffb8a0a37130804e8c7241db85185b681d2c2 SHA256 6ebc72054c521b0ff68e9fa61397dc18bf4f49d9e05c3834a603fbe79aebe264
+MISC ChangeLog 43508 RMD160 73ed86a353987a4dd4113f0bc8ea1390d3d573b6 SHA1 46ab672a45b2d7f5b36002fe93e1ad90a625cb15 SHA256 e042b5ab2122bf7e45442e041594f4f1bc5439d67acc550a5f78be3c74b5b0ed
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iQEVAwUBSASz6DvRww8BFPxFAQIwOQf+L8ZiTsapo4tcunT1o8ooJvaCD/emWAd/
-p+ZFxH1cSlKlRdu0ntK2lICuZJ3XEeDtIP2uST9j0sp+XmkCdC4B0/G0tCRQsHck
-6RnxHcSYV2EcETRXzCSl79P95oRSBQqNtXho1G7VyyDz3TIRTM2Dmky1ud85SC/d
-d0HdrtMDwZu+IVW4qiJ5PyC+HVJvrkp2N//aB0nWJjtPYe85dP4VvkHSJJq08HJw
-/ZVk9kKs5IDj2pi4JWasYnHpJ3zK0lLfHuWajBJyaZ6Dz3IboWJbLLsX6KMSsWhb
-NDW/6yo9fQL6nTAIkpjzgh5kW2DUpP+zFqeOKyhKmwrSmyyLbzxwmA==
-=ECzk
+iD8DBQFIB6cgQlM6RnzZP+IRArs+AJ92Pumx5Z0sCLuWZJ3JdvC+W69rLwCfQER5
+k1zcLDXMByXx5hO8IqX6FUc=
+=FqD2
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.93.ebuild b/app-antivirus/clamav/clamav-0.93.ebuild
index d9a8a65ecf70..06a19444f4b4 100644
--- a/app-antivirus/clamav/clamav-0.93.ebuild
+++ b/app-antivirus/clamav/clamav-0.93.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/app-antivirus/clamav/clamav-0.93.ebuild,v 1.1 2008/04/15 13:55:39 falco Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.93.ebuild,v 1.2 2008/04/17 19:37:47 ticho Exp $
 
 inherit autotools eutils flag-o-matic fixheadtails multilib
 
@@ -11,12 +11,13 @@ 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 mailwrapper milter nls selinux"
+IUSE="bzip2 crypt iconv mailwrapper milter nls selinux"
 
 DEPEND="virtual/libc
 	bzip2? ( app-arch/bzip2 )
 	crypt? ( >=dev-libs/gmp-4.1.2 )
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	iconv? ( virtual/libiconv )
 	nls? ( sys-devel/gettext )
 	dev-libs/gmp
 	>=sys-libs/zlib-1.2.1-r3
@@ -41,7 +42,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.93-nls.patch
+	epatch "${FILESDIR}"/${P}-buildfix.patch
+	epatch "${FILESDIR}"/${P}-nls.patch
 	AT_M4DIR="m4" eautoreconf
 }
 
@@ -65,6 +67,7 @@ src_compile() {
 	econf ${myconf} \
 		$(use_enable bzip2) \
 		$(use_enable nls) \
+		$(use_with iconv) \
 		--disable-experimental \
 		--with-dbdir=/var/lib/clamav || die
 	emake || die
diff --git a/app-antivirus/clamav/files/clamav-0.93-buildfix.patch b/app-antivirus/clamav/files/clamav-0.93-buildfix.patch
new file mode 100644
index 000000000000..803a053f85b3
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.93-buildfix.patch
@@ -0,0 +1,21 @@
+diff -uNr clamav-0.93.orig/configure.in clamav-0.93/configure.in
+--- clamav-0.93.orig/configure.in	2008-04-17 18:40:31.041851000 +0200
++++ clamav-0.93/configure.in	2008-04-17 18:42:42.922065687 +0200
+@@ -387,7 +387,7 @@
+     LDFLAGS="$save_LDFLAGS"
+     if test "$HAVE_LIBBZ2" = "yes"; then
+ 	AC_CHECK_HEADER([bzlib.h],
+-			[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2";
++			[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2";
+ 			 AC_DEFINE([HAVE_BZLIB_H],1,[have bzip2])],
+ 			[AC_MSG_WARN([****** bzip2 support disabled])])
+     else
+@@ -498,7 +498,7 @@
+     dnl we don't need to check for __gmpz_init and mpz_init,
+     dnl since we are not checking directly for symbols
+     if test "$HAVE_LIBGMP" = "yes"; then
+-	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBGMP";
++	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp";
+     else
+ 	    AC_MSG_WARN([****** GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !]);
+ 	    want_dsig="no";
diff --git a/app-antivirus/clamav/files/clamav-0.93-nls.patch b/app-antivirus/clamav/files/clamav-0.93-nls.patch
index f082c636d06a..d2bc7ddc76fe 100644
--- a/app-antivirus/clamav/files/clamav-0.93-nls.patch
+++ b/app-antivirus/clamav/files/clamav-0.93-nls.patch
@@ -1,11 +1,11 @@
-diff -uNr -r clamav-0.93.orig/clamav-milter/clamav-milter.c clamav-0.93/clamav-milter/clamav-milter.c
---- clamav-0.93.orig/clamav-milter/clamav-milter.c	2008-04-09 17:39:18.000000000 +0200
-+++ clamav-0.93/clamav-milter/clamav-milter.c	2008-04-15 14:59:23.235003488 +0200
+diff -burN clamav-0.93/clamav-milter/clamav-milter.c clamav-0.93-nls/clamav-milter/clamav-milter.c
+--- clamav-0.93/clamav-milter/clamav-milter.c	2008-04-09 17:39:18.000000000 +0200
++++ clamav-0.93-nls/clamav-milter/clamav-milter.c	2008-04-14 18:31:36.000000000 +0200
 @@ -110,6 +110,7 @@
  
  #ifdef	C_LINUX
  #include <sys/sendfile.h>	/* FIXME: use sendfile on BSD not Linux */
-+#ifdef	ENABLE_NLS
++#ifdef ENABLE_NLS
  #include <libintl.h>
  #include <locale.h>
  
@@ -28,28 +28,27 @@ diff -uNr -r clamav-0.93.orig/clamav-milter/clamav-milter.c clamav-0.93/clamav-m
  	setlocale(LC_ALL, "");
  	bindtextdomain(progname, DATADIR"/clamav-milter/locale");
  	textdomain(progname);
-diff -uNr -r clamav-0.93.orig/configure.in clamav-0.93/configure.in
---- clamav-0.93.orig/configure.in	2008-04-09 17:40:33.000000000 +0200
-+++ clamav-0.93/configure.in	2008-04-15 15:03:43.391218848 +0200
-@@ -399,6 +399,15 @@
+diff -burN clamav-0.93/configure.in clamav-0.93-nls/configure.in
+--- clamav-0.93/configure.in	2008-04-09 17:40:33.000000000 +0200
++++ clamav-0.93-nls/configure.in	2008-04-14 18:31:36.000000000 +0200
+@@ -399,6 +399,14 @@
  [  --disable-unrar	  don't build libclamunrar and libclamunrar_iface ],
  want_unrar=$enableval, want_unrar="yes")
  
-+AC_ARG_ENABLE(nls,
-+    AC_HELP_STRING([--disable-nls], [disable nls support]),
-+    [want_nls=$enableval], [want_nls=yes]
++AC_ARG_ENABLE([nls],
++		AC_HELP_STRING([--disable-nls], [disable NLS support]),
++		[want_nls=$enableval], [want_nls=yes]
 +)
-+
 +if test $want_nls = yes; then
-+   CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
++	CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
 +fi
 +
  AC_ARG_ENABLE([dns],
      AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]),
      [want_dns=$enableval], [want_dns=yes]
-diff -uNr -r clamav-0.93.orig/shared/getopt.c clamav-0.93/shared/getopt.c
---- clamav-0.93.orig/shared/getopt.c	2008-03-06 19:41:02.000000000 +0100
-+++ clamav-0.93/shared/getopt.c	2008-04-15 15:00:51.885713837 +0200
+diff -burN clamav-0.93/shared/getopt.c clamav-0.93-nls/shared/getopt.c
+--- clamav-0.93/shared/getopt.c	2008-03-06 19:41:02.000000000 +0100
++++ clamav-0.93-nls/shared/getopt.c	2008-04-14 18:31:36.000000000 +0200
 @@ -82,7 +82,7 @@
  
  #ifndef _
@@ -59,9 +58,9 @@ diff -uNr -r clamav-0.93.orig/shared/getopt.c clamav-0.93/shared/getopt.c
  #  include <libintl.h>
  #  ifndef _
  #   define _(msgid)	gettext (msgid)
-diff -uNr -r clamav-0.93.orig/shared/output.c clamav-0.93/shared/output.c
---- clamav-0.93.orig/shared/output.c	2008-03-06 19:41:02.000000000 +0100
-+++ clamav-0.93/shared/output.c	2008-04-15 15:00:51.885713837 +0200
+diff -burN clamav-0.93/shared/output.c clamav-0.93-nls/shared/output.c
+--- clamav-0.93/shared/output.c	2008-03-06 19:41:02.000000000 +0100
++++ clamav-0.93-nls/shared/output.c	2008-04-14 18:31:36.000000000 +0200
 @@ -61,7 +61,7 @@
  pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
  #endif