Adding gcc 4.4 compile fix by Victor Ostorga. Closes #272625

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 28 insertions, 17 deletions

diff --git a/app-benchmarks/acovea/ChangeLog b/app-benchmarks/acovea/ChangeLog
index db05a219d255..1416528cc9c8 100644
--- a/app-benchmarks/acovea/ChangeLog
+++ b/app-benchmarks/acovea/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/acovea
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/ChangeLog,v 1.17 2009/06/03 07:27:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/ChangeLog,v 1.18 2009/06/28 22:52:34 patrick Exp $
+
+  28 Jun 2009; Patrick Lauer <patrick@gentoo.org> acovea-5.1.1.ebuild,
+  +files/acovea-5.1.1-gcc44.patch:
+  Adding gcc 4.4 compile fix by Victor Ostorga. Closes #272625
 
   03 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> acovea-5.1.1.ebuild:
   Request automake 1.9 otherwise eautomake fails.
diff --git a/app-benchmarks/acovea/Manifest b/app-benchmarks/acovea/Manifest
index f3df202aab95..bed6646253ce 100644
--- a/app-benchmarks/acovea/Manifest
+++ b/app-benchmarks/acovea/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX acovea-5.1.1-asneeded.patch 517 RMD160 2296fbb0f51978d762c404781defd046a15f7870 SHA1 4e319f97eda12087fab021f7260dd0ad6b7ff2cb SHA256 1efc7bc4ca24e65d6f7aeae0cc33f54f88c48a05e73a31eda3603dd36b540226
 AUX acovea-5.1.1-free-fix.patch 343 RMD160 d2b571fe6d6c056d39d1c1c1be523c933061c91d SHA1 76121bfe71cef485005a09d681f8cbd24ed5bd6d SHA256 2c5793a2a096300d53ae51d7d99254a808f397b4dc1fb9428005d4b826bd3853
+AUX acovea-5.1.1-gcc44.patch 488 RMD160 80d443015a6c1acd915c510d9b3338149c7fd655 SHA1 77e25e872343b597f27a6e13f1cd9c541734d430 SHA256 98a6e1994e32f535e631d74e624eb3e87d024eb585d50cd1ca049e4a15d2af46
 AUX acovea-5.1.1-libevocosm.patch 3596 RMD160 cfc94b833af37a4896f0332b772077bf31b068df SHA1 ee7c349b0e77a1c22300d5ba5f6809b47f9b8469 SHA256 6c8755a5a68958567912d896af5ab69686b56fb337bb7a24034ae9db8b18b818
 DIST libacovea-5.1.1.tar.gz 363048 RMD160 1baad6a9cd1c536243544d62c6479381d7e5ae04 SHA1 5bfb06cb25d1bab1c5f5f30104b67e5d64c5f2ae SHA256 e84167ac683e6bf7720bd3edf1fc60e77961eb489d31fa2c1d0a34e7d67ae079
-EBUILD acovea-5.1.1.ebuild 952 RMD160 4b146ecd4706a44d0cde7ee73f80efd26d07c945 SHA1 0a44dbb38bd4958116e75ee72cc24f671697a12b SHA256 e66a55791ea673a4debb5f4009b3918812073873289f5975d1797d4a9952bd25
-MISC ChangeLog 2279 RMD160 96e2f7e16b4b98b902567dda83de6ef71c93ea22 SHA1 2ae56265b18bf99cb9840ecd038bfb8bbfdebaf7 SHA256 bea2beddcbc0b0098c1d3ae9e87b3b2c303005536b67e30db482fb5619885c3f
+EBUILD acovea-5.1.1.ebuild 976 RMD160 a8a50c8a0d9046c9667d6e8f4956f31982f32084 SHA1 1a0bff398143d322b729a532ac2f55965b193459 SHA256 b0085e3cb61c28bea7af9d6eb239542d757e1444a44fba735c731c30cb85710e
+MISC ChangeLog 2447 RMD160 248c70affb14d52894f2bab62b97854bcce9d446 SHA1 86ee14661cf0566d1316ec3267afe8ca77f6d2b8 SHA256 117bea727faefbad3a8312883a634a47add83707c974dcbf307fe8b702397886
 MISC metadata.xml 258 RMD160 3c3d1775f27c0635f4e57c85319f4058e3e719b1 SHA1 aaffc49ff87f937b3991a0d692250eca6f393ed6 SHA256 6b80bacd73563c7530978566cf2c81ca5fdb9eef54058a4f75ee0e272043283c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkomJeEACgkQAiZjviIA2XjDagCcD3oP9AnIvk1pR2B14IZ/5Bc0
-eL8AoNeMZ38gipTWtHFQJjE5mcAILpUm
-=0lIC
------END PGP SIGNATURE-----
diff --git a/app-benchmarks/acovea/acovea-5.1.1.ebuild b/app-benchmarks/acovea/acovea-5.1.1.ebuild
index e28e01e09692..65485eb39f4a 100644
--- a/app-benchmarks/acovea/acovea-5.1.1.ebuild
+++ b/app-benchmarks/acovea/acovea-5.1.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-5.1.1.ebuild,v 1.7 2009/06/03 07:27:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-5.1.1.ebuild,v 1.8 2009/06/28 22:52:34 patrick Exp $
+
+EAPI="2"
 
 WANT_AUTOMAKE=1.9
 
@@ -22,11 +24,10 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/lib${P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-asneeded.patch
 	epatch "${FILESDIR}"/${P}-free-fix.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 	if has_version ">=dev-libs/libevocosm-3.3.0" ; then
 		epatch ${FILESDIR}"/${P}-libevocosm.patch"
 	fi
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-gcc44.patch b/app-benchmarks/acovea/files/acovea-5.1.1-gcc44.patch
new file mode 100644
index 000000000000..ee95724d1070
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-gcc44.patch
@@ -0,0 +1,15 @@
+diff -NrU5 libacovea-5.1.1.original/libacovea/acovea.cpp libacovea-5.1.1/libacovea/acovea.cpp
+--- libacovea-5.1.1.original/libacovea/acovea.cpp	2009-06-07 23:53:01.000000000 -0600
++++ libacovea-5.1.1/libacovea/acovea.cpp	2009-06-07 23:53:51.000000000 -0600
+@@ -44,10 +44,11 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
+ #include <vector>
++#include <cstdio>
+ #include <cstring>
+ #include <sstream>
+ #include <iostream>
+ #include <iomanip>
+ #include <stdexcept>