Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/boost: boost-1.39.0.ebuild boost-1.37.0-r1.ebuild ChangeLog boost-1.35.0-r2.ebuild boost-1.35.0-r5.ebuild boost-1.41.0-r3.ebuild boost-1.42.0.ebuild
Date: Sun, 25 Apr 2010 18:28:19
Message-Id: 20100425182815.14A9D2C04C@corvid.gentoo.org
1 arfrever 10/04/25 18:28:15
2
3 Modified: boost-1.39.0.ebuild boost-1.37.0-r1.ebuild
4 ChangeLog boost-1.35.0-r2.ebuild
5 boost-1.35.0-r5.ebuild boost-1.41.0-r3.ebuild
6 boost-1.42.0.ebuild
7 Log:
8 Delete calls to deprecated python_version().
9 (Portage version: HEAD/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.9 dev-libs/boost/boost-1.39.0.ebuild
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.39.0.ebuild?rev=1.9&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.39.0.ebuild?rev=1.9&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.39.0.ebuild?r1=1.8&r2=1.9
17
18 Index: boost-1.39.0.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.39.0.ebuild,v
21 retrieving revision 1.8
22 retrieving revision 1.9
23 diff -u -r1.8 -r1.9
24 --- boost-1.39.0.ebuild 25 Nov 2009 17:59:16 -0000 1.8
25 +++ boost-1.39.0.ebuild 25 Apr 2010 18:28:14 -0000 1.9
26 @@ -1,6 +1,6 @@
27 -# Copyright 1999-2009 Gentoo Foundation
28 +# Copyright 1999-2010 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.39.0.ebuild,v 1.8 2009/11/25 17:59:16 jer Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.39.0.ebuild,v 1.9 2010/04/25 18:28:14 arfrever Exp $
32
33 EAPI="2"
34
35 @@ -117,8 +117,7 @@
36 use mpi && mpi="using mpi ;"
37
38 if use python ; then
39 - python_version
40 - pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;"
41 + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;"
42 fi
43
44 cat > "${S}/user-config.jam" << __EOF__
45 @@ -221,10 +220,10 @@
46
47 # Move the mpi.so to the right place and make sure it's slotted
48 if use mpi && use python; then
49 - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}"
50 - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/"
51 - touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py"
52 - _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\""
53 + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}"
54 + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/"
55 + touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py"
56 + _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\""
57 fi
58
59 if use doc ; then
60
61
62
63 1.15 dev-libs/boost/boost-1.37.0-r1.ebuild
64
65 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?rev=1.15&view=markup
66 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?rev=1.15&content-type=text/plain
67 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild?r1=1.14&r2=1.15
68
69 Index: boost-1.37.0-r1.ebuild
70 ===================================================================
71 RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v
72 retrieving revision 1.14
73 retrieving revision 1.15
74 diff -u -r1.14 -r1.15
75 --- boost-1.37.0-r1.ebuild 25 Nov 2009 17:59:16 -0000 1.14
76 +++ boost-1.37.0-r1.ebuild 25 Apr 2010 18:28:14 -0000 1.15
77 @@ -1,6 +1,6 @@
78 -# Copyright 1999-2009 Gentoo Foundation
79 +# Copyright 1999-2010 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.14 2009/11/25 17:59:16 jer Exp $
82 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.15 2010/04/25 18:28:14 arfrever Exp $
83
84 EAPI="2"
85
86 @@ -123,8 +123,7 @@
87 use mpi && mpi="using mpi ;"
88
89 if use python ; then
90 - python_version
91 - pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;"
92 + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;"
93 fi
94
95 cat > "${S}/user-config.jam" << __EOF__
96 @@ -227,10 +226,10 @@
97
98 # Move the mpi.so to the right place and make sure it's slotted
99 if use mpi && use python; then
100 - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}"
101 - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/"
102 - touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py"
103 - _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\""
104 + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}"
105 + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/"
106 + touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py"
107 + _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\""
108 fi
109
110 if use doc ; then
111
112
113
114 1.196 dev-libs/boost/ChangeLog
115
116 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.196&view=markup
117 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.196&content-type=text/plain
118 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?r1=1.195&r2=1.196
119
120 Index: ChangeLog
121 ===================================================================
122 RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v
123 retrieving revision 1.195
124 retrieving revision 1.196
125 diff -u -r1.195 -r1.196
126 --- ChangeLog 22 Apr 2010 17:25:16 -0000 1.195
127 +++ ChangeLog 25 Apr 2010 18:28:14 -0000 1.196
128 @@ -1,6 +1,11 @@
129 # ChangeLog for dev-libs/boost
130 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
131 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.195 2010/04/22 17:25:16 ssuominen Exp $
132 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.196 2010/04/25 18:28:14 arfrever Exp $
133 +
134 + 25 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
135 + boost-1.35.0-r2.ebuild, boost-1.35.0-r5.ebuild, boost-1.37.0-r1.ebuild,
136 + boost-1.39.0.ebuild, boost-1.41.0-r3.ebuild, boost-1.42.0.ebuild:
137 + Delete calls to deprecated python_version().
138
139 22 Apr 2010; Samuli Suominen <ssuominen@g.o>
140 -boost-1.36.0-r1.ebuild:
141
142
143
144 1.15 dev-libs/boost/boost-1.35.0-r2.ebuild
145
146 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild?rev=1.15&view=markup
147 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild?rev=1.15&content-type=text/plain
148 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild?r1=1.14&r2=1.15
149
150 Index: boost-1.35.0-r2.ebuild
151 ===================================================================
152 RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild,v
153 retrieving revision 1.14
154 retrieving revision 1.15
155 diff -u -r1.14 -r1.15
156 --- boost-1.35.0-r2.ebuild 21 Oct 2009 16:57:23 -0000 1.14
157 +++ boost-1.35.0-r2.ebuild 25 Apr 2010 18:28:14 -0000 1.15
158 @@ -1,6 +1,6 @@
159 -# Copyright 1999-2009 Gentoo Foundation
160 +# Copyright 1999-2010 Gentoo Foundation
161 # Distributed under the terms of the GNU General Public License v2
162 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild,v 1.14 2009/10/21 16:57:23 djc Exp $
163 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild,v 1.15 2010/04/25 18:28:14 arfrever Exp $
164
165 inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
166
167 @@ -94,7 +94,6 @@
168
169 generate_userconfig() {
170 einfo "Writing new user-config.jam"
171 - python_version
172
173 local compiler compilerVersion compilerExecutable
174 if [[ ${CHOST} == *-darwin* ]] ; then
175 @@ -114,7 +113,7 @@
176 variant gentoodebug : debug : <optimization>none <debug-symbols>none ;
177
178 using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
179 -using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;
180 +using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;
181
182 __EOF__
183
184 @@ -171,8 +170,8 @@
185
186 # Move the mpi.so to the right place
187 if use mpi; then
188 - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages"
189 - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages"
190 + mkdir -p "${D}$(python_get_sitedir)"
191 + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)"
192 fi
193
194 if use doc ; then
195
196
197
198 1.15 dev-libs/boost/boost-1.35.0-r5.ebuild
199
200 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.35.0-r5.ebuild?rev=1.15&view=markup
201 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.35.0-r5.ebuild?rev=1.15&content-type=text/plain
202 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.35.0-r5.ebuild?r1=1.14&r2=1.15
203
204 Index: boost-1.35.0-r5.ebuild
205 ===================================================================
206 RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r5.ebuild,v
207 retrieving revision 1.14
208 retrieving revision 1.15
209 diff -u -r1.14 -r1.15
210 --- boost-1.35.0-r5.ebuild 27 Dec 2009 12:51:09 -0000 1.14
211 +++ boost-1.35.0-r5.ebuild 25 Apr 2010 18:28:14 -0000 1.15
212 @@ -1,6 +1,6 @@
213 -# Copyright 1999-2009 Gentoo Foundation
214 +# Copyright 1999-2010 Gentoo Foundation
215 # Distributed under the terms of the GNU General Public License v2
216 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r5.ebuild,v 1.14 2009/12/27 12:51:09 armin76 Exp $
217 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r5.ebuild,v 1.15 2010/04/25 18:28:14 arfrever Exp $
218
219 EAPI="2"
220
221 @@ -110,8 +110,7 @@
222 use mpi && mpi="using mpi ;"
223
224 if use python ; then
225 - python_version
226 - pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;"
227 + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;"
228 fi
229
230 cat > "${S}/user-config.jam" << __EOF__
231 @@ -192,10 +191,10 @@
232
233 # Move the mpi.so to the right place and make sure it's slotted
234 if use mpi && use python; then
235 - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}"
236 - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/"
237 - touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py"
238 - _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\""
239 + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}"
240 + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/"
241 + touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py"
242 + _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\""
243 fi
244
245 if use doc ; then
246
247
248
249 1.10 dev-libs/boost/boost-1.41.0-r3.ebuild
250
251 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.41.0-r3.ebuild?rev=1.10&view=markup
252 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.41.0-r3.ebuild?rev=1.10&content-type=text/plain
253 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.41.0-r3.ebuild?r1=1.9&r2=1.10
254
255 Index: boost-1.41.0-r3.ebuild
256 ===================================================================
257 RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.41.0-r3.ebuild,v
258 retrieving revision 1.9
259 retrieving revision 1.10
260 diff -u -r1.9 -r1.10
261 --- boost-1.41.0-r3.ebuild 17 Apr 2010 23:52:17 -0000 1.9
262 +++ boost-1.41.0-r3.ebuild 25 Apr 2010 18:28:14 -0000 1.10
263 @@ -1,6 +1,6 @@
264 # Copyright 1999-2010 Gentoo Foundation
265 # Distributed under the terms of the GNU General Public License v2
266 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.41.0-r3.ebuild,v 1.9 2010/04/17 23:52:17 josejx Exp $
267 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.41.0-r3.ebuild,v 1.10 2010/04/25 18:28:14 arfrever Exp $
268
269 EAPI="2"
270
271 @@ -51,8 +51,7 @@
272 pkg_setup() {
273 # It doesn't compile with USE="python mpi" and python-3 (bug 295705)
274 if use python && use mpi ; then
275 - python_version
276 - if [[ "${PYVER_MAJOR}" != "2" ]]; then
277 + if [[ "$(python_get_version --major)" != "2" ]]; then
278 eerror "The Boost.MPI python bindings do not support any other python version"
279 eerror "than 2.x. Please either use eselect to select a python 2.x version or"
280 eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}."
281 @@ -142,8 +141,7 @@
282 use mpi && mpi="using mpi ;"
283
284 if use python ; then
285 - python_version
286 - pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;"
287 + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;"
288 fi
289
290 cat > "${S}/user-config.jam" << __EOF__
291 @@ -264,10 +262,10 @@
292
293 # Move the mpi.so to the right place and make sure it's slotted
294 if use mpi && use python; then
295 - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}"
296 - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/"
297 - touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py"
298 - _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\""
299 + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}"
300 + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/"
301 + touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py"
302 + _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\""
303 fi
304
305 if use doc ; then
306
307
308
309 1.3 dev-libs/boost/boost-1.42.0.ebuild
310
311 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.42.0.ebuild?rev=1.3&view=markup
312 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.42.0.ebuild?rev=1.3&content-type=text/plain
313 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.42.0.ebuild?r1=1.2&r2=1.3
314
315 Index: boost-1.42.0.ebuild
316 ===================================================================
317 RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.42.0.ebuild,v
318 retrieving revision 1.2
319 retrieving revision 1.3
320 diff -u -r1.2 -r1.3
321 --- boost-1.42.0.ebuild 28 Mar 2010 17:16:04 -0000 1.2
322 +++ boost-1.42.0.ebuild 25 Apr 2010 18:28:14 -0000 1.3
323 @@ -1,6 +1,6 @@
324 # Copyright 1999-2010 Gentoo Foundation
325 # Distributed under the terms of the GNU General Public License v2
326 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.42.0.ebuild,v 1.2 2010/03/28 17:16:04 armin76 Exp $
327 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.42.0.ebuild,v 1.3 2010/04/25 18:28:14 arfrever Exp $
328
329 EAPI="2"
330
331 @@ -50,8 +50,7 @@
332 pkg_setup() {
333 # It doesn't compile with USE="python mpi" and python-3 (bug 295705)
334 if use python && use mpi ; then
335 - python_version
336 - if [[ "${PYVER_MAJOR}" != "2" ]]; then
337 + if [[ "$(python_get_version --major)" != "2" ]]; then
338 eerror "The Boost.MPI python bindings do not support any other python version"
339 eerror "than 2.x. Please either use eselect to select a python 2.x version or"
340 eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}."
341 @@ -127,8 +126,7 @@
342 use mpi && mpi="using mpi ;"
343
344 if use python ; then
345 - python_version
346 - pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;"
347 + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;"
348 fi
349
350 cat > "${S}/user-config.jam" << __EOF__
351 @@ -258,10 +256,10 @@
352
353 # Move the mpi.so to the right place and make sure it's slotted
354 if use mpi && use python; then
355 - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}" || die
356 - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/" || die
357 - touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py" || die
358 - _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\""
359 + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
360 + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/" || die
361 + touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die
362 + _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\""
363 fi
364
365 if use doc ; then