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

Package-Manager: portage-2.1.10.31/cvs/Linux x86_64

6 files changed, 26 insertions, 24 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/Manifest b/media-gfx/blender/Manifest
index dd1434226b4f..69b64f92ae3a 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -29,16 +29,16 @@ DIST blender-2.48a.tar.gz 21502247 RMD160 5ef94d6019302bfea86d5657af738d1d86a8bc
 DIST blender-2.49a.tar.gz 23039535 RMD160 f37100c7a02c75b622b8e055f32f06e064a62de2 SHA1 59f5be96eda874bb901390f55a70d58cf8e0b979 SHA256 b206b878a6f96d1e8561ee62a58fba1af4141579c27f51ec795f08f4129eb1fc
 DIST blender-2.49b.tar.gz 22918377 RMD160 5b641de7b41af5e4186c9721b66eddc6870f9fbc SHA1 43f71e7de4efe79c518d45f4b5a04e03c28d5fc5 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d815c8bc874a04746adc4752488
 DIST blender-2.57.tar.gz 16806453 RMD160 d2f4d14cb08067a3d1fb3c1661772cf8f3a9bfaa SHA1 c539e2640dfa2a17e044d0f296219b866242112a SHA256 8bd1812166f2dd96e158c1898a666adc1f9f109765d5cd7ff3a8adeae60794b8
-EBUILD blender-2.48a-r3.ebuild 4097 RMD160 83ffd9a2c440bc825de7bb928e9c101c02f5bac3 SHA1 c139bf8af7e4d8fe606d6f331ef9cb6862608e29 SHA256 be938e23ab30b2c8c779cf557e3430448287cc59d51a06dc6ea85b98bb9f19b9
-EBUILD blender-2.49a.ebuild 4872 RMD160 ddfae1234db4ef3ba48ce6d2d69fe68b6ba43d0c SHA1 22238798714710f654dd2f252c6eafefef503087 SHA256 b9c70199b724c18ef5e9c92c7ef18235904585a830da45b8d94247d26d4b8ee9
-EBUILD blender-2.49b-r2.ebuild 5054 RMD160 411b0ebef77fdee0bd63a1460285addd99681dea SHA1 bf3051828d301eed1559e7ea49816f10d0c1f3ac SHA256 ac0e9d10edf76e1373c22ae780d35532b339d525032bd2953c76d95920e045c3
-EBUILD blender-2.57-r1.ebuild 13883 RMD160 c3abff28bc8533dedabf62bbca8054ba89a39e16 SHA1 6866939d1c5ebf53de63c273b37a2b57bca95fcd SHA256 326ae3be3c62ef439446336f94497f5393fed622c25b717afc0a7fbbd2219a97
-MISC ChangeLog 31107 RMD160 cc7a65da1274b6db43be6963e07a640d789bb0d5 SHA1 06864d74195178b897c7e2fa5cc87bea1f45c973 SHA256 ed6d1a202d2115b540b1ec1933e231fe13aa97822619ee2196efbd56f599697a
+EBUILD blender-2.48a-r3.ebuild 4044 RMD160 831a9636988fb1a5ca9a406e45e6bf204511b609 SHA1 9b7b45cd51aa2057a1043d40223dd6a742282919 SHA256 5b677a561cb8c02ebb9527e78f9a11385d1e902602d0caa3d932e135f20af335
+EBUILD blender-2.49a.ebuild 4819 RMD160 109229feaf551d5c4829ecad0f4eb7c9cfea8c1e SHA1 3537ea47e3ccb11df14c321580559e04452bb7ee SHA256 67af33393f99caee9c451feb548d98836d2a0d75c714c253ec01416281339ed4
+EBUILD blender-2.49b-r2.ebuild 5005 RMD160 8b247b92bc630db8f6f49b73fd1a8b584eebe94a SHA1 a8b9ec81f68131dc7173849be7bf8d76be12a9f7 SHA256 929b7ce11ae8039327e001aef95b097058040e013ea2e0b1320b4921d48ba3f5
+EBUILD blender-2.57-r1.ebuild 13896 RMD160 c951c55eb6d75e23b0a1036d00c83f5fe43715b9 SHA1 5552a52bbaef2c5e500bd6599b9c4d900531c63f SHA256 87afb2da4e58e2e88061d6773e46ca3401c93533d7076f2010b4691141face02
+MISC ChangeLog 31389 RMD160 af840d233250b01db6768eb99bb59ab7e68b558f SHA1 33ab421738342e5396decbbe2ebc678138f39f84 SHA256 ac5282326313e3a15c6de63845bc7f3451e633572041d0f5fb9fa3c0a01b4b3c
 MISC metadata.xml 1799 RMD160 7330ec5ccf7f7a86f31abf0b5f45bf84025c505a SHA1 a8bc4c5db954f24ea50e879b1bdbd5753430b3ee SHA256 f4bc849a0cc6a805fe6624699c5c1b9248336f7b879484f777f31b7c755759ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6sdOIACgkQsAvGakAaFgBanwCglp6E0T7iHQBfIvHQP4sBhGis
-f9kAoJq8ey1+qlx/KPO6QFdtBB8d76Hr
-=JU2V
+iEYEARECAAYFAk6tSkAACgkQsAvGakAaFgAozgCgkP913+fe6GQG0FOXcvFL0AtH
+WYAAoJUC+XNlIB1i4/Bexu2zYCDxC5rM
+=hIFQ
 -----END PGP SIGNATURE-----
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'