Make scriptsdir behaviour a little different

Package-Manager: portage-2.1.3_rc6

4 files changed, 110 insertions, 10 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 5fffe9df26e3..81d1e5f87950 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.115 2007/05/17 06:58:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.116 2007/07/15 09:50:28 lu_zero Exp $
+
+  15 Jul 2007; Luca Barbato <lu_zero@gentoo.org>
+  +files/blender-2.44-scriptsdir.patch, blender-2.44.ebuild:
+  make scriptsdir behaviour a little different
 
 *blender-2.44 (17 May 2007)
 
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 789a156edd0a..b781e0ed8649 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -2,6 +2,10 @@ AUX blender-2.37-dirs.patch 725 RMD160 3496386616f3066e1a237921f8ecc695a21b142e
 MD5 bcc3b86202d4c6bb85ef9cef08bfcf9e files/blender-2.37-dirs.patch 725
 RMD160 3496386616f3066e1a237921f8ecc695a21b142e files/blender-2.37-dirs.patch 725
 SHA256 18ed351fd88c1bf952c86425dc769143cda6c5cd25e948ec1e1c0a1b911d44f7 files/blender-2.37-dirs.patch 725
+AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108879999 SHA1 50143946828d3f2b2568e71fae5ed28f6adf7449 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4
+MD5 969160ddcac4ca5bd002174829a4bc9c files/blender-2.44-scriptsdir.patch 2586
+RMD160 8e80859edf1fae2f401b326be4cb939108879999 files/blender-2.44-scriptsdir.patch 2586
+SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4 files/blender-2.44-scriptsdir.patch 2586
 AUX blender.desktop 197 RMD160 6d5bf65f7cdce71123f193b0912c42e212832af7 SHA1 d0387c8e525a7c24b1a150a36fc6152874d0136e SHA256 dff04dfaa1c1105099717a04af9c6ad028c7cd5a2e21d72f6dc7182ca703cff1
 MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
 RMD160 6d5bf65f7cdce71123f193b0912c42e212832af7 files/blender.desktop 197
@@ -33,14 +37,14 @@ EBUILD blender-2.43.ebuild 3631 RMD160 109265f484e4ce753d11f55951ffc6416a1c4e25
 MD5 b05198e573d6d35a7bf7e9e975301362 blender-2.43.ebuild 3631
 RMD160 109265f484e4ce753d11f55951ffc6416a1c4e25 blender-2.43.ebuild 3631
 SHA256 3fa42554aa537feec8b98c32ecda0305951078c52e341011a2da0017f838e6ee blender-2.43.ebuild 3631
-EBUILD blender-2.44.ebuild 3465 RMD160 8be3a00bf098a6db2bbb29de540654c066bde17f SHA1 7cb91c90ca8e8358a04197db8ec7afe92998700a SHA256 08ee73ef8bed38fb784a3bd4df02d36d3e4d6382e8201f0a7b8033ca16cac1b9
-MD5 8486c8cc7a655ea20e228cfb7f059f60 blender-2.44.ebuild 3465
-RMD160 8be3a00bf098a6db2bbb29de540654c066bde17f blender-2.44.ebuild 3465
-SHA256 08ee73ef8bed38fb784a3bd4df02d36d3e4d6382e8201f0a7b8033ca16cac1b9 blender-2.44.ebuild 3465
-MISC ChangeLog 16299 RMD160 78019ced176e264ed2a2ec594d4ac5fd29a02285 SHA1 962e2991c1caf7bcee497ab65ea70866943fa020 SHA256 0365575d1500eead895a473e460169ccd034838fc2f026c1f6383225742ce6a5
-MD5 26de10ad4bde4cb611f858d92c188e60 ChangeLog 16299
-RMD160 78019ced176e264ed2a2ec594d4ac5fd29a02285 ChangeLog 16299
-SHA256 0365575d1500eead895a473e460169ccd034838fc2f026c1f6383225742ce6a5 ChangeLog 16299
+EBUILD blender-2.44.ebuild 3515 RMD160 df2b1067d1d68b97dbb36cc827f048d0f0e1e95e SHA1 8d366d29554e05ccfa7005fe338b149bc05c4a10 SHA256 96607f9b35a1e8f5994c89b21dfe71a37d909cd59aae5d48c9c9f8e1f64efef6
+MD5 6cba04e52b1ca80c22e1860772ea154e blender-2.44.ebuild 3515
+RMD160 df2b1067d1d68b97dbb36cc827f048d0f0e1e95e blender-2.44.ebuild 3515
+SHA256 96607f9b35a1e8f5994c89b21dfe71a37d909cd59aae5d48c9c9f8e1f64efef6 blender-2.44.ebuild 3515
+MISC ChangeLog 16457 RMD160 22866b25f45102fd92099842ba52e4e0ed54dc14 SHA1 38c4c0f5159b162f26f9eda30af06bbfb243df06 SHA256 33ed0f018246e967dea457a683d3ec51ff73293ff3cdea4e15d59ecee0435b2a
+MD5 644ad47301befcf8f931e48ff24c017d ChangeLog 16457
+RMD160 22866b25f45102fd92099842ba52e4e0ed54dc14 ChangeLog 16457
+SHA256 33ed0f018246e967dea457a683d3ec51ff73293ff3cdea4e15d59ecee0435b2a ChangeLog 16457
 MISC metadata.xml 492 RMD160 c477917476fbde6356586768276eda1ea31ae3ea SHA1 4a109fbded83a3f6c403ab5f3ec20e7113c1a26c SHA256 0ef00c095e68d12b312f8558b8909b4ae633717cf12932d7a4e479faf7fb9e18
 MD5 cfcd6135fc23767decafee2a97f5ac0a metadata.xml 492
 RMD160 c477917476fbde6356586768276eda1ea31ae3ea metadata.xml 492
diff --git a/media-gfx/blender/blender-2.44.ebuild b/media-gfx/blender/blender-2.44.ebuild
index cd71d70499cb..049e02a4c5bb 100644
--- a/media-gfx/blender/blender-2.44.ebuild
+++ b/media-gfx/blender/blender-2.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.44.ebuild,v 1.1 2007/05/17 06:58:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.44.ebuild,v 1.2 2007/07/15 09:50:28 lu_zero Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -59,6 +59,7 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/blender-2.37-dirs.patch
+	epatch ${FILESDIR}/blender-2.44-scriptsdir.patch
 
 	if use ffmpeg ; then
 		cd ${S}/extern
diff --git a/media-gfx/blender/files/blender-2.44-scriptsdir.patch b/media-gfx/blender/files/blender-2.44-scriptsdir.patch
new file mode 100644
index 000000000000..398ccc5e9a91
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.44-scriptsdir.patch
@@ -0,0 +1,91 @@
+--- blender-2.44/source/blender/python/api2_2x/EXPP_interface.c.orig	2006-05-01 14:24:56.000000000 +0200
++++ blender-2.44/source/blender/python/api2_2x/EXPP_interface.c	2007-06-21 22:25:39.000000000 +0200
+@@ -52,85 +52,13 @@
+ */
+ char *bpy_gethome(int append_scriptsdir)
+ {
+-	static char homedir[FILE_MAXDIR];
+-	static char scriptsdir[FILE_MAXDIR];
+-	char tmpdir[FILE_MAXDIR];
+-	char bprogdir[FILE_MAXDIR];
+-	char *s;
+-	int i;
++	static char homedir[FILE_MAXDIR]="/usr/share/blender";
++	static char scriptsdir[FILE_MAXDIR]="/usr/share/blender/scripts";
+ 
+ 	if (append_scriptsdir) {
+-		if (scriptsdir[0] != '\0')
+ 			return scriptsdir;
+ 	}
+-	else if (homedir[0] != '\0')
+-		return homedir;
+-
+-	/* BLI_gethome() can return NULL if env vars are not set */
+-	s = BLI_gethome();
+-
+-	if( !s )  /* bail if no $HOME */
+-	{
+-		printf("$HOME is NOT set\n");
+-		return NULL;
+-	}
+-
+-	if( strstr( s, ".blender" ) )
+-		PyOS_snprintf( homedir, FILE_MAXDIR, s );
+-	else
+-		BLI_make_file_string( "/", homedir, s, ".blender" );
+-
+-	/* if userhome/.blender/ exists, return it */
+-	if( BLI_exists( homedir ) ) {
+-		if (append_scriptsdir) {
+-			BLI_make_file_string("/", scriptsdir, homedir, "scripts");
+-			if (BLI_exists (scriptsdir)) return scriptsdir;
+-		}
+-		else return homedir;
+-	}
+-	else homedir[0] = '\0';
+-
+-	/* if either:
+-	 * no homedir was found or
+-	 * append_scriptsdir = 1 but there's no scripts/ inside homedir,
+-	 * 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, "%s", bprogname );
+-
+-	/* using tmpdir to preserve homedir (if) found above:
+-	 * the ideal is to have a home dir with scripts dir inside
+-	 * it, but if that isn't available, it's possible to
+-	 * have a 'broken' home dir somewhere and a scripts dir in the
+-	 * cvs sources */
+-	BLI_make_file_string( "/", tmpdir, bprogdir, ".blender" );
+-
+-	if (BLI_exists(tmpdir)) {
+-		if (append_scriptsdir) {
+-			BLI_make_file_string("/", scriptsdir, tmpdir, "scripts");
+-			if (BLI_exists(scriptsdir)) {
+-				PyOS_snprintf(homedir, FILE_MAXDIR, "%s", tmpdir);
+-				return scriptsdir;
+-			}
+-			else {
+-				homedir[0] = '\0';
+-				scriptsdir[0] = '\0';
+-			}
+-		}
+-		else return homedir;
+-	}
+-
+-	/* last try for scripts dir: blender in cvs dir, scripts/ inside release/: */
+-	if (append_scriptsdir) {
+-		BLI_make_file_string("/", scriptsdir, bprogdir, "release/scripts");
+-		if (BLI_exists(scriptsdir)) return scriptsdir;
+-		else scriptsdir[0] = '\0';
+-	}
+-
+-	return NULL;
++	return homedir;
+ }
+ 
+ /* PyDrivers */