1 |
sping 11/10/30 12:59:41 |
2 |
|
3 |
Modified: blender-2.48a-r3.ebuild ChangeLog |
4 |
blender-2.57-r1.ebuild blender-2.49b-r2.ebuild |
5 |
blender-2.49a.ebuild |
6 |
Log: |
7 |
media-gfx/blender: Migrate to scons-utils eclass (bug #302688) |
8 |
|
9 |
(Portage version: 2.1.10.31/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.17 media-gfx/blender/blender-2.48a-r3.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?rev=1.17&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?rev=1.17&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?r1=1.16&r2=1.17 |
17 |
|
18 |
Index: blender-2.48a-r3.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v |
21 |
retrieving revision 1.16 |
22 |
retrieving revision 1.17 |
23 |
diff -u -r1.16 -r1.17 |
24 |
--- blender-2.48a-r3.ebuild 8 Jul 2011 10:22:39 -0000 1.16 |
25 |
+++ blender-2.48a-r3.ebuild 30 Oct 2011 12:59:41 -0000 1.17 |
26 |
@@ -1,10 +1,10 @@ |
27 |
# Copyright 1999-2011 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.16 2011/07/08 10:22:39 ssuominen Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.17 2011/10/30 12:59:41 sping Exp $ |
31 |
|
32 |
EAPI=2 |
33 |
|
34 |
-inherit multilib flag-o-matic eutils python |
35 |
+inherit scons-utils multilib flag-o-matic eutils python |
36 |
|
37 |
#IUSE="jpeg mozilla png sdl static truetype" |
38 |
IUSE="blender-game ffmpeg jpeg nls openal openexr openmp |
39 |
@@ -104,8 +104,7 @@ |
40 |
} |
41 |
|
42 |
src_compile() { |
43 |
- # scons uses -l differently -> remove it |
44 |
- scons ${MAKEOPTS/-l[0-9]} || die \ |
45 |
+ escons || die \ |
46 |
"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org" |
47 |
|
48 |
cd "${WORKDIR}"/install/linux2/plugins |
49 |
|
50 |
|
51 |
|
52 |
1.206 media-gfx/blender/ChangeLog |
53 |
|
54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.206&view=markup |
55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.206&content-type=text/plain |
56 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.205&r2=1.206 |
57 |
|
58 |
Index: ChangeLog |
59 |
=================================================================== |
60 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v |
61 |
retrieving revision 1.205 |
62 |
retrieving revision 1.206 |
63 |
diff -u -r1.205 -r1.206 |
64 |
--- ChangeLog 29 Oct 2011 21:49:19 -0000 1.205 |
65 |
+++ ChangeLog 30 Oct 2011 12:59:41 -0000 1.206 |
66 |
@@ -1,6 +1,11 @@ |
67 |
# ChangeLog for media-gfx/blender |
68 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
69 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.205 2011/10/29 21:49:19 sping Exp $ |
70 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.206 2011/10/30 12:59:41 sping Exp $ |
71 |
+ |
72 |
+ 30 Oct 2011; Sebastian Pipping <sping@g.o> blender-2.48a-r3.ebuild, |
73 |
+ blender-2.49a.ebuild, blender-2.49b-r2.ebuild, blender-2.57-r1.ebuild: |
74 |
+ Migrate to escons from scons-utils eclass to fix compilation with |
75 |
+ --load-average (or its variations) in MAKEOPTS (bug #302688) |
76 |
|
77 |
29 Oct 2011; Sebastian Pipping <sping@g.o> blender-2.49b-r2.ebuild, |
78 |
blender-2.57-r1.ebuild: |
79 |
|
80 |
|
81 |
|
82 |
1.6 media-gfx/blender/blender-2.57-r1.ebuild |
83 |
|
84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?rev=1.6&view=markup |
85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?rev=1.6&content-type=text/plain |
86 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?r1=1.5&r2=1.6 |
87 |
|
88 |
Index: blender-2.57-r1.ebuild |
89 |
=================================================================== |
90 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v |
91 |
retrieving revision 1.5 |
92 |
retrieving revision 1.6 |
93 |
diff -u -r1.5 -r1.6 |
94 |
--- blender-2.57-r1.ebuild 29 Oct 2011 21:49:19 -0000 1.5 |
95 |
+++ blender-2.57-r1.ebuild 30 Oct 2011 12:59:41 -0000 1.6 |
96 |
@@ -1,6 +1,6 @@ |
97 |
# Copyright 1999-2011 Gentoo Foundation |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.5 2011/10/29 21:49:19 sping Exp $ |
100 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.6 2011/10/30 12:59:41 sping Exp $ |
101 |
|
102 |
PYTHON_DEPEND="3:3.2" |
103 |
|
104 |
@@ -11,7 +11,7 @@ |
105 |
ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender" |
106 |
fi |
107 |
|
108 |
-inherit eutils python versionator flag-o-matic toolchain-funcs ${SCM} |
109 |
+inherit scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM} |
110 |
|
111 |
IUSE="+game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \ |
112 |
+dds debug fftw jack apidoc sndfile lcms tweak-mode sdl sse \ |
113 |
@@ -292,7 +292,7 @@ |
114 |
} |
115 |
|
116 |
src_compile() { |
117 |
- scons || die \ |
118 |
+ escons || die \ |
119 |
'!!! Please add "${S}/scons.config" when filing bugs reports \ |
120 |
to bugs.gentoo.org' |
121 |
|
122 |
|
123 |
|
124 |
|
125 |
1.11 media-gfx/blender/blender-2.49b-r2.ebuild |
126 |
|
127 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?rev=1.11&view=markup |
128 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?rev=1.11&content-type=text/plain |
129 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?r1=1.10&r2=1.11 |
130 |
|
131 |
Index: blender-2.49b-r2.ebuild |
132 |
=================================================================== |
133 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v |
134 |
retrieving revision 1.10 |
135 |
retrieving revision 1.11 |
136 |
diff -u -r1.10 -r1.11 |
137 |
--- blender-2.49b-r2.ebuild 29 Oct 2011 21:49:19 -0000 1.10 |
138 |
+++ blender-2.49b-r2.ebuild 30 Oct 2011 12:59:41 -0000 1.11 |
139 |
@@ -1,10 +1,10 @@ |
140 |
# Copyright 1999-2011 Gentoo Foundation |
141 |
# Distributed under the terms of the GNU General Public License v2 |
142 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.10 2011/10/29 21:49:19 sping Exp $ |
143 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.11 2011/10/30 12:59:41 sping Exp $ |
144 |
|
145 |
EAPI=2 |
146 |
|
147 |
-inherit multilib eutils python |
148 |
+inherit scons-utils multilib eutils python |
149 |
|
150 |
IUSE="blender-game ffmpeg nls ogg openmp verse openal" |
151 |
|
152 |
@@ -110,8 +110,7 @@ |
153 |
} |
154 |
|
155 |
src_compile() { |
156 |
- # scons uses -l differently -> remove it |
157 |
- scons ${MAKEOPTS/-l[0-9]} || die \ |
158 |
+ escons || die \ |
159 |
'!!! Please add "${S}/scons.config" when filing bugs reports \ |
160 |
to bugs.gentoo.org' |
161 |
|
162 |
|
163 |
|
164 |
|
165 |
1.17 media-gfx/blender/blender-2.49a.ebuild |
166 |
|
167 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?rev=1.17&view=markup |
168 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?rev=1.17&content-type=text/plain |
169 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?r1=1.16&r2=1.17 |
170 |
|
171 |
Index: blender-2.49a.ebuild |
172 |
=================================================================== |
173 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v |
174 |
retrieving revision 1.16 |
175 |
retrieving revision 1.17 |
176 |
diff -u -r1.16 -r1.17 |
177 |
--- blender-2.49a.ebuild 8 Jul 2011 10:22:39 -0000 1.16 |
178 |
+++ blender-2.49a.ebuild 30 Oct 2011 12:59:41 -0000 1.17 |
179 |
@@ -1,10 +1,10 @@ |
180 |
# Copyright 1999-2011 Gentoo Foundation |
181 |
# Distributed under the terms of the GNU General Public License v2 |
182 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.16 2011/07/08 10:22:39 ssuominen Exp $ |
183 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.17 2011/10/30 12:59:41 sping Exp $ |
184 |
|
185 |
EAPI=2 |
186 |
|
187 |
-inherit multilib eutils python |
188 |
+inherit scons-utils multilib eutils python |
189 |
|
190 |
IUSE="blender-game ffmpeg nls ogg openmp verse openal" |
191 |
|
192 |
@@ -108,8 +108,7 @@ |
193 |
} |
194 |
|
195 |
src_compile() { |
196 |
- # scons uses -l differently -> remove it |
197 |
- scons ${MAKEOPTS/-l[0-9]} || die \ |
198 |
+ escons || die \ |
199 |
'!!! Please add "${S}/scons.config" when filing bugs reports \ |
200 |
to bugs.gentoo.org' |