media-gfx/blender: Migrate to scons-utils eclass (bug #302688)

(Portage version: 2.1.10.31/cvs/Linux x86_64)

5 files changed, 18 insertions, 16 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 4c18ced8e67d..18e497d0d37f 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.205 2011/10/29 21:49:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.206 2011/10/30 12:59:41 sping Exp $
+
+  30 Oct 2011; Sebastian Pipping <sping@gentoo.org> blender-2.48a-r3.ebuild,
+  blender-2.49a.ebuild, blender-2.49b-r2.ebuild, blender-2.57-r1.ebuild:
+  Migrate to escons from scons-utils eclass to fix compilation with
+  --load-average (or its variations) in MAKEOPTS (bug #302688)
 
   29 Oct 2011; Sebastian Pipping <sping@gentoo.org> blender-2.49b-r2.ebuild,
   blender-2.57-r1.ebuild:
diff --git a/media-gfx/blender/blender-2.48a-r3.ebuild b/media-gfx/blender/blender-2.48a-r3.ebuild
index 50efccd0e479..c3d6a15905b5 100644
--- a/media-gfx/blender/blender-2.48a-r3.ebuild
+++ b/media-gfx/blender/blender-2.48a-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.16 2011/07/08 10:22:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.17 2011/10/30 12:59:41 sping Exp $
 
 EAPI=2
 
-inherit multilib flag-o-matic eutils python
+inherit scons-utils multilib flag-o-matic eutils python
 
 #IUSE="jpeg mozilla png sdl static truetype"
 IUSE="blender-game ffmpeg jpeg nls openal openexr openmp
@@ -104,8 +104,7 @@ src_configure() {
 }
 
 src_compile() {
-	# scons uses -l differently -> remove it
-	scons ${MAKEOPTS/-l[0-9]} || die \
+	escons || die \
 	"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"
 
 	cd "${WORKDIR}"/install/linux2/plugins
diff --git a/media-gfx/blender/blender-2.49a.ebuild b/media-gfx/blender/blender-2.49a.ebuild
index 499f4f2028a3..692ce4285d88 100644
--- a/media-gfx/blender/blender-2.49a.ebuild
+++ b/media-gfx/blender/blender-2.49a.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.16 2011/07/08 10:22:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.17 2011/10/30 12:59:41 sping Exp $
 
 EAPI=2
 
-inherit multilib eutils python
+inherit scons-utils multilib eutils python
 
 IUSE="blender-game ffmpeg nls ogg openmp verse openal"
 
@@ -108,8 +108,7 @@ src_configure() {
 }
 
 src_compile() {
-	# scons uses -l differently -> remove it
-	scons ${MAKEOPTS/-l[0-9]} || die \
+	escons || die \
 	'!!! Please add "${S}/scons.config" when filing bugs reports \
 	to bugs.gentoo.org'
 
diff --git a/media-gfx/blender/blender-2.49b-r2.ebuild b/media-gfx/blender/blender-2.49b-r2.ebuild
index 09198e124213..a90f561e148c 100644
--- a/media-gfx/blender/blender-2.49b-r2.ebuild
+++ b/media-gfx/blender/blender-2.49b-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.10 2011/10/29 21:49:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.11 2011/10/30 12:59:41 sping Exp $
 
 EAPI=2
 
-inherit multilib eutils python
+inherit scons-utils multilib eutils python
 
 IUSE="blender-game ffmpeg nls ogg openmp verse openal"
 
@@ -110,8 +110,7 @@ src_configure() {
 }
 
 src_compile() {
-	# scons uses -l differently -> remove it
-	scons ${MAKEOPTS/-l[0-9]} || die \
+	escons || die \
 	'!!! Please add "${S}/scons.config" when filing bugs reports \
 	to bugs.gentoo.org'
 
diff --git a/media-gfx/blender/blender-2.57-r1.ebuild b/media-gfx/blender/blender-2.57-r1.ebuild
index 77de1a752c8a..4c0f768aeb8b 100644
--- a/media-gfx/blender/blender-2.57-r1.ebuild
+++ b/media-gfx/blender/blender-2.57-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.5 2011/10/29 21:49:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.6 2011/10/30 12:59:41 sping Exp $
 
 PYTHON_DEPEND="3:3.2"
 
@@ -11,7 +11,7 @@ SCM="subversion"
 ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
 fi
 
-inherit eutils python versionator flag-o-matic toolchain-funcs ${SCM}
+inherit scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
 
 IUSE="+game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
 	+dds debug fftw jack apidoc sndfile lcms tweak-mode sdl sse \
@@ -292,7 +292,7 @@ src_configure() {
 }
 
 src_compile() {
-	scons || die \
+	escons || die \
 		'!!! Please add "${S}/scons.config" when filing bugs reports \
 		to bugs.gentoo.org'