fixed evil ptr->int cast and made it multilib-strict aware

Package-Manager: portage-2.0.51.22-r2

5 files changed, 57 insertions, 8 deletions

diff --git a/media-gfx/yafray/ChangeLog b/media-gfx/yafray/ChangeLog
index 130f5e4671be..a990d47e7df5 100644
--- a/media-gfx/yafray/ChangeLog
+++ b/media-gfx/yafray/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/yafray
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/ChangeLog,v 1.20 2005/08/20 09:45:31 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/ChangeLog,v 1.21 2005/09/04 14:02:42 blubb Exp $
+
+  04 Sep 2005; Simon Stelling <blubb@gentoo.org>
+  +files/yafray-0.0.8-64bit.patch, +files/yafray-0.0.8-multilib.patch,
+  yafray-0.0.8.ebuild:
+  fixed evil ptr->int cast and made it multilib-strict aware
 
   15 Aug 2005; Luca Barbato <lu_zero@gentoo.org> ChangeLog:
   New version, thanks to Joshua Leach <leachj@cae.wisc.edu> for the ebuild
diff --git a/media-gfx/yafray/Manifest b/media-gfx/yafray/Manifest
index 758878317a0b..be9a6c81b473 100644
--- a/media-gfx/yafray/Manifest
+++ b/media-gfx/yafray/Manifest
@@ -1,13 +1,15 @@
+MD5 3ce004a359ccb83ef05381339dcfb41b ChangeLog 2733
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
-MD5 0375741f63f4b168009b9b4e16b62788 yafray-0.0.8.ebuild 1044
 MD5 6cd6b3531914a358df0c6698b3ecae0d yafray-0.0.4.ebuild 807
-MD5 1d298f0f70ab0deaad5e47fcd1db8923 ChangeLog 2530
 MD5 b315768a4a14f5e70d56b63a05faf729 yafray-0.0.6.ebuild 951
 MD5 a998d11d232890b45f990edea55e4fa5 yafray-0.0.7.ebuild 995
+MD5 53d1b9323b2170c982baa8b88a006d00 yafray-0.0.8.ebuild 1175
+MD5 9eb9f2e8a635d14ca7d085f6a0f271d0 files/digest-yafray-0.0.4 64
+MD5 3c992b5abf43533014483fbe73ec18a7 files/digest-yafray-0.0.6 64
 MD5 1369fb0f3bdcd1b7cbf08c71ded07fca files/digest-yafray-0.0.7 64
-MD5 78f9242de2b0493dab84891fe6c9e2eb files/yafray-0.0.8-scons.patch 782
 MD5 7b50d20a15ce12bca91f1354401f1351 files/yafray-0.0.7-scons.patch 866
 MD5 6990e835f5744cd54dbc5afb80a05f34 files/yafray-gcc34-fix.gz 1190
 MD5 b99ce19d58e373fa5dd2529e24bb3bfc files/digest-yafray-0.0.8 64
-MD5 9eb9f2e8a635d14ca7d085f6a0f271d0 files/digest-yafray-0.0.4 64
-MD5 3c992b5abf43533014483fbe73ec18a7 files/digest-yafray-0.0.6 64
+MD5 78f9242de2b0493dab84891fe6c9e2eb files/yafray-0.0.8-scons.patch 782
+MD5 6f303b3dd7cb31ba2fdd965c7bcddbe3 files/yafray-0.0.8-64bit.patch 659
+MD5 63017b75fa2e4e4da822a1c0588125bb files/yafray-0.0.8-multilib.patch 833
diff --git a/media-gfx/yafray/files/yafray-0.0.8-64bit.patch b/media-gfx/yafray/files/yafray-0.0.8-64bit.patch
new file mode 100644
index 000000000000..87589ccb9fac
--- /dev/null
+++ b/media-gfx/yafray/files/yafray-0.0.8-64bit.patch
@@ -0,0 +1,16 @@
+--- src/loader/render.cc.old	2005-09-04 15:32:46.000000000 +0200
++++ src/loader/render.cc	2005-09-04 15:33:01.000000000 +0200
+@@ -721,11 +721,11 @@
+ 	}
+ 	for(vector<triangle_t>::iterator i=faces.begin();i!=faces.end();++i)
+ 	{
+-		long int n=(int)((*i).a);
++		long int n=(long int)((*i).a);
+ 		if((n>=(long int)mesh->points->points.size()) || (n<0))
+ 			{ WARNING<<"Point "<<n<<" out of bounds in object\n"; n=0; }
+ 		(*i).a=&(mesh->points->points)[n];
+-		n=(int)((*i).b);
++		n=(long int)((*i).b);
+ 		if((n>=(long int)mesh->points->points.size()) || (n<0))
+ 			{ WARNING<<"Point "<<n<<" out of bounds in object\n"; n=0; }
+ 		(*i).b=&(mesh->points->points)[n];
diff --git a/media-gfx/yafray/files/yafray-0.0.8-multilib.patch b/media-gfx/yafray/files/yafray-0.0.8-multilib.patch
new file mode 100644
index 000000000000..1b68c2e6fc4b
--- /dev/null
+++ b/media-gfx/yafray/files/yafray-0.0.8-multilib.patch
@@ -0,0 +1,22 @@
+--- linux-settings.py.old	2005-09-04 15:51:15.000000000 +0200
++++ linux-settings.py	2005-09-04 15:52:29.000000000 +0200
+@@ -10,8 +10,8 @@
+ 	global prefix
+ 	prefix = args.get('prefix','/usr/local')
+ 
+-def get_libpath(args): return prefix+"/lib"
+-def get_pluginpath(args): return prefix+"/lib/yafray"
++def get_libpath(args): return prefix+"/lib64"
++def get_pluginpath(args): return prefix+"/lib64/yafray"
+ def get_binpath(args): return prefix+"/bin"
+ def get_confpath(args): return prefix+"/etc"
+ def get_cxxflags(args):
+@@ -34,7 +34,7 @@
+ 			return False
+ 		
+ 	def get_include(args): return [ exr.PATH + "/include/OpenEXR" ]
+-	def get_libpath(args): return [ exr.PATH + "/lib" ]
++	def get_libpath(args): return [ exr.PATH + "/lib64" ]
+ 	def get_libs(args): return ['IlmImf', 'Imath', 'Iex', 'Half']
+ 
+ class jpeg(globalinfo.library):
diff --git a/media-gfx/yafray/yafray-0.0.8.ebuild b/media-gfx/yafray/yafray-0.0.8.ebuild
index 9ace4f8ced23..3600dad82f31 100644
--- a/media-gfx/yafray/yafray-0.0.8.ebuild
+++ b/media-gfx/yafray/yafray-0.0.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.8.ebuild,v 1.1 2005/08/20 09:45:31 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.8.ebuild,v 1.2 2005/09/04 14:02:42 blubb Exp $
 
-inherit eutils python
+inherit eutils python multilib
 
 DESCRIPTION="Yet Another Free Raytracer"
 HOMEPAGE="http://www.yafray.org/"
@@ -27,6 +27,10 @@ src_unpack() {
 	cd ${S}
 	libtoolize --copy --force
 	epatch ${FILESDIR}/${P}-scons.patch
+	epatch ${FILESDIR}/${P}-64bit.patch
+	if [[ $(get_libdir) == "lib64" ]] ; then
+		epatch ${FILESDIR}/${P}-multilib.patch
+	fi
 	# Dirty hack for a dirty buildsystem.
 	sed -i -e "s:-O3:${CXXFLAGS} -fsigned-char:g" *-settings.py
 }