Fix 3.7.0 beta 25 to work with gcc-4.3 (bug #216684)

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 55 insertions, 4 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index aa7ce550e16f..b62ceb5632c3 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/povray
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.75 2008/05/29 01:40:07 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.76 2008/09/12 05:17:50 lavajoe Exp $
+
+  12 Sep 2008; Joe Peterson <lavajoe@gentoo.org>
+  +files/povray-3.7.0_beta25-gcc43.patch, povray-3.7.0_beta25-r1.ebuild:
+  Fix 3.7.0 beta 25 to work with gcc-4.3 (bug #216684)
 
   29 May 2008; Joe Peterson <lavajoe@gentoo.org> povray-3.6.1-r3.ebuild:
   Use eautoreconf with AT_NO_RECURSIVE set
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 7b97b08638f1..3606b2b4268f 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -1,10 +1,11 @@
 AUX povray-3.6.1-configure.patch 1081 RMD160 92dd3995691d567f6ae24b38bea1f31b9803b5b3 SHA1 c4c9fe03b8e24b8c03ed93abd484cfff3abd8dfc SHA256 a3278c6e43c30daa5a2edb7de3726e57f732f9c387b2d838cb41f3c7f14f773b
 AUX povray-3.6.1-find-egrep.patch 2463 RMD160 6af6c01daec1a0eb5ae27f65ede5411c4af2dbe2 SHA1 19537ff628130a4d2b048529e5a4f9bbfe79840c SHA256 1f56d1223954c1d0ed160b034badcf0878813b0bf984221c8eadce5d7666a46e
+AUX povray-3.7.0_beta25-gcc43.patch 1462 RMD160 27973df982c77da67791744c86976ef4465f35bc SHA1 614c19734d2bd6a1a5c9a0a4c51f169d01282335 SHA256 0d793d14208b82a56486c9a91add85361224f238ca77fb83ea949eaa18ee50d1
 DIST povray-3.6.1.tar.bz2 8200160 RMD160 84ba679da66089f192cc1bfcf8bdd498e736a9a3 SHA1 1fab3ccbdedafbf77e3a66087709bbdf60bc643d SHA256 4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
 DIST povray-src-3.7.0.beta.25b.tar.bz2 6890656 RMD160 37e8f6fb33bbc82d2ce6154a8b0c75ae7f5cda8e SHA1 0f55e441c97e88a4a8b148b7e7a328d1189a5ff9 SHA256 ef54965dec05c8063c40eab768f3fb722eb0ed72ae7918afe45d7a6bd553abc8
 EBUILD povray-3.6.1-r2.ebuild 1507 RMD160 a19e644cee988e4fd08a9899488f724bb914f7fa SHA1 c0047a1dbb33e7ced8ba72db84e4ba0cc98eba62 SHA256 18b7040548f990c7df80da07deb14b58413c643b6e42d58425dc9ec70ce6de83
 EBUILD povray-3.6.1-r3.ebuild 2397 RMD160 688109c9c9c5b933f05426f21fa74fbead388374 SHA1 069e54885cd9139e56c54bf41e0ef6404259bf54 SHA256 8f2688920d98227fef67bdb101d0d30e7d44cfbdbd8ff988a056887d289bd948
-EBUILD povray-3.7.0_beta25-r1.ebuild 2982 RMD160 97b5e662c436edd2d4f6b94ad54e9c5263478346 SHA1 8929d7a44e7febc645182ff3166dc2324f1a9584 SHA256 916b8e1f04f53e3c559cdc69e02a3a2a1f6b1eee2c1e9365f9ba0cb2e0b5b0c6
+EBUILD povray-3.7.0_beta25-r1.ebuild 3022 RMD160 b13c36022580489b24b3efca3e45025ba344cbb7 SHA1 f4ca63129bebfa0e5e60f852b521fa3280988942 SHA256 c74e36910d6158cdb45339585abcd00eb8c833d74496a1a7f725f0bba624be04
 EBUILD povray-3.7.0_beta25.ebuild 1685 RMD160 48e1c55dcdf88c49a39b9a09edf68ffb5805be7a SHA1 8f92b1b55f7c0e14933f919ea5b691ada0d558af SHA256 2c8e9d9b23169d741effaafaa77c9c440277a7446993affcd835ccb0aad5f11e
-MISC ChangeLog 11039 RMD160 e3cc1f83171193a647d69fee7e67102d7c27991d SHA1 a070ba4f7714c30ea9fffb4e1b4aefa609e93650 SHA256 af274fa67683522264f6ea79824d13b0ad5baff2a348bae4f3c93e0ffe190fdd
+MISC ChangeLog 11217 RMD160 dfd31f4cef5ab2175f7515fef9aaec3f2c456eef SHA1 59b808fc3cc8dd598751148056054c005b4fd8e4 SHA256 b4689e023aab38cc80fa4c361c5e882180ec3c801272c92ac63a370142fa983f
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/media-gfx/povray/files/povray-3.7.0_beta25-gcc43.patch b/media-gfx/povray/files/povray-3.7.0_beta25-gcc43.patch
new file mode 100644
index 000000000000..59e69cb6f42d
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.7.0_beta25-gcc43.patch
@@ -0,0 +1,44 @@
+Povray-3.7.0-beta25b: Fix a few GCC-4.3 related compilation problems:
+add a few missing includes
+
+--- povray-3.7.0.beta.25b/source/base/fileinputoutput.h~	2008-04-07 11:35:15.305580552 +0200
++++ povray-3.7.0.beta.25b/source/base/fileinputoutput.h	2008-04-07 11:35:15.305580552 +0200
+@@ -97,6 +97,7 @@
+ #include "base/path.h"
+ 
+ #include <string>
++#include <cstring>
+ 
+ namespace pov_base
+ {
+--- povray-3.7.0.beta.25b/source/base/fileinputoutput.cpp~	2008-04-07 11:34:54.618082366 +0200
++++ povray-3.7.0.beta.25b/source/base/fileinputoutput.cpp	2008-04-07 11:34:54.618082366 +0200
+@@ -92,6 +92,7 @@
+ 
+ #include <cstdlib>
+ #include <cstdarg>
++#include <cstring>
+ 
+ #include "base/configbase.h"
+ 
+--- povray-3.7.0.beta.25b/source/base/textstreambuffer.cpp~	2008-04-07 11:35:37.272306361 +0200
++++ povray-3.7.0.beta.25b/source/base/textstreambuffer.cpp	2008-04-07 11:35:37.272306361 +0200
+@@ -91,6 +91,7 @@
+  *********************************************************************************/
+ 
+ #include <algorithm>
++#include <cstring>
+ 
+ #include "configbase.h"
+ 
+--- povray-3.7.0.beta.25b/source/base/animation/moov.cpp~	2008-04-07 13:56:09.833886560 +0200
++++ povray-3.7.0.beta.25b/source/base/animation/moov.cpp	2008-04-07 13:56:09.833886560 +0200
+@@ -90,6 +90,8 @@
+  *
+  *********************************************************************************/
+ 
++#include <limits.h>
++
+ #include "base/configbase.h"
+ #include "base/pov_err.h"
+ #include "base/types.h"
diff --git a/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild b/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild
index 88f642bccbb5..80010c189ef9 100644
--- a/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild,v 1.2 2008/05/28 21:52:46 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild,v 1.3 2008/09/12 05:17:50 lavajoe Exp $
 
 inherit eutils autotools flag-o-matic versionator
 
@@ -34,6 +34,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+
 	# Change some destination directories that cannot be adjusted via configure
 	cp configure.ac configure.ac.orig
 	sed -i -e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' configure.ac