summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2008-01-01 15:12:41 +0000
committerMarkus Meier <maekke@gentoo.org>2008-01-01 15:12:41 +0000
commitc012ffb8ac9726d8146a829c90b87ebfd7cb36a8 (patch)
treef8981a5d89c4da1cf9cc6ff1877f49168e1cc1b6 /media-gfx/yafray
parentremove cruft (diff)
downloadgentoo-2-c012ffb8ac9726d8146a829c90b87ebfd7cb36a8.tar.gz
gentoo-2-c012ffb8ac9726d8146a829c90b87ebfd7cb36a8.tar.bz2
gentoo-2-c012ffb8ac9726d8146a829c90b87ebfd7cb36a8.zip
really remove cruft
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'media-gfx/yafray')
-rw-r--r--media-gfx/yafray/ChangeLog7
-rw-r--r--media-gfx/yafray/files/yafray-0.0.7-scons.patch31
-rw-r--r--media-gfx/yafray/files/yafray-0.0.8-64bit.patch16
-rw-r--r--media-gfx/yafray/files/yafray-0.0.8-libdir.patch31
-rw-r--r--media-gfx/yafray/files/yafray-0.0.8-scons.patch24
5 files changed, 6 insertions, 103 deletions
diff --git a/media-gfx/yafray/ChangeLog b/media-gfx/yafray/ChangeLog
index 847cabf49bec..1866f596a3c4 100644
--- a/media-gfx/yafray/ChangeLog
+++ b/media-gfx/yafray/ChangeLog
@@ -1,6 +1,11 @@
# 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.43 2008/01/01 15:08:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/ChangeLog,v 1.44 2008/01/01 15:12:40 maekke Exp $
+
+ 01 Jan 2008; Markus Meier <maekke@gentoo.org>
+ -files/yafray-0.0.7-scons.patch, -files/yafray-0.0.8-64bit.patch,
+ -files/yafray-0.0.8-libdir.patch, -files/yafray-0.0.8-scons.patch:
+ really remove cruft
01 Jan 2008; Markus Meier <maekke@gentoo.org> ChangeLog:
remove cruft
diff --git a/media-gfx/yafray/files/yafray-0.0.7-scons.patch b/media-gfx/yafray/files/yafray-0.0.7-scons.patch
deleted file mode 100644
index 14e97c4b2fe2..000000000000
--- a/media-gfx/yafray/files/yafray-0.0.7-scons.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- yafray-0.0.7.orig/SConstruct 2004-08-06 15:50:37.000000000 +0200
-+++ yafray-0.0.7/SConstruct 2004-08-07 00:00:39.847093968 +0200
-@@ -80,7 +80,7 @@
- if debug:
- flags+=' -O3 -ffast-math -ggdb'
- else:
-- flags+=' -O3 -ffast-math -fomit-frame-pointer'
-+ flags+=' -O3 -ffast-math -fomit-frame-pointer -fsigned-char'
- if debugdll:
- flags+=' -DDEBUGDLL'
- if arch!='':
-@@ -154,8 +154,9 @@
-
- config.write("#endif\n");
- config.close()
--
-+destdir=ARGUMENTS.get('destdir','')
- prefix=ARGUMENTS.get('prefix','/usr/local')
-+prefix=destdir+prefix
-
- if sys.platform == 'darwin' :
- if os.path.isdir('osxpak'):
-@@ -168,7 +169,7 @@
- lib_path=prefix+"/lib"
- plugin_path=prefix+"/lib/yafray"
- bin_path=prefix+"/bin"
-- conf_path=prefix+"/etc"
-+ conf_path=destdir+"/etc"
- else:
- cwd = os.getcwd()
- prefix=ARGUMENTS.get('prefix',cwd + os.sep + 'win32pak' )
diff --git a/media-gfx/yafray/files/yafray-0.0.8-64bit.patch b/media-gfx/yafray/files/yafray-0.0.8-64bit.patch
deleted file mode 100644
index 87589ccb9fac..000000000000
--- a/media-gfx/yafray/files/yafray-0.0.8-64bit.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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-libdir.patch b/media-gfx/yafray/files/yafray-0.0.8-libdir.patch
deleted file mode 100644
index adab682c93e8..000000000000
--- a/media-gfx/yafray/files/yafray-0.0.8-libdir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- linux-settings.old 2005-07-06 06:12:10.000000000 +1000
-+++ linux-settings.py 2005-08-23 20:28:12.000000000 +1000
-@@ -5,13 +5,15 @@
-
- srcroot = os.getcwd()
- prefix = ''
-+libdir = ''
-
- def init(args):
-- global prefix
-+ global prefix, libdir
- prefix = args.get('prefix','/usr/local')
--
--def get_libpath(args): return prefix+"/lib"
--def get_pluginpath(args): return prefix+"/lib/yafray"
-+ libdir = args.get('libdir','/lib')
-+
-+def get_libpath(args): return prefix+libdir
-+def get_pluginpath(args): return prefix+libdir+"/yafray"
- def get_binpath(args): return prefix+"/bin"
- def get_confpath(args): return prefix+"/etc"
- def get_cxxflags(args):
-@@ -34,7 +36,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 + libdir ]
- def get_libs(args): return ['IlmImf', 'Imath', 'Iex', 'Half']
-
- class jpeg(globalinfo.library):
diff --git a/media-gfx/yafray/files/yafray-0.0.8-scons.patch b/media-gfx/yafray/files/yafray-0.0.8-scons.patch
deleted file mode 100644
index 5cd83faa89dc..000000000000
--- a/media-gfx/yafray/files/yafray-0.0.8-scons.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN /tmp/yafray-0.0.8.orig/SConstruct /tmp/yafray-0.0.8/SConstruct
---- /tmp/yafray-0.0.8.orig/SConstruct 2005-06-23 08:51:07.000000000 -0500
-+++ /tmp/yafray-0.0.8/SConstruct 2005-07-27 23:03:19.954945984 -0500
-@@ -3,6 +3,7 @@
- import configio
- import globalinfo
-
-+destdir=ARGUMENTS.get('destdir','')
- prefix=ARGUMENTS.get('prefix','/usr/local')
-
- ficheros = {
-@@ -59,6 +60,12 @@
- shared_env=confer.derive_shared_env(common_env)
- plugin_env=confer.derive_plugin_env(common_env)
- program_env=confer.derive_program_env(common_env)
-+shared_env.SConsignFile(".sconsign")
-+
-+config.pluginpath=destdir+config.pluginpath
-+config.binpath=destdir+config.binpath
-+config.confpath=destdir+config.confpath
-+config.libpath=destdir+config.libpath
-
- Export('config')
- Export('shared_env')