Fix building with GCC 4.3 wrt #219648, thanks to Peter Alfredsen.

Package-Manager: portage-2.1.5_rc6

4 files changed, 118 insertions, 27 deletions

diff --git a/media-gfx/yafray/ChangeLog b/media-gfx/yafray/ChangeLog
index f63b2c0bdac5..0a89d07917db 100644
--- a/media-gfx/yafray/ChangeLog
+++ b/media-gfx/yafray/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/yafray
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/ChangeLog,v 1.49 2008/04/12 13:58:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/ChangeLog,v 1.50 2008/04/29 15:00:19 drac Exp $
+
+  29 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/yafray-0.0.9-gcc43.patch, yafray-0.0.9-r1.ebuild:
+  Fix building with GCC 4.3 wrt #219648, thanks to Peter Alfredsen.
 
   12 Apr 2008; Markus Meier <maekke@gentoo.org> -yafray-0.0.9.ebuild:
   old
diff --git a/media-gfx/yafray/Manifest b/media-gfx/yafray/Manifest
index 3a435c1c1ac9..408a1b5355e9 100644
--- a/media-gfx/yafray/Manifest
+++ b/media-gfx/yafray/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX yafray-0.0.9-etc.patch 469 RMD160 c35b182573cbf97fe7c7a4de08baad68f593167b SHA1 e550fe54a9755a2e5de35317cda577946914ca88 SHA256 50fa202811aa15ed9ac6f89d8757f6abc2cdc0ce69d14c9e1b6390b50740960b
+AUX yafray-0.0.9-gcc43.patch 2742 RMD160 5e32f100d1afb9aa0f0595b64a13922949fe6314 SHA1 229e1e105d8bcbfb8c9455cd2a8484a15a6cded2 SHA256 e5f8a7fc09267d37fbb2644d55931805c46069c617db19de3809664c70c84ade
 AUX yafray-0.0.9-libdir.patch 983 RMD160 ec5c974d64c8812f5942f4ab9b9cfdbc1c46b8bf SHA1 168f6aa6bab380de339552775523ffc3a4f99619 SHA256 4e407364d02db1215df1228f6e0263a0c957fc6e82e805ce6b2d6dbb08d25cf7
 AUX yafray-0.0.9-scons.patch 780 RMD160 4b0993a1495d3a947eb5caa89b210b73779452a5 SHA1 b4ca3dfe8bb5b3b18343c8125140f57c2dfa19ec SHA256 feb2fc791d743d24cd876122e75634165b9ffc042277cc77e2daa1327ff31bf3
 DIST yafray-0.0.9.tar.gz 316033 RMD160 4bad504cf78e86718869b9ced3967d31ec66a608 SHA1 30eaf082f66da4948cc6fb9651b4945914929f74 SHA256 f803e7058fb65cab9c0d00599daa85ca291fb57941822d622426e3466ec0aefb
-EBUILD yafray-0.0.9-r1.ebuild 1282 RMD160 68a52861e363c3cd7ea8b88dfbf062f61c71adaa SHA1 6e439c122356545397195be212191ffaeaf3d25c SHA256 4a58d1977436697f8f975c128b46be074292419a316800ca18365fad849c0ed6
-MISC ChangeLog 6248 RMD160 8c4be1715f276d25f38cb976c9bfe2ccb0d0e2bf SHA1 21c1582c48c12f46e599981ffbba9caf5186aa0f SHA256 5e225e13f55724c942b2fe9c941c1c9ccbf8c2d3ce72a32d697758d448d01fc5
+EBUILD yafray-0.0.9-r1.ebuild 1253 RMD160 77994608372f1bf35e391f13798c3b592632909e SHA1 bcfd8f363f3158de83b086eeb3799dae94cc3ff0 SHA256 0d71f0d2b6a0998c57da6613ba2c216b196796cf367333b60c52a7366be936c9
+MISC ChangeLog 6423 RMD160 2e4f1c47ef1765ab9f81bb3f08e4c594490218ed SHA1 b6e0fbb67255acf4a1f1761b803c10d08a39208b SHA256 41e7b87b48683fc3d5d42d48dda72ed811afc1d5f8dff8f2bff087fe61adec85
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgAwBcACgkQkKaRLQcq0GLKXwCgtCekZkGptD3yKo1kWP269u4p
-aGYAn3qS9BhZ/4V/f1nJYkBjtkIYnRG+
-=5dS+
------END PGP SIGNATURE-----
diff --git a/media-gfx/yafray/files/yafray-0.0.9-gcc43.patch b/media-gfx/yafray/files/yafray-0.0.9-gcc43.patch
new file mode 100644
index 000000000000..200930af8b69
--- /dev/null
+++ b/media-gfx/yafray/files/yafray-0.0.9-gcc43.patch
@@ -0,0 +1,97 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_gcc4.3_missing_includes.dpatch by Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add missing includes to fix FTBFS with gcc 4.3
+
+@DPATCH@
+
+--- a/src/yafraycore/HDR_io.cc	2007-12-21 02:04:16.000000000 +0100
++++ b/src/yafraycore/HDR_io.cc	2007-12-21 02:04:23.000000000 +0100
+@@ -9,6 +9,8 @@
+ #include<config.h>
+ #endif
+ 
++#include <cstring>
++
+ __BEGIN_YAFRAY
+ 
+ //---------------------------------------------------------------------------
+--- a/src/yafraycore/buffer.h	2007-12-21 02:03:39.000000000 +0100
++++ b/src/yafraycore/buffer.h	2007-12-21 02:03:48.000000000 +0100
+@@ -29,6 +29,7 @@
+ 
+ #include <cstdio>
+ #include <iostream>
++#include <cstdlib>
+ #include "color.h"
+ 
+ __BEGIN_YAFRAY
+--- a/src/yafraycore/ccthreads.cc	2007-12-21 02:05:02.000000000 +0100
++++ b/src/yafraycore/ccthreads.cc	2007-12-21 02:05:12.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include"ccthreads.h"
+ #include<iostream>
++#include<cstdlib>
+ 
+ using namespace std;
+ 
+--- a/src/yafraycore/geometree.h	2007-12-21 02:09:40.000000000 +0100
++++ b/src/yafraycore/geometree.h	2007-12-21 02:09:46.000000000 +0100
+@@ -2,6 +2,7 @@
+ #define __GEOMETREE_H
+ 
+ #include"bound.h"
++#include <limits>
+ 
+ __BEGIN_YAFRAY
+ 
+--- a/src/yafraycore/kdtree.cc	2007-12-21 02:05:55.000000000 +0100
++++ b/src/yafraycore/kdtree.cc	2007-12-21 02:06:03.000000000 +0100
+@@ -4,6 +4,7 @@
+ #include <math.h>
+ #include <limits>
+ #include <time.h>
++#include <cstring>
+ 
+ __BEGIN_YAFRAY
+ 
+--- a/src/yafraycore/renderblock.cc	2007-12-21 02:07:41.000000000 +0100
++++ b/src/yafraycore/renderblock.cc	2007-12-21 02:07:49.000000000 +0100
+@@ -1,5 +1,6 @@
+ 
+ #include "renderblock.h"
++#include <cstdlib>
+ 
+ using namespace std;
+ 
+--- a/src/loader/mlex.cc	2007-12-21 02:13:25.000000000 +0100
++++ b/src/loader/mlex.cc	2007-12-21 02:13:35.000000000 +0100
+@@ -22,6 +22,7 @@
+ 
+ #include<stdio.h>
+ #include<iostream>
++#include<cstring>
+ #include "mlex.h"
+ using namespace std;
+ #include<string>
+--- a/src/shaders/basictex.cc	2007-12-21 02:14:43.000000000 +0100
++++ b/src/shaders/basictex.cc	2007-12-21 02:14:52.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include "basictex.h"
+ #include "object3d.h"
+ #include <iostream>
++#include <cstring>
+ 
+ #include "targaIO.h"
+ #include "HDR_io.h"
+--- a/src/yafraycore/targaIO.cc	2007-12-21 02:10:53.000000000 +0100
++++ b/src/yafraycore/targaIO.cc	2007-12-21 02:11:00.000000000 +0100
+@@ -3,6 +3,7 @@
+ //--------------------------------------------------------------------------------
+ #include "targaIO.h"
+ #include "vector3d.h"
++#include <cstring>
+ 
+ //--------------------------------------------------------------------------------
+ // Save uncompressed 24 bit targa
diff --git a/media-gfx/yafray/yafray-0.0.9-r1.ebuild b/media-gfx/yafray/yafray-0.0.9-r1.ebuild
index 7bcb135345f4..e074d808d255 100644
--- a/media-gfx/yafray/yafray-0.0.9-r1.ebuild
+++ b/media-gfx/yafray/yafray-0.0.9-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.9-r1.ebuild,v 1.5 2008/04/12 12:25:05 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.9-r1.ebuild,v 1.6 2008/04/29 15:00:19 drac Exp $
 
-inherit eutils python multilib
+inherit eutils multilib python
 
 DESCRIPTION="Yet Another Free Raytracer"
-HOMEPAGE="http://www.yafray.org/"
+HOMEPAGE="http://www.yafray.org"
 SRC_URI="http://www.yafray.org/sec/2/downloads/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -17,21 +17,19 @@ RDEPEND="media-libs/jpeg
 	sys-libs/zlib
 	openexr? ( media-libs/openexr )"
 DEPEND="${RDEPEND}
-	>=sys-devel/gcc-3.3
-	>=sys-apps/sed-4
 	dev-util/scons"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-scons.patch
-	epatch "${FILESDIR}"/${P}-libdir.patch
-	epatch "${FILESDIR}"/${P}-etc.patch
+	epatch "${FILESDIR}"/${P}-scons.patch \
+		"${FILESDIR}"/${P}-libdir.patch \
+		"${FILESDIR}"/${P}-etc.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 
-	# Dirty hack for a dirty buildsystem.
-	sed -i -e "s:-O3:${CXXFLAGS} -fsigned-char:g" *-settings.py || die
+	sed -i -e "s:-O3:${CXXFLAGS} -fsigned-char:g" *-settings.py || die "sed	failed."
 }
 
 src_compile() {
@@ -44,9 +42,10 @@ src_compile() {
 }
 
 src_install() {
-	scons prefix="/usr" destdir="${D}" libdir="/$(get_libdir)" install || die
+	scons prefix="/usr" destdir="${D}" libdir="/$(get_libdir)" install \
+		|| die "scons install failed."
 
 	find "${D}" -name .sconsign -exec rm \{\} \;
-	dodoc AUTHORS		|| die
-	dohtml doc/doc.html || die
+	dodoc AUTHORS
+	dohtml doc/doc.html
 }