New revision and some cleanups

12 files changed, 63 insertions, 91 deletions

diff --git a/media-gfx/blender/files/blender-2.12 b/media-gfx/blender/files/blender-2.12
deleted file mode 100644
index 8f5775808d7e..000000000000
--- a/media-gfx/blender/files/blender-2.12
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/opt/blender-2.12/blender
diff --git a/media-gfx/blender/files/blender-2.31a-plugins.patch b/media-gfx/blender/files/blender-2.31a-plugins.patch
deleted file mode 100644
index c6212e6a3a38..000000000000
--- a/media-gfx/blender/files/blender-2.31a-plugins.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- blender-2.31a.orig/release/plugins/bmake	2003-12-04 21:12:20.000000000 +1300
-+++ blender-2.31a/release/plugins/bmake	2003-12-04 21:13:12.000000000 +1300
-@@ -60,7 +60,7 @@
- 	LDFLAGS="-Bshareable";
- elif ( test $UNAME = "Linux" ) then
- 	CC="gcc";
--	CFLAGS="-fPIC -funsigned-char -O2";
-+#	CFLAGS="-fPIC -funsigned-char -O2";
- 
- 	LD="ld";
- 	LDFLAGS="-Bshareable";
-@@ -112,6 +112,8 @@
- 	INCLUDES=-I..;
- elif ( test -f "../include/plugin.h" ) then
- 	INCLUDES=-I../include
-+elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then
-+	INCLUDES=-I../../../source/blender/blenpluginapi
- else 
- 	echo "Couldn't find plugin.h";
- 	exit;
diff --git a/media-gfx/blender/files/blender-2.36-dirs.patch b/media-gfx/blender/files/blender-2.36-dirs.patch
new file mode 100644
index 000000000000..875b0ca8a326
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.36-dirs.patch
@@ -0,0 +1,62 @@
+--- ./source.orig/blender/python/BPY_interface.c	2004-11-27 19:32:25.000000000 +0100
++++ ./source/blender/python/BPY_interface.c	2004-12-29 17:35:50.000000000 +0100
+@@ -1373,14 +1373,8 @@
+ 	if( BLI_exists( homedir ) )
+ 		return homedir;
+ 
+-	/* otherwise, use argv[0] (bprogname) to get .blender/ in
+-	 * Blender's installation dir */
+-	s = BLI_last_slash( bprogname );
+-
+-	i = s - bprogname + 1;
+-
+-	PyOS_snprintf( bprogdir, i, bprogname );
+-	BLI_make_file_string( "/", homedir, bprogdir, ".blender/" );
++	/* otherwise, use /usr/lib/blender */
++	BLI_make_file_string( "/", homedir, "/usr/lib", "blender/" );
+ 
+ 	return homedir;
+ }
+--- source.orig/blender/src/language.c	2004-11-08 16:46:57.000000000 +0100
++++ source/blender/src/language.c	2005-01-02 21:25:53.302585856 +0100
+@@ -317,23 +317,30 @@
+ 		strcpy(name, bundlePath);
+ 		strcat(name, "/Contents/Resources/.Blanguages");
+ #else
+-		/* Check the CWD. Takes care of the case where users
+-		 * unpack blender tarball; cd blender-dir; ./blender */
+-		strcpy(name, ".blender/.Blanguages");
+-#endif
++		/* Check the standar location. Takes care of the case 
++		 * in which the distribution installs blender */
++		strcpy(name, "/usr/lib/blender/.Blanguages");
++		
+ 		lines= BLI_read_file_as_lines(name);
+-
++		
+ 		if(lines == NULL) {
+-			/* If not found in .blender, try current dir */
+-			strcpy(name, ".Blanguages");
++			/* Check the CWD. Takes care of the case where users
++			 * unpack blender tarball; cd blender-dir; ./blender */
++			strcpy(name, ".blender/.Blanguages");
++#endif
+ 			lines= BLI_read_file_as_lines(name);
++
+ 			if(lines == NULL) {
+-					error("File \".Blanguages\" not found");
+-					return 0;
++				/* If not found in .blender, try current dir */
++				strcpy(name, ".Blanguages");
++				lines= BLI_read_file_as_lines(name);
++				if(lines == NULL) {
++						error("File \".Blanguages\" not found");
++						return 0;
++				}
+ 			}
+ 		}
+ 	}
+-
+ 	for (l= lines; l; l= l->next) {
+ 		char *line= l->link;
+ 			
diff --git a/media-gfx/blender/files/configure-fix-2.30.patch b/media-gfx/blender/files/configure-fix-2.30.patch
deleted file mode 100644
index 881ccd311a91..000000000000
--- a/media-gfx/blender/files/configure-fix-2.30.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- blender-2.30/configure.old	2003-11-06 01:59:54.000000000 -0500
-+++ blender-2.30/configure	2003-11-06 02:03:08.000000000 -0500
-@@ -21431,8 +21431,8 @@
-            with_mozilla =$withval
-         fi
-         if test x$with_mozilla != "yes"; then
--           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla-$MOZVER -lnspr"
--           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla-$MOZVER/nspr"
-+           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla -lnspr4"
-+           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla/nspr"
-         fi
- 
- fi;
-@@ -25015,7 +25015,6 @@
-   fi
- 
- 
--  rm -f conf.sdltest
- 
- 
- echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
diff --git a/media-gfx/blender/files/configure-fix-2.31.patch b/media-gfx/blender/files/configure-fix-2.31.patch
deleted file mode 100644
index 25a2ea0a598c..000000000000
--- a/media-gfx/blender/files/configure-fix-2.31.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- blender-2.31/configure.old	2003-11-06 01:59:54.000000000 -0500
-+++ blender-2.31/configure	2003-11-06 02:03:08.000000000 -0500
-@@ -21431,8 +21431,8 @@
-            with_mozilla =$withval
-         fi
-         if test x$with_mozilla != "yes"; then
--           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla-$MOZVER -lnspr"
--           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla-$MOZVER/nspr"
-+           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla -lnspr4"
-+           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla/nspr"
-         fi
- 
- fi;
-@@ -25015,7 +25015,6 @@
-   fi
- 
- 
--  rm -f conf.sdltest
- 
- 
- echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
diff --git a/media-gfx/blender/files/configure-fix-2.31a.patch b/media-gfx/blender/files/configure-fix-2.31a.patch
deleted file mode 100644
index 1ec91901f105..000000000000
--- a/media-gfx/blender/files/configure-fix-2.31a.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- blender-2.31a.orig/configure	2003-12-04 23:47:25.000000000 +1300
-+++ blender-2.31a/configure	2003-12-04 23:49:54.000000000 +1300
-@@ -22221,8 +22221,8 @@
-            with_mozilla =$withval
-         fi
-         if test x$with_mozilla != "yes"; then
--           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla-$MOZVER -lnspr"
--           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla-$MOZVER/nspr"
-+           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla -lnspr4"
-+           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla/nspr"
-         fi
- 
- fi;
-@@ -26002,7 +26002,6 @@
-   fi
- 
- 
--  rm -f conf.sdltest
- 
- 
- echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
diff --git a/media-gfx/blender/files/digest-blender-2.30 b/media-gfx/blender/files/digest-blender-2.30
deleted file mode 100644
index d42c9c7625e0..000000000000
--- a/media-gfx/blender/files/digest-blender-2.30
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e413db3bdd6208ad47c35b66ce1fe58 blender-2.30.tar.bz2 4925781
diff --git a/media-gfx/blender/files/digest-blender-2.31 b/media-gfx/blender/files/digest-blender-2.31
deleted file mode 100644
index 7d2670e2e05c..000000000000
--- a/media-gfx/blender/files/digest-blender-2.31
+++ /dev/null
@@ -1 +0,0 @@
-MD5 179dea9a56c520582bf56c9a9c4d3bf9 blender-2.31.tar.bz2 4546274
diff --git a/media-gfx/blender/files/digest-blender-2.31a b/media-gfx/blender/files/digest-blender-2.31a
deleted file mode 100644
index e9edd6a60837..000000000000
--- a/media-gfx/blender/files/digest-blender-2.31a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 834d9236b233951d854b02f7cd3721fb blender-2.31a.tar.bz2 4540160
diff --git a/media-gfx/blender/files/digest-blender-2.32 b/media-gfx/blender/files/digest-blender-2.32
deleted file mode 100644
index d2cc05759542..000000000000
--- a/media-gfx/blender/files/digest-blender-2.32
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ebde5f573e19b7b8b64401d293c989e7 blender-2.32.tar.bz2 5661028
diff --git a/media-gfx/blender/files/digest-blender-2.33a b/media-gfx/blender/files/digest-blender-2.33a
deleted file mode 100644
index f5f9639505b5..000000000000
--- a/media-gfx/blender/files/digest-blender-2.33a
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 987aafbbca4c13a648516fbd35caac08 blender-2.33a.tar.bz2 5129415
-MD5 2816aeb104788bec8d7844f95bbd2269 blender-2.33a-gcc34.patch.bz2 1842
diff --git a/media-gfx/blender/files/digest-blender-2.36-r1 b/media-gfx/blender/files/digest-blender-2.36-r1
new file mode 100644
index 000000000000..bd39cfb8ea55
--- /dev/null
+++ b/media-gfx/blender/files/digest-blender-2.36-r1
@@ -0,0 +1 @@
+MD5 8e2237c86b12e6061935632495aec875 blender-2.36.tar.gz 6912828