[patch] diff for file (id=119491) fixing python-2.4 requirement

blender-2.44.ebuild.diff (text/plain), 1.70 KB, created by Cornelius Weig on 2007-05-17 05:37:02 UTC

--- blender-2.44.ebuild.orig	2007-05-17 04:25:40.000000000 +0100
+++ blender-2.44.ebuild	2007-05-17 06:29:08.000000000 +0100
@@ -21,6 +21,7 @@
 			>=media-libs/x264-svn-20061014 )
 	jpeg? ( media-libs/jpeg )
 	media-libs/tiff
+	>=dev-lang/python-2.4
 	nls? ( >=media-libs/freetype-2.0
 			virtual/libintl
 			>=media-libs/ftgl-2.1 )
@@ -47,7 +48,6 @@
 		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
 			>> ${S}/user-config.py
 	fi
-	return 0
 }
 
 src_unpack() {
@@ -66,22 +66,29 @@
 		unpack ffmpeg-${FFMPEG_SNAP}.tar.bz2
 		mv ${T}/Makefile ${T}/common.mak ffmpeg
 	fi
-	# pass compiler flags to the scons build system
-	echo "CFLAGS += '${CFLAGS}'" >> ${S}/user-config.py
-	# disable blender-player and iconv
-	# echo "WITH_BF_PLAYER=0" >> ${S}/user-config.py
-	# echo "WITH_BF_ICONV=0" >> ${S}/user-config.py
+
 }
 
 
 src_compile() {
-	myconf="${myconf} $(blend_with openal)"
-	myconf="${myconf} $(blend_with openexr)"
-	myconf="${myconf} $(blend_with jpeg)"
-	myconf="${myconf} $(blend_with ffmpeg)"
-	myconf="${myconf} $(blend_with png)"
-	myconf="${myconf} $(blend_with nls international)"
-	myconf="${myconf} $(blend_with blender-game gameengine)"
+	# pass compiler flags to the scons build system
+	# and set python version to newest stable in portage
+	cat <<- EOF >> ${S}/user-config.py
+		CFLAGS += '${CFLAGS}'
+		BF_PYTHON_VERSION="2.4"
+		BF_PYTHON_INC="/usr/include/python2.4"
+		BF_PYTHON_BINARY="/usr/bin/python2.4"
+		BF_PYTHON_LIB="python2.4"
+	EOF
+	for arg in 'openal' \
+			'openexr' \
+			'jpeg' \
+			'ffmpeg' \
+			'png' \
+			'nls international' \
+			'blender-game gameengine'; do
+		blend_with ${arg}
+	done
 
 	# scons uses -l differently -> remove it
 	scons ${MAKEOPTS/-l[0-9]} -h > scons.config