Make evolvotron compile with gcc4, see bug #146119.

Package-Manager: portage-2.1.1_rc1-r2

4 files changed, 68 insertions, 12 deletions

diff --git a/x11-misc/evolvotron/ChangeLog b/x11-misc/evolvotron/ChangeLog
index b4159468424e..0e1a93a12652 100644
--- a/x11-misc/evolvotron/ChangeLog
+++ b/x11-misc/evolvotron/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/evolvotron
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/evolvotron/ChangeLog,v 1.8 2006/02/16 16:39:32 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/evolvotron/ChangeLog,v 1.9 2006/09/03 15:53:07 nelchael Exp $
+
+  03 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/evolvotron-0.3.1-gcc4.patch, evolvotron-0.3.1.ebuild:
+  Make evolvotron compile with gcc4, see bug #146119.
 
   16 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   evolvotron-0.3.1.ebuild:
diff --git a/x11-misc/evolvotron/Manifest b/x11-misc/evolvotron/Manifest
index ea56c5661c82..2a9147824850 100644
--- a/x11-misc/evolvotron/Manifest
+++ b/x11-misc/evolvotron/Manifest
@@ -1,12 +1,30 @@
-MD5 15666987cdf087518b4159cea889028b ChangeLog 1157
-RMD160 30e5059ad0577bc8194653609c84f3307e49b978 ChangeLog 1157
-SHA256 851f7938d415318604c5483ce629a2b4f2fccb34cb2891b75e1733fa5f94f413 ChangeLog 1157
-MD5 01a93b4bdac266a5e14ca687d656ba2e evolvotron-0.3.1.ebuild 992
-RMD160 8d5e55e3c6773c1ab5e049bea1cbf07b0a1f3e65 evolvotron-0.3.1.ebuild 992
-SHA256 7063c9bf4b3270f32a7a159d4b636257fed7ed16d9353974755fcac118e0f8d4 evolvotron-0.3.1.ebuild 992
-MD5 7f43acb8b176f9ce25084e7bc7c582b8 files/digest-evolvotron-0.3.1 250
-RMD160 612ad046eaf2032f809cdceadd14150059e620c0 files/digest-evolvotron-0.3.1 250
-SHA256 d886dffd877ec762546e17289ec78a964553be4f21ef857a8947f922e730c0e5 files/digest-evolvotron-0.3.1 250
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX evolvotron-0.3.1-gcc4.patch 1925 RMD160 306ba82b8a848f5c1f826591cbef297dea90c15a SHA1 f65a571a275e2e474193b0c9a65bbc188692e0ac SHA256 962adb14214178f2dc533c2d7d05a9315a9acf82d1c3923460fb49604544cfd6
+MD5 694388937c6f0277b1cb582fe6cdc30e files/evolvotron-0.3.1-gcc4.patch 1925
+RMD160 306ba82b8a848f5c1f826591cbef297dea90c15a files/evolvotron-0.3.1-gcc4.patch 1925
+SHA256 962adb14214178f2dc533c2d7d05a9315a9acf82d1c3923460fb49604544cfd6 files/evolvotron-0.3.1-gcc4.patch 1925
+DIST evolvotron-0.3.1.tar.gz 129201 RMD160 e855ff686347d70c6d0251332f4ce6ff3768bea9 SHA1 29cc5878df3bdbc6e93dac32e995f5724f370210 SHA256 2cd56c25335d2875a52cb638294e1597cabfcf955f6828fbd0b67199556cf636
+EBUILD evolvotron-0.3.1.ebuild 1037 RMD160 00ca70634ac4e9be7e9b6c90af96da71fbb4b3ad SHA1 392d5bfebcd23ea15895045ba26e59ae0dc8ce4f SHA256 3fefef92ba4be3594ca311e2ac85e7a13400aef277e2d99f983957fe202a7808
+MD5 2858ec39bb83dbe37179d19b0ef522e5 evolvotron-0.3.1.ebuild 1037
+RMD160 00ca70634ac4e9be7e9b6c90af96da71fbb4b3ad evolvotron-0.3.1.ebuild 1037
+SHA256 3fefef92ba4be3594ca311e2ac85e7a13400aef277e2d99f983957fe202a7808 evolvotron-0.3.1.ebuild 1037
+MISC ChangeLog 1328 RMD160 372fb0ac04af1dd90a82c34dd88a89ed555f4cff SHA1 e810a97c75bef36a5274ac50d8211ee9ba92d824 SHA256 3579d0ece6e4301c9b024b25418abaddab56a1c29225e52d8de26d4652edfe76
+MD5 a683accc1ab95a96e76c5c8e8816e087 ChangeLog 1328
+RMD160 372fb0ac04af1dd90a82c34dd88a89ed555f4cff ChangeLog 1328
+SHA256 3579d0ece6e4301c9b024b25418abaddab56a1c29225e52d8de26d4652edfe76 ChangeLog 1328
+MISC metadata.xml 231 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 SHA1 f78294e25f7fd11c0954f753892ece303fc491b3 SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a
 MD5 8dad4c602e8fc48cf21cf32d762b9af0 metadata.xml 231
 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 metadata.xml 231
 SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a metadata.xml 231
+MD5 7f43acb8b176f9ce25084e7bc7c582b8 files/digest-evolvotron-0.3.1 250
+RMD160 612ad046eaf2032f809cdceadd14150059e620c0 files/digest-evolvotron-0.3.1 250
+SHA256 d886dffd877ec762546e17289ec78a964553be4f21ef857a8947f922e730c0e5 files/digest-evolvotron-0.3.1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE+vpqgo/w9rxVVVERAhctAJ0QsHGKjDHvcEphIuNB2RHm7qgosgCfXDPN
+D5XaT8Ky2UJl67aecKk5bkA=
+=IYuA
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/evolvotron/evolvotron-0.3.1.ebuild b/x11-misc/evolvotron/evolvotron-0.3.1.ebuild
index 2ac2b65639af..fbf117844210 100644
--- a/x11-misc/evolvotron/evolvotron-0.3.1.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/evolvotron/evolvotron-0.3.1.ebuild,v 1.5 2006/02/16 16:39:32 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/evolvotron/evolvotron-0.3.1.ebuild,v 1.6 2006/09/03 15:53:07 nelchael Exp $
 
-inherit qt3
+inherit qt3 eutils
 
 DESCRIPTION="An interactive generative art application"
 HOMEPAGE="http://www.bottlenose.demon.co.uk/share/evolvotron/index.htm"
@@ -24,6 +24,7 @@ src_unpack() {
 		-e "/^QMAKE_CXXFLAGS_RELEASE += -O3/ s:=.*:= ${CXXFLAGS}:" \
 		-e '/^INSTALLPATH/ s:=.*:= /usr/bin:' ${S}/common.pro \
 		|| die "sed common.pro failed"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 }
 
 src_compile() {
diff --git a/x11-misc/evolvotron/files/evolvotron-0.3.1-gcc4.patch b/x11-misc/evolvotron/files/evolvotron-0.3.1-gcc4.patch
new file mode 100644
index 000000000000..452ccd5dd7c2
--- /dev/null
+++ b/x11-misc/evolvotron/files/evolvotron-0.3.1-gcc4.patch
@@ -0,0 +1,33 @@
+diff -Nru evolvotron.vanilla/libevolvotron/function_node.h evolvotron/libevolvotron/function_node.h
+--- evolvotron.vanilla/libevolvotron/function_node.h	2006-09-03 17:42:30.000000000 +0200
++++ evolvotron/libevolvotron/function_node.h	2006-09-03 17:46:11.000000000 +0200
+@@ -133,7 +133,7 @@
+   static const std::vector<FunctionNode*> stubargs(const MutationParameters& parameters,uint n,bool exciting=false);
+ 
+   //! Return a suitable starting value for a node's iteration count (assuming it's iterative).
+-  static const uint FunctionNode::stubiterations(const MutationParameters& parameters);
++  static const uint stubiterations(const MutationParameters& parameters);
+ 
+   //! Constructor given an array of params and args and an iteration count.
+   /*! These MUST be provided; there are no alterative constructors.
+diff -Nru evolvotron.vanilla/libevolvotron/mutation_parameters.h evolvotron/libevolvotron/mutation_parameters.h
+--- evolvotron.vanilla/libevolvotron/mutation_parameters.h	2006-09-03 17:42:30.000000000 +0200
++++ evolvotron/libevolvotron/mutation_parameters.h	2006-09-03 17:43:19.000000000 +0200
+@@ -266,7 +266,7 @@
+   //! This returns a new random bit of tree.
+   /*! Setting the "exciting" flag avoids the most basic node types, but only at the top level of the stub tree.
+    */
+-  FunctionNode*const MutationParameters::random_function_stub(bool exciting) const;
++  FunctionNode*const random_function_stub(bool exciting) const;
+     
+   void change_function_weighting(const FunctionRegistration* fn,float w);
+ 
+@@ -277,7 +277,7 @@
+  protected:
+ 
+   //! Return a random function appropriately biased by current settings
+-  FunctionNode*const MutationParameters::random_function() const;
++  FunctionNode*const random_function() const;
+ 
+   //! Return a random function registration, appropriately biased by current settings
+   const FunctionRegistration*const random_weighted_function_registration() const;