Apply patch which fixes dev-libs/libevocosm issue. Patch created by John Brooks <aspecialj@gmail.com>, bug 219998

Package-Manager: portage-2.1.5.2

5 files changed, 137 insertions, 19 deletions

diff --git a/app-benchmarks/acovea/ChangeLog b/app-benchmarks/acovea/ChangeLog
index f0318f4e3c64..6ff42c11fc06 100644
--- a/app-benchmarks/acovea/ChangeLog
+++ b/app-benchmarks/acovea/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-benchmarks/acovea
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/ChangeLog,v 1.11 2008/04/21 16:31:28 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/ChangeLog,v 1.12 2008/06/01 16:58:14 pchrist Exp $
+
+  01 Jun 2008; Panagiotis Christopoulos <pchrist@gentoo.org>
+  +files/acovea-5.1.1-libevocosm.patch, acovea-5.1.1.ebuild:
+  Apply patch which fixes dev-libs/libevocosm issue. Patch created by John
+  Brooks <aspecialj@gmail.com>, bug 219998
 
   21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/app-benchmarks/acovea/Manifest b/app-benchmarks/acovea/Manifest
index 8513013d74bb..07e9bf732b16 100644
--- a/app-benchmarks/acovea/Manifest
+++ b/app-benchmarks/acovea/Manifest
@@ -1,18 +1,9 @@
------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-libevocosm.patch 3596 RMD160 cfc94b833af37a4896f0332b772077bf31b068df SHA1 ee7c349b0e77a1c22300d5ba5f6809b47f9b8469 SHA256 6c8755a5a68958567912d896af5ab69686b56fb337bb7a24034ae9db8b18b818
 DIST acovea-4.0.0.tar.gz 333627 RMD160 baf19dcf7aaeec86ae3ee174222d0ecbbd6d39e8 SHA1 047c09e3af4063ef5328e195341c551dc4418d90 SHA256 67241af576b2a8d68c2245c2c8d9211875e05848cd4a6b2e79f1ba232db2c53f
 DIST libacovea-5.1.1.tar.gz 363048 RMD160 1baad6a9cd1c536243544d62c6479381d7e5ae04 SHA1 5bfb06cb25d1bab1c5f5f30104b67e5d64c5f2ae SHA256 e84167ac683e6bf7720bd3edf1fc60e77961eb489d31fa2c1d0a34e7d67ae079
-EBUILD acovea-4.0.0.ebuild 633 RMD160 b7c222fb4e9d9b6dd8c8ed765fa8114d57daea30 SHA1 af43614fa40c7b5468ca566732af4d824190143d SHA256 1575444430b7cb7487a3f7452070e24f4f619ea59cfff681d6ba69169d6ad67b
-EBUILD acovea-5.1.1.ebuild 828 RMD160 3c6fa79c6f8bd325d7f5be797b56f3de25cd5fb5 SHA1 8b2c9599dde8231b4f4bd6d177dc49a3b3c8ccfe SHA256 d0944a62c750a4b504d31aef05d8fac924b992130789dda78b3d1ff2b2799c63
-MISC ChangeLog 1485 RMD160 a29d5bd422d745df16fcfd9352555905df2a0039 SHA1 aa605941cbe67ca65aa6f32d82e08f52fc34057a SHA256 5388bca710e25f900045be79cefc22da1b452dcbd36262c3c2a960a6f2aaae4b
+EBUILD acovea-4.0.0.ebuild 632 RMD160 24ca9702aaf592e8f44acdc413e4672f879a5532 SHA1 3128215a12d8c462b5118147c6ef64bec24cd9c4 SHA256 f286d47806546d460d6418af29e96af3f55e5fb4415b30b8e7cde2714860f880
+EBUILD acovea-5.1.1.ebuild 925 RMD160 86892728c6de2b05b305afca2fe90f9910eeeb25 SHA1 d627cc431a17ff1b76058446be65ba6d8574e148 SHA256 d1ac2a13aae43693448eb055f93c1333a81e470552b0bb891956d394568d4bc1
+MISC ChangeLog 1727 RMD160 d4a8d92f80040eb9bed9024d4eb367e8134ad766 SHA1 47ae979e7ba0ab36c3122f5dd5b41803ac7534cd SHA256 8a05e465360b1727afacce2bdd742aac11bd3811c5f4c626bc93f6b12422db87
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIDMFlyuNVb5qfaOYRAo+SAKCh+4Eb0tco4LPxMzvd7B4sGe9obgCgvFa/
-/BlGfWRJu3vN/6Q5M7V3+BA=
-=1DzN
------END PGP SIGNATURE-----
diff --git a/app-benchmarks/acovea/acovea-4.0.0.ebuild b/app-benchmarks/acovea/acovea-4.0.0.ebuild
index d85d772e7db4..b1fc400f36cb 100644
--- a/app-benchmarks/acovea/acovea-4.0.0.ebuild
+++ b/app-benchmarks/acovea/acovea-4.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-4.0.0.ebuild,v 1.6 2005/01/01 12:02:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-4.0.0.ebuild,v 1.7 2008/06/01 16:58:14 pchrist Exp $
 
 DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm"
 HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
@@ -15,6 +15,6 @@ DEPEND="dev-libs/libcoyotl
 	>=sys-devel/gcc-3.3"
 
 src_install() {
-	make DESTDIR=${D} install
+	make DESTDIR="${D}" install
 	dodoc ChangeLog NEWS README
 }
diff --git a/app-benchmarks/acovea/acovea-5.1.1.ebuild b/app-benchmarks/acovea/acovea-5.1.1.ebuild
index 73ea3ff7e58a..79893b686c6f 100644
--- a/app-benchmarks/acovea/acovea-5.1.1.ebuild
+++ b/app-benchmarks/acovea/acovea-5.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 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.2 2006/10/02 09:50:03 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-5.1.1.ebuild,v 1.3 2008/06/01 16:58:14 pchrist Exp $
 
 inherit autotools
 
@@ -25,6 +25,9 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-asneeded.patch
 	epatch "${FILESDIR}"/${P}-free-fix.patch
+	if has_version ">=libevocosm-3.3.0" ; then
+		epatch ${FILESDIR}"/${P}-libevocosm.patch"
+	fi
 	eautomake
 }
 
diff --git a/app-benchmarks/acovea/files/acovea-5.1.1-libevocosm.patch b/app-benchmarks/acovea/files/acovea-5.1.1-libevocosm.patch
new file mode 100644
index 000000000000..ec30ce644925
--- /dev/null
+++ b/app-benchmarks/acovea/files/acovea-5.1.1-libevocosm.patch
@@ -0,0 +1,119 @@
+--- -	2008-05-30 21:03:16.545065718 -0600
++++ libacovea-5.1.1/libacovea/acovea.cpp	2008-05-30 20:55:48.000000000 -0600
+@@ -86,7 +86,7 @@
+ // randomize settings of this option
+ void option::randomize()
+ {
+-    m_enabled = (g_random.get_rand_real2() < 0.5);
++    m_enabled = (g_random.get_real() < 0.5);
+ }
+ 
+ // mutate this option
+@@ -246,7 +246,7 @@
+         m_step = 1;
+     
+     // possibly adjust value to randomize populations
+-    size_t choice = g_random.get_rand_index(3);
++    size_t choice = g_random.get_index(3);
+     
+     switch (choice)
+     {
+@@ -304,12 +304,12 @@
+ void tuning_option::mutate()
+ {
+     // select our mutation
+-    if (g_random.get_rand_real2() < 0.5)
++    if (g_random.get_real() < 0.5)
+         option::mutate();
+     else
+     {
+         // mutate value of this option, up or down randomly
+-        if (g_random.get_rand_real2() < 0.5)
++        if (g_random.get_real() < 0.5)
+             m_value -= m_step;
+         else
+             m_value += m_step;
+@@ -335,7 +335,7 @@
+ enum_option::enum_option(const vector<string> & a_choices, bool a_enabled)
+   : option(a_enabled),
+     m_choices(a_choices),
+-    m_setting(g_random.get_rand_index(a_choices.size()))    
++    m_setting(g_random.get_index(a_choices.size()))    
+ {
+     // nada
+ }
+@@ -344,7 +344,7 @@
+ enum_option::enum_option(const char ** a_choices, size_t a_num_choices, bool a_enabled)
+   : option(a_enabled),
+     m_choices(),
+-    m_setting(g_random.get_rand_index(a_num_choices))    
++    m_setting(g_random.get_index(a_num_choices))    
+ {
+     for (int n = 0; n < a_num_choices; ++n)
+         m_choices.push_back(string(a_choices[n]));
+@@ -369,7 +369,7 @@
+         token = strtok(NULL,"|");
+     }
+     
+-    m_setting = g_random.get_rand_index(m_choices.size());
++    m_setting = g_random.get_index(m_choices.size());
+     
+     free(choices);
+ }
+@@ -407,17 +407,17 @@
+ void enum_option::randomize()
+ {
+     // randomize enabled
+-    m_enabled = (g_random.get_rand_real2() < 0.5);
++    m_enabled = (g_random.get_real() < 0.5);
+     
+     // randomize setting
+-    m_setting = g_random.get_rand_index(m_choices.size());
++    m_setting = g_random.get_index(m_choices.size());
+ }
+ 
+ // mutate this option
+ void enum_option::mutate()
+ {
+     // select our mutation
+-    if (g_random.get_rand() & 1)
++    if (g_random.get_real() < 0.5)
+         option::mutate();
+     else
+     {
+@@ -435,7 +435,7 @@
+         
+             // find a different setting
+             while (new_setting == m_setting)
+-                new_setting = g_random.get_rand_index(m_choices.size());
++                new_setting = g_random.get_index(m_choices.size());
+             
+             m_setting = new_setting;
+         }
+@@ -915,7 +915,7 @@
+     // randomly pick an option from one of the parents
+     for (int n = 0; n < a_parent1.size(); ++n)
+     {
+-        if (g_random.get_rand() & 1)
++        if (g_random.get_real() < 0.5)
+             child.push_back(a_parent1[n]->clone());
+         else
+             child.push_back(a_parent2[n]->clone());
+@@ -931,7 +931,7 @@
+ {
+     for (int n = 0; n < a_options.size(); ++n)
+     {
+-        if (g_random.get_rand_real2() < a_mutation_chance)
++        if (g_random.get_real() < a_mutation_chance)
+             a_options[n]->mutate();
+     }
+ }
+@@ -1096,7 +1096,7 @@
+             acovea_organism * child;
+ 
+             // do we crossover?
+-            if (g_random.get_rand_real2() <= m_crossover_rate)
++            if (g_random.get_real() <= m_crossover_rate)
+             {
+                 // select a second parent
+                 size_t second_index = first_index;