Fix building with recent glibc wrt #336260 by Diego E. Pettenò.

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

4 files changed, 31 insertions, 13 deletions

diff --git a/app-benchmarks/acovea/ChangeLog b/app-benchmarks/acovea/ChangeLog
index 1416528cc9c8..b452fdacd279 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.18 2009/06/28 22:52:34 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/ChangeLog,v 1.19 2010/09/06 23:22:02 ssuominen Exp $
+
+  06 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> acovea-5.1.1.ebuild,
+  +files/acovea-5.1.1-glibc-212.patch:
+  Fix building with recent glibc wrt #336260 by Diego E. Pettenò.
 
   28 Jun 2009; Patrick Lauer <patrick@gentoo.org> acovea-5.1.1.ebuild,
   +files/acovea-5.1.1-gcc44.patch:
diff --git a/app-benchmarks/acovea/Manifest b/app-benchmarks/acovea/Manifest
index bed6646253ce..5727ba3f1830 100644
--- a/app-benchmarks/acovea/Manifest
+++ b/app-benchmarks/acovea/Manifest
@@ -1,8 +1,9 @@
 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-glibc-212.patch 231 RMD160 2ec39812b7cfa8a3fa3935e1541f6a4a269563ec SHA1 8d233ca69addb372a7d3203ee60b4c251f89a940 SHA256 6f0e34d65bf4a4938357f04489360ff555192c13f66eda1244ceaeaddf7fce83
 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 976 RMD160 a8a50c8a0d9046c9667d6e8f4956f31982f32084 SHA1 1a0bff398143d322b729a532ac2f55965b193459 SHA256 b0085e3cb61c28bea7af9d6eb239542d757e1444a44fba735c731c30cb85710e
-MISC ChangeLog 2447 RMD160 248c70affb14d52894f2bab62b97854bcce9d446 SHA1 86ee14661cf0566d1316ec3267afe8ca77f6d2b8 SHA256 117bea727faefbad3a8312883a634a47add83707c974dcbf307fe8b702397886
+EBUILD acovea-5.1.1.ebuild 1021 RMD160 3ed2d8034a133f051f29f9e3dce667a84e826a3d SHA1 92fb4075f8a7062c20d2a020db2e8088ebd50c5e SHA256 01ec35c102d0374b21eeb76d67f30162b8c20a96aefc6f96e5c2096fd2e5f4e8
+MISC ChangeLog 2631 RMD160 e607f4f232a80468d73363cf072e71307cdef7dc SHA1 652dd79029e83f2f6f73a716e4784d6c03c7016c SHA256 d795a6b130b05b240126728a0e6e0d8d11a296e2fb01767b05f5084b9d5db613
 MISC metadata.xml 258 RMD160 3c3d1775f27c0635f4e57c85319f4058e3e719b1 SHA1 aaffc49ff87f937b3991a0d692250eca6f393ed6 SHA256 6b80bacd73563c7530978566cf2c81ca5fdb9eef54058a4f75ee0e272043283c
diff --git a/app-benchmarks/acovea/acovea-5.1.1.ebuild b/app-benchmarks/acovea/acovea-5.1.1.ebuild
index 65485eb39f4a..1cdf45e1adbd 100644
--- a/app-benchmarks/acovea/acovea-5.1.1.ebuild
+++ b/app-benchmarks/acovea/acovea-5.1.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.8 2009/06/28 22:52:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-5.1.1.ebuild,v 1.9 2010/09/06 23:22:02 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 
 WANT_AUTOMAKE=1.9
 
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm"
 HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
@@ -25,16 +25,17 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/lib${P}
 
 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}-asneeded.patch \
+		"${FILESDIR}"/${P}-free-fix.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-glibc-212.patch
+	if has_version ">=dev-libs/libevocosm-3.3.0"; then
 		epatch ${FILESDIR}"/${P}-libevocosm.patch"
 	fi
 	eautomake
 }
 
 src_install() {
-	make DESTDIR="${D}" install
+	emake DESTDIR="${D}" install || die
 	dodoc ChangeLog NEWS README
 }
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-glibc-212.patch b/app-benchmarks/acovea/files/acovea-5.1.1-glibc-212.patch
new file mode 100644
index 000000000000..9763951a672a
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-glibc-212.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/336260
+
+--- libacovea/acovea.cpp
++++ libacovea/acovea.cpp
+@@ -44,6 +44,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <sys/stat.h>
+ 
+ #include <vector>
+ #include <cstring>