Fix build with gcc-4.7 (bug #412349 by Alphat-PC).

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 45 insertions, 9 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index f3f3a4898a20..806dc662fc7c 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.415 2012/05/31 03:01:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.416 2012/05/31 15:44:58 radhermit Exp $
+
+  31 May 2012; Tim Harder <radhermit@gentoo.org> clamav-0.97.4.ebuild,
+  +files/clamav-0.97.4-gcc47.patch:
+  Fix build with gcc-4.7 (bug #412349 by Alphat-PC).
 
   31 May 2012; Zac Medico <zmedico@gentoo.org> clamav-0.97.3.ebuild,
   clamav-0.97.4.ebuild:
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index ebe5f52e07b0..d585e432db51 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX clamav-0.97-nls.patch 269 RMD160 038abf3964f555f909a33b627546a3260479f356 SHA1 c9bc151ff7c029718feae91f6e0d0f6b25bea337 SHA256 088b9edcdb678ce9c072042cf51266e061ab5f5ab0e8e42bd953242138c64fd1
+AUX clamav-0.97.4-gcc47.patch 875 RMD160 1d69232eef0268151a8afc46a109933b7871fe9f SHA1 334798fc11c12e06406f76b758b4fc70b184915d SHA256 62a54f42bcb068953f7af80d52b3e03b5506408695c09b87b29abfb8dd3ca7b9
 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
@@ -9,13 +10,17 @@ AUX clamd.rc 2847 RMD160 883fcfeec1c5da6d3478c8591e0381265b8ded5b SHA1 93bc09b2c
 DIST clamav-0.97.3.tar.gz 45793398 RMD160 9fee55f0b115fafa622e1092483e380afd0dc5b9 SHA1 263c7b8b7dc1536652ab64e32263d1c60e138655 SHA256 3a8cece5b7e6b15410f6b8f96ff5591b2c5a72f290ee8a28fefda44cb5ae7aba
 DIST clamav-0.97.4.tar.gz 48386114 RMD160 a8da7621d6c8bce05adf2521f082b3e5e94dd9e1 SHA1 56f90cf8a73acba8f97beca86b42c65c3923935d SHA256 958dd09c9da9ceb50c9e556b3ced9cbdf40e836d2bdc98286ce96e84fd4a5a53
 EBUILD clamav-0.97.3.ebuild 3631 RMD160 879b42ff44465b1b45b676975d9d86fb5833ddd4 SHA1 13af6ed4597a32108ddefb86c1301c0a2cea76e3 SHA256 50f6f775d254bc9c85689ad22b7cdf262ea87c0da9e88d680c85360415b2d6e4
-EBUILD clamav-0.97.4.ebuild 3638 RMD160 13bc9f02c1fce872800b2a0ef792ea6ec1e27711 SHA1 1f933e30f76140c3767b01da358b46ab875ecd90 SHA256 9c3b5da009c408086eb08571c605e9a3208dbbffabb15723aa2fe539ad4130ba
-MISC ChangeLog 61214 RMD160 8753ce1e438c8192a6dcf6351e9dd69362efe742 SHA1 f9c032b8d7126f02a6ac9ba2f26829f243203d1e SHA256 f666cf87af766766004b04a60664527e7dbc0184c900f7e4475e4e22b80d7529
+EBUILD clamav-0.97.4.ebuild 3681 RMD160 733a552f4b62777ec781d86d188dbeabda824370 SHA1 bec0acdb25424d437f6126c26d73619af7ca570f SHA256 0c710c93eec32d44d28ea7940892d157e2224f5e42310a4bc272275933471019
+MISC ChangeLog 61377 RMD160 ef3faf96d29175e98acce8281e33099ac91d0d1b SHA1 3af460f7820f5a8b763ea91eee06516a0113242c SHA256 2b75ec1a0e1f5dce5d03c1b2d3af0247e0120174cd1aa940108007c9388a8f93
 MISC metadata.xml 320 RMD160 3546393e30d87f0b0a2fb17e2f15f57dd8c19661 SHA1 b959e38933418e6fc818ed40cd9a4921b8c66102 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/G3ykACgkQ/ejvha5XGaPpbACeKKDlTO2kuORQkP+tNVDTK1ZF
-1vwAoO+CNu4QJ8Sg25hCykhIvDWAO8bt
-=S55I
+iQEcBAEBCgAGBQJPx5IAAAoJEEqz6FtPBkyjMLMH+we1HTSLKRulkG5d8A+24xp9
+T6sVWVxYlodD7DShspQNAwHtyDJRQVjk0+h2j1BN2SAhZlleGYEa6uZ8TrGLXaD3
+3cnkK1bWmv8i1d/jJLmxvvWXwZgwKS7YLQoZe7VPZ3szuuAQaQYTk1lSdgqwLovm
+ZFPut7b72iplsTT9ZMTYFslNVFht84eh4hcBOK+1O/GSh7cN2zFsYi4hMvAk+xjg
+xgAE3yuuZ6G4pywhpySisVp82KmWRsKdAmq6f0Epu+R6rUZYXidg3vl4nIcGndjK
+z2sWd2S1yoCOMVUnF9WDBTKBzoLqCuk71kE/5lm7IdnmqR53NtllcabAghvmrNc=
+=u+cB
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.97.4.ebuild b/app-antivirus/clamav/clamav-0.97.4.ebuild
index fe32690a8102..819797be4137 100644
--- a/app-antivirus/clamav/clamav-0.97.4.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.4.ebuild,v 1.3 2012/05/31 03:01:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.4.ebuild,v 1.4 2012/05/31 15:44:58 radhermit Exp $
 
 EAPI=4
 
@@ -31,7 +31,10 @@ RESTRICT="test"
 
 DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
 
-PATCHES=( "${FILESDIR}"/${PN}-0.97-nls.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.97-nls.patch
+	"${FILESDIR}"/${PN}-0.97.4-gcc47.patch
+)
 
 pkg_setup() {
 	enewgroup clamav
diff --git a/app-antivirus/clamav/files/clamav-0.97.4-gcc47.patch b/app-antivirus/clamav/files/clamav-0.97.4-gcc47.patch
new file mode 100644
index 000000000000..d5cbf2eb8f9f
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.97.4-gcc47.patch
@@ -0,0 +1,24 @@
+From bb8ab5ce7ea4e276c310f5a638cd61c0cceb47d1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin@clamav.net>
+Date: Mon, 14 May 2012 20:13:21 +0300
+Subject: [PATCH] Fix build with gcc-4.7
+
+---
+ .../c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
+index 274f816..a4e7eee 100644
+--- a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
++++ b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
+@@ -19,6 +19,7 @@
+ #include "llvm/Support/ErrorHandling.h"
+ #include "llvm/System/DynamicLibrary.h"
+ #include "llvm/Config/config.h"
++#include <unistd.h>
+ using namespace llvm;
+ 
+ // AtExitHandlers - List of functions to call when the program exits,
+-- 
+1.7.8.6
+