Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-libs/boost/files/, dev-libs/boost/
Date: Mon, 21 Sep 2015 16:05:14
Message-Id: 1442851101.c7ea88eb60519c2326856fdc188b25c698e51948.jlec@gentoo
1 commit: c7ea88eb60519c2326856fdc188b25c698e51948
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 21 15:58:21 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 21 15:58:21 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c7ea88eb
7
8 Drop obsolete
9
10 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
11
12 dev-libs/boost/ChangeLog | 27 --
13 dev-libs/boost/boost-1.56.0-r2.ebuild | 398 ---------------------
14 .../files/boost-1.48.0-disable_icu_rpath.patch | 29 --
15 .../boost-1.48.0-disable_libboost_python3.patch | 62 ----
16 .../boost-1.48.0-no_strict_aliasing_python2.patch | 23 --
17 .../boost/files/boost-1.48.0-python_linking.patch | 24 --
18 .../boost-1.51.0-respect_python-buildid.patch | 69 ----
19 ...ost-1.51.0-support_dots_in_python-buildid.patch | 22 --
20 dev-libs/boost/files/boost-1.52.0-threads.patch | 63 ----
21 .../boost/files/boost-1.55.0-context-x32.patch | 42 ---
22 .../files/boost-1.55.0-tools-c98-compat.patch | 17 -
23 .../files/boost-1.56.0-build-auto_index-tool.patch | 13 -
24 dev-libs/boost/metadata.xml | 41 ---
25 13 files changed, 830 deletions(-)
26
27 diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
28 deleted file mode 100644
29 index 3aeda1c..0000000
30 --- a/dev-libs/boost/ChangeLog
31 +++ /dev/null
32 @@ -1,27 +0,0 @@
33 -# ChangeLog for dev-libs/boost
34 -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
35 -# $Id$
36 -
37 - 08 Jun 2015; Justin Lecher <jlec@g.o> metadata.xml:
38 - dev-libs/boost: Updating remote-id in metadata.xml
39 -
40 - 02 Apr 2015; Justin Lecher <jlec@g.o> boost-1.56.0-r2.ebuild,
41 - metadata.xml:
42 - dev-libs/boost: Move to new CAT
43 -
44 - 19 Feb 2015; Christoph Junghans <ottxor@g.o> boost-1.56.0-r2.ebuild:
45 - dropped sparc
46 -
47 -*boost-1.56.0-r2 (17 Feb 2015)
48 -
49 - 17 Feb 2015; Christoph Junghans <ottxor@g.o> +boost-1.56.0-r2.ebuild,
50 - +files/boost-1.48.0-disable_icu_rpath.patch,
51 - +files/boost-1.48.0-disable_libboost_python3.patch,
52 - +files/boost-1.48.0-no_strict_aliasing_python2.patch,
53 - +files/boost-1.48.0-python_linking.patch,
54 - +files/boost-1.51.0-respect_python-buildid.patch,
55 - +files/boost-1.51.0-support_dots_in_python-buildid.patch,
56 - +files/boost-1.52.0-threads.patch, +files/boost-1.55.0-context-x32.patch,
57 - +files/boost-1.55.0-tools-c98-compat.patch,
58 - +files/boost-1.56.0-build-auto_index-tool.patch, +metadata.xml:
59 - added full multilib version
60
61 diff --git a/dev-libs/boost/boost-1.56.0-r2.ebuild b/dev-libs/boost/boost-1.56.0-r2.ebuild
62 deleted file mode 100644
63 index c023e7c..0000000
64 --- a/dev-libs/boost/boost-1.56.0-r2.ebuild
65 +++ /dev/null
66 @@ -1,398 +0,0 @@
67 -# Copyright 1999-2015 Gentoo Foundation
68 -# Distributed under the terms of the GNU General Public License v2
69 -# $Id$
70 -
71 -EAPI="5"
72 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
73 -
74 -inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
75 -
76 -MY_P="${PN}_$(replace_all_version_separators _)"
77 -MAJOR_V="$(get_version_component_range 1-2)"
78 -
79 -DESCRIPTION="Boost Libraries for C++"
80 -HOMEPAGE="http://www.boost.org/"
81 -SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
82 -
83 -LICENSE="Boost-1.0"
84 -SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
85 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
86 -
87 -IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
88 -
89 -RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-cpplibs[-abi_x86_32(-)] )
90 - icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
91 - !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
92 - mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
93 - python? ( ${PYTHON_DEPS} )
94 - app-arch/bzip2[${MULTILIB_USEDEP}]
95 - sys-libs/zlib[${MULTILIB_USEDEP}]
96 - !app-eselect/eselect-boost"
97 -DEPEND="${RDEPEND}
98 - =dev-util/boost-build-${MAJOR_V}*"
99 -REQUIRED_USE="
100 - mpi? ( threads )
101 - python? ( ${PYTHON_REQUIRED_USE} )"
102 -
103 -S="${WORKDIR}/${MY_P}"
104 -
105 -# the tests will never fail because these are not intended as sanity
106 -# tests at all. They are more a way for upstream to check their own code
107 -# on new compilers. Since they would either be completely unreliable
108 -# (failing for no good reason) or completely useless (never failing)
109 -# there is no point in having them in the ebuild to begin with.
110 -RESTRICT="test"
111 -
112 -python_bindings_needed() {
113 - multilib_is_native_abi && use python
114 -}
115 -
116 -tools_needed() {
117 - multilib_is_native_abi && use tools
118 -}
119 -
120 -create_user-config.jam() {
121 - local compiler compiler_version compiler_executable
122 -
123 - if [[ ${CHOST} == *-darwin* ]]; then
124 - compiler="darwin"
125 - compiler_version="$(gcc-fullversion)"
126 - compiler_executable="$(tc-getCXX)"
127 - else
128 - compiler="gcc"
129 - compiler_version="$(gcc-version)"
130 - compiler_executable="$(tc-getCXX)"
131 - fi
132 - local mpi_configuration python_configuration
133 -
134 - if use mpi; then
135 - mpi_configuration="using mpi ;"
136 - fi
137 -
138 - if python_bindings_needed; then
139 - if tc-is-cross-compiler; then
140 - python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
141 - else
142 - python_configuration="using python : : ${PYTHON} ;"
143 - fi
144 - fi
145 -
146 - cat > "${BOOST_ROOT}/user-config.jam" << __EOF__
147 -using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
148 -${mpi_configuration}
149 -${python_configuration}
150 -__EOF__
151 -}
152 -
153 -pkg_setup() {
154 - # Bail out on unsupported build configuration, bug #456792
155 - if [[ -f "${EROOT}etc/site-config.jam" ]]; then
156 - grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q gentoodebug "${EROOT}etc/site-config.jam" ||
157 - (
158 - eerror "You are using custom ${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
159 - eerror "Boost can not be built in such configuration."
160 - eerror "Please, either remove this file or add targets from ${EROOT}usr/share/boost-build/site-config.jam to it."
161 - die
162 - )
163 - fi
164 -}
165 -
166 -src_prepare() {
167 - epatch \
168 - "${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
169 - "${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch" \
170 - "${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
171 - "${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
172 - "${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
173 - "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
174 - "${FILESDIR}/${PN}-1.55.0-context-x32.patch" \
175 - "${FILESDIR}/${PN}-1.55.0-tools-c98-compat.patch" \
176 - "${FILESDIR}/${PN}-1.52.0-threads.patch" \
177 - "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
178 -
179 - # Do not try to build missing 'wave' tool, bug #522682
180 - # Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
181 - sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
182 -
183 - epatch_user
184 -
185 - multilib_copy_sources
186 -}
187 -
188 -ejam() {
189 - local b2_opts="--user-config=${BOOST_ROOT}/user-config.jam $@"
190 - echo b2 ${b2_opts}
191 - b2 ${b2_opts}
192 -}
193 -
194 -src_configure() {
195 - # Workaround for too many parallel processes requested, bug #506064
196 - [ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64"
197 -
198 - OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2"
199 -
200 - if [[ ${CHOST} == *-darwin* ]]; then
201 - # We need to add the prefix, and in two cases this exceeds, so prepare
202 - # for the largest possible space allocation.
203 - append-ldflags -Wl,-headerpad_max_install_names
204 - elif [[ ${CHOST} == *-winnt* ]]; then
205 - compiler=parity
206 - if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
207 - compilerVersion=trunk
208 - else
209 - compilerVersion=$($(tc-getCXX) -v | sed '1q' \
210 - | sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,')
211 - fi
212 - compilerExecutable=$(tc-getCXX)
213 - fi
214 -
215 - # bug 298489
216 - if use ppc || use ppc64; then
217 - [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
218 - fi
219 -
220 - # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
221 - append-cxxflags -std=gnu++98
222 -
223 - use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/usr"
224 - use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
225 - use mpi || OPTIONS+=" --without-mpi"
226 - use nls || OPTIONS+=" --without-locale"
227 - use context || OPTIONS+=" --without-context --without-coroutine"
228 -
229 - OPTIONS+=" pch=off"
230 - OPTIONS+=" --boost-build=${EPREFIX}/usr/share/boost-build --prefix=\"${ED}usr\""
231 - OPTIONS+=" --layout=system"
232 - OPTIONS+=" threading=$(usex threads multi single) link=$(usex static-libs shared,static shared)"
233 -
234 - [[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1"
235 -}
236 -
237 -multilib_src_compile() {
238 - local -x BOOST_ROOT="${BUILD_DIR}"
239 - PYTHON_DIRS=""
240 - MPI_PYTHON_MODULE=""
241 -
242 - building() {
243 - create_user-config.jam
244 -
245 - local PYTHON_OPTIONS
246 - if python_bindings_needed; then
247 - PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
248 - else
249 - PYTHON_OPTIONS=" --without-python"
250 - fi
251 -
252 - ejam \
253 - ${OPTIONS} \
254 - ${PYTHON_OPTIONS} \
255 - || die "Building of Boost libraries failed"
256 -
257 - if python_bindings_needed; then
258 - if [[ -z "${PYTHON_DIRS}" ]]; then
259 - PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
260 - else
261 - if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
262 - die "Inconsistent structure of build directories"
263 - fi
264 - fi
265 -
266 - local dir
267 - for dir in ${PYTHON_DIRS}; do
268 - mv ${dir} ${dir}-${EPYTHON} \
269 - || die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
270 - done
271 -
272 - if use mpi; then
273 - if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
274 - MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
275 - if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
276 - die "Multiple mpi.so files found"
277 - fi
278 - else
279 - if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
280 - die "Inconsistent structure of build directories"
281 - fi
282 - fi
283 -
284 - mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
285 - || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
286 - fi
287 - fi
288 - }
289 - if python_bindings_needed; then
290 - python_foreach_impl building
291 - else
292 - building
293 - fi
294 -
295 - if tools_needed; then
296 - pushd tools > /dev/null || die
297 -
298 - ejam \
299 - ${OPTIONS} \
300 - ${PYTHON_OPTIONS} \
301 - || die "Building of Boost tools failed"
302 - popd > /dev/null || die
303 - fi
304 -}
305 -
306 -multilib_src_install_all() {
307 - if ! use python; then
308 - rm -r "${ED}"/usr/include/boost/python* || die
309 - fi
310 -
311 - if ! use nls; then
312 - rm -r "${ED}"/usr/include/boost/locale || die
313 - fi
314 -
315 - if ! use context; then
316 - rm -r "${ED}"/usr/include/boost/context || die
317 - rm -r "${ED}"/usr/include/boost/coroutine || die
318 - fi
319 -
320 - if use doc; then
321 - find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
322 - dohtml \
323 - -A pdf,txt,cpp,hpp \
324 - *.{htm,html,png,css} \
325 - -r doc
326 - dohtml -A pdf,txt -r tools
327 - insinto /usr/share/doc/${PF}/html
328 - doins -r libs
329 - doins -r more
330 -
331 - # To avoid broken links
332 - insinto /usr/share/doc/${PF}/html
333 - doins LICENSE_1_0.txt
334 -
335 - dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
336 - fi
337 -}
338 -
339 -multilib_src_install() {
340 - local -x BOOST_ROOT="${BUILD_DIR}"
341 - installation() {
342 - create_user-config.jam
343 -
344 - local PYTHON_OPTIONS
345 - if python_bindings_needed; then
346 - local dir
347 - for dir in ${PYTHON_DIRS}; do
348 - cp -pr ${dir}-${EPYTHON} ${dir} \
349 - || die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
350 - done
351 -
352 - if use mpi; then
353 - cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
354 - || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
355 - cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
356 - || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
357 - fi
358 - PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
359 - else
360 - PYTHON_OPTIONS=" --without-python"
361 - fi
362 -
363 - ejam \
364 - ${OPTIONS} \
365 - ${PYTHON_OPTIONS} \
366 - --includedir="${ED}usr/include" \
367 - --libdir="${ED}usr/$(get_libdir)" \
368 - install || die "Installation of Boost libraries failed"
369 -
370 - if python_bindings_needed; then
371 - rm -r ${PYTHON_DIRS} || die
372 -
373 - # Move mpi.so Python module to Python site-packages directory.
374 - # https://svn.boost.org/trac/boost/ticket/2838
375 - if use mpi; then
376 - local moddir=$(python_get_sitedir)/boost
377 - # moddir already includes eprefix
378 - mkdir -p "${D}${moddir}" || die
379 - mv "${ED}usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
380 - cat << EOF > "${D}${moddir}/__init__.py" || die
381 -import sys
382 -if sys.platform.startswith('linux'):
383 - import DLFCN
384 - flags = sys.getdlopenflags()
385 - sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
386 - from . import mpi
387 - sys.setdlopenflags(flags)
388 - del DLFCN, flags
389 -else:
390 - from . import mpi
391 -del sys
392 -EOF
393 - fi
394 -
395 - python_optimize
396 - fi
397 - }
398 - if python_bindings_needed; then
399 - python_foreach_impl installation
400 - else
401 - installation
402 - fi
403 -
404 - pushd "${ED}usr/$(get_libdir)" > /dev/null || die
405 -
406 - local ext=$(get_libname)
407 - if use threads; then
408 - local f
409 - for f in *${ext}; do
410 - dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
411 - done
412 - fi
413 -
414 - popd > /dev/null || die
415 -
416 - if tools_needed; then
417 - dobin dist/bin/*
418 -
419 - insinto /usr/share
420 - doins -r dist/share/boostbook
421 - fi
422 -
423 - # boost's build system truely sucks for not having a destdir. Because for
424 - # this reason we are forced to build with a prefix that includes the
425 - # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
426 - # DESTROOT instread of the actual EPREFIX. There is no way out of here
427 - # but to do it the dirty way of manually setting the right install_names.
428 - if [[ ${CHOST} == *-darwin* ]]; then
429 - einfo "Working around completely broken build-system(tm)"
430 - local d
431 - for d in "${ED}"usr/lib/*.dylib; do
432 - if [[ -f ${d} ]]; then
433 - # fix the "soname"
434 - ebegin " correcting install_name of ${d#${ED}}"
435 - install_name_tool -id "/${d#${D}}" "${d}"
436 - eend $?
437 - # fix references to other libs
438 - refs=$(otool -XL "${d}" | \
439 - sed -e '1d' -e 's/^\t//' | \
440 - grep "^libboost_" | \
441 - cut -f1 -d' ')
442 - local r
443 - for r in ${refs}; do
444 - ebegin " correcting reference to ${r}"
445 - install_name_tool -change \
446 - "${r}" \
447 - "${EPREFIX}/usr/lib/${r}" \
448 - "${d}"
449 - eend $?
450 - done
451 - fi
452 - done
453 - fi
454 -}
455 -
456 -pkg_preinst() {
457 - # Yai for having symlinks that are nigh-impossible to remove without
458 - # resorting to dirty hacks like these. Removes lingering symlinks
459 - # from the slotted versions.
460 - local symlink
461 - for symlink in "${EROOT}usr/include/boost" "${EROOT}usr/share/boostbook"; do
462 - [[ -L ${symlink} ]] && rm -f "${symlink}"
463 - done
464 -}
465
466 diff --git a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
467 deleted file mode 100644
468 index a902d61..0000000
469 --- a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
470 +++ /dev/null
471 @@ -1,29 +0,0 @@
472 ---- libs/locale/build/Jamfile.v2
473 -+++ libs/locale/build/Jamfile.v2
474 -@@ -58,8 +58,8 @@
475 -
476 - if $(ICU_LINK)
477 - {
478 -- ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
479 -- ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
480 -+ ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
481 -+ ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
482 - }
483 - else
484 - {
485 -@@ -117,7 +117,6 @@
486 - <library>icuuc/<link>shared/<runtime-link>shared
487 - <library>icudt/<link>shared/<runtime-link>shared
488 - <library>icuin/<link>shared/<runtime-link>shared
489 -- <dll-path>$(ICU_PATH)/bin
490 - <runtime-link>shared ;
491 -
492 -
493 -@@ -176,7 +175,6 @@
494 - <library>icuuc_64/<link>shared/<runtime-link>shared
495 - <library>icudt_64/<link>shared/<runtime-link>shared
496 - <library>icuin_64/<link>shared/<runtime-link>shared
497 -- <dll-path>$(ICU_PATH)/bin64
498 - <runtime-link>shared ;
499 -
500 -
501
502 diff --git a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
503 deleted file mode 100644
504 index c24a56c..0000000
505 --- a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
506 +++ /dev/null
507 @@ -1,62 +0,0 @@
508 ---- libs/python/build/Jamfile.v2
509 -+++ libs/python/build/Jamfile.v2
510 -@@ -39,23 +39,6 @@
511 - PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
512 - }
513 -
514 --
515 --rule find-py3-version
516 --{
517 -- local versions = [ feature.values python ] ;
518 -- local py3ver ;
519 -- for local v in $(versions)
520 -- {
521 -- if $(v) >= 3.0
522 -- {
523 -- py3ver = $(v) ;
524 -- }
525 -- }
526 -- return $(py3ver) ;
527 --}
528 --
529 --py3-version = [ find-py3-version ] ;
530 --
531 - project boost/python
532 - : source-location ../src
533 - : requirements
534 -@@ -82,7 +65,7 @@
535 - rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
536 - rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
537 -
538 --rule lib_boost_python ( is-py3 ? )
539 -+rule lib_boost_python
540 - {
541 -
542 - local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
543 -@@ -91,7 +74,7 @@
544 - {
545 - python2 = true ;
546 - }
547 -- lib [ cond $(is-py3) : boost_python3 : boost_python ]
548 -+ lib boost_python
549 - : # sources
550 - numeric.cpp
551 - list.cpp
552 -@@ -148,7 +131,6 @@
553 - <dependency>config-warning
554 -
555 - <python-debugging>on:<define>BOOST_DEBUG_PYTHON
556 -- [ cond $(is-py3) : <python>$(py3-version) ]
557 - : # default build
558 - <link>shared
559 - : # usage requirements
560 -@@ -160,9 +142,3 @@
561 -
562 - lib_boost_python ;
563 - boost-install boost_python ;
564 --
565 --if $(py3-version)
566 --{
567 -- lib_boost_python yes ;
568 -- boost-install boost_python3 ;
569 --}
570
571 diff --git a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
572 deleted file mode 100644
573 index 89f8109..0000000
574 --- a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
575 +++ /dev/null
576 @@ -1,23 +0,0 @@
577 ---- libs/python/build/Jamfile.v2
578 -+++ libs/python/build/Jamfile.v2
579 -@@ -85,6 +85,12 @@
580 - rule lib_boost_python ( is-py3 ? )
581 - {
582 -
583 -+ local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
584 -+ local python2 ;
585 -+ if $(python_major_version) = 2
586 -+ {
587 -+ python2 = true ;
588 -+ }
589 - lib [ cond $(is-py3) : boost_python3 : boost_python ]
590 - : # sources
591 - numeric.cpp
592 -@@ -119,6 +125,7 @@
593 - : # requirements
594 - <link>static:<define>BOOST_PYTHON_STATIC_LIB
595 - <define>BOOST_PYTHON_SOURCE
596 -+ [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
597 -
598 - # On Windows, all code using Python has to link to the Python
599 - # import library.
600
601 diff --git a/dev-libs/boost/files/boost-1.48.0-python_linking.patch b/dev-libs/boost/files/boost-1.48.0-python_linking.patch
602 deleted file mode 100644
603 index e7f4e7c..0000000
604 --- a/dev-libs/boost/files/boost-1.48.0-python_linking.patch
605 +++ /dev/null
606 @@ -1,24 +0,0 @@
607 ---- libs/python/build/Jamfile.v2
608 -+++ libs/python/build/Jamfile.v2
609 -@@ -109,20 +109,7 @@
610 - <link>static:<define>BOOST_PYTHON_STATIC_LIB
611 - <define>BOOST_PYTHON_SOURCE
612 - [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
613 --
614 -- # On Windows, all code using Python has to link to the Python
615 -- # import library.
616 -- #
617 -- # On *nix we never link libboost_python to libpython. When
618 -- # extending Python, all Python symbols are provided by the
619 -- # Python interpreter executable. When embedding Python, the
620 -- # client executable is expected to explicitly link to
621 -- # /python//python (the target representing libpython) itself.
622 -- #
623 -- # python_for_extensions is a target defined by Boost.Build to
624 -- # provide the Python include paths, and on Windows, the Python
625 -- # import library, as usage requirements.
626 -- [ cond [ python.configured ] : <library>/python//python_for_extensions ]
627 -+ [ cond [ python.configured ] : <library>/python//python ]
628 -
629 - # we prevent building when there is no python available
630 - # as it's not possible anyway, and to cause dependents to
631
632 diff --git a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch
633 deleted file mode 100644
634 index 327429e..0000000
635 --- a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch
636 +++ /dev/null
637 @@ -1,69 +0,0 @@
638 -https://svn.boost.org/trac/boost/ticket/6286
639 -
640 ---- boostcpp.jam
641 -+++ boostcpp.jam
642 -@@ -99,13 +99,6 @@
643 - BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" _ ] ;
644 - }
645 -
646 --# Python build id (for Python libraries only).
647 --python-id = [ option.get "python-buildid" ] ;
648 --if $(python-id)
649 --{
650 -- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
651 --}
652 --
653 -
654 - ################################################################################
655 - #
656 ---- libs/mpi/build/Jamfile.v2
657 -+++ libs/mpi/build/Jamfile.v2
658 -@@ -8,6 +8,8 @@
659 - # Authors: Douglas Gregor
660 - # Andrew Lumsdaine
661 -
662 -+import option ;
663 -+import regex ;
664 - import mpi ;
665 - import indirect ;
666 - import python ;
667 -@@ -24,6 +26,13 @@
668 - <tag>@$(__name__).tag
669 - ;
670 -
671 -+# Python build id (for Python libraries only).
672 -+python-id = [ option.get "python-buildid" ] ;
673 -+if $(python-id)
674 -+{
675 -+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
676 -+}
677 -+
678 - rule tag ( name : type ? : property-set )
679 - {
680 - local result = $(name) ;
681 ---- libs/python/build/Jamfile.v2
682 -+++ libs/python/build/Jamfile.v2
683 -@@ -2,6 +2,8 @@
684 - # Software License, Version 1.0. (See accompanying
685 - # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
686 -
687 -+import option ;
688 -+import regex ;
689 - import os ;
690 - import indirect ;
691 - import modules ;
692 -@@ -30,6 +32,14 @@
693 - ;
694 - }
695 -
696 -+# Python build id (for Python libraries only).
697 -+python-id = [ option.get "python-buildid" ] ;
698 -+if $(python-id)
699 -+{
700 -+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
701 -+}
702 -+
703 -+
704 - rule find-py3-version
705 - {
706 - local versions = [ feature.values python ] ;
707
708 diff --git a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch
709 deleted file mode 100644
710 index c8dc6e1..0000000
711 --- a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch
712 +++ /dev/null
713 @@ -1,22 +0,0 @@
714 ---- libs/mpi/build/Jamfile.v2
715 -+++ libs/mpi/build/Jamfile.v2
716 -@@ -30,7 +30,7 @@
717 - python-id = [ option.get "python-buildid" ] ;
718 - if $(python-id)
719 - {
720 -- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
721 -+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
722 - }
723 -
724 - rule tag ( name : type ? : property-set )
725 ---- libs/python/build/Jamfile.v2
726 -+++ libs/python/build/Jamfile.v2
727 -@@ -36,7 +36,7 @@
728 - python-id = [ option.get "python-buildid" ] ;
729 - if $(python-id)
730 - {
731 -- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
732 -+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
733 - }
734 -
735 -
736
737 diff --git a/dev-libs/boost/files/boost-1.52.0-threads.patch b/dev-libs/boost/files/boost-1.52.0-threads.patch
738 deleted file mode 100644
739 index e078fc2..0000000
740 --- a/dev-libs/boost/files/boost-1.52.0-threads.patch
741 +++ /dev/null
742 @@ -1,63 +0,0 @@
743 -Index: /trunk/boostcpp.jam
744 -===================================================================
745 ---- /trunk/boostcpp.jam (revision 79301)
746 -+++ /trunk/boostcpp.jam (revision 81000)
747 -@@ -210,6 +210,44 @@
748 - }
749 -
750 -+rule filtered-target ( name : message + : sources + : requirements * )
751 -+{
752 -+ message $(name)-message : warning: $(message) ;
753 -+ alias $(name) : $(sources) : $(requirements) ;
754 -+ alias $(name) : $(name)-message ;
755 -+
756 -+ local p = [ project.current ] ;
757 -+ $(p).mark-target-as-explicit $(name) ;
758 -+ $(p).mark-target-as-explicit $(name)-message ;
759 -+}
760 -+
761 - rule declare_install_and_stage_proper_targets ( libraries * : headers * )
762 - {
763 -+ for local l in $(libraries)
764 -+ {
765 -+ if $(l) = locale
766 -+ {
767 -+ filtered-target $(l)-for-install :
768 -+ Skipping Boost.Locale library with threading=single. :
769 -+ libs/$(l)/build : <threading>multi ;
770 -+ }
771 -+ else if $(l) = wave
772 -+ {
773 -+ filtered-target $(l)-for-install :
774 -+ Skipping Boost.Wave library with threading=single. :
775 -+ libs/$(l)/build : <threading>multi ;
776 -+ }
777 -+ else if $(l) = thread
778 -+ {
779 -+ filtered-target $(l)-for-install :
780 -+ Skipping Boost.Thread library with threading=single. :
781 -+ libs/$(l)/build : <threading>multi ;
782 -+ }
783 -+ else
784 -+ {
785 -+ alias $(l)-for-install : libs/$(l)/build ;
786 -+ }
787 -+ }
788 -+ local library-targets = $(libraries)-for-install ;
789 -+
790 - install-requirements = <install-source-root>$(BOOST_ROOT)/boost ;
791 -
792 -@@ -239,5 +277,5 @@
793 - : $(install-requirements) <install-no-version-symlinks>on
794 - :
795 -- : libs/$(libraries)/build
796 -+ : $(libraries)-for-install
797 - : $(headers)
798 - ;
799 -@@ -246,5 +284,5 @@
800 - # Install just library.
801 - install stage-proper
802 -- : libs/$(libraries)/build
803 -+ : $(libraries)-for-install
804 - : <location>$(stage-locate)/lib
805 - <install-dependencies>on <install-type>LIB
806
807 diff --git a/dev-libs/boost/files/boost-1.55.0-context-x32.patch b/dev-libs/boost/files/boost-1.55.0-context-x32.patch
808 deleted file mode 100644
809 index 5bf7406..0000000
810 --- a/dev-libs/boost/files/boost-1.55.0-context-x32.patch
811 +++ /dev/null
812 @@ -1,42 +0,0 @@
813 -https://svn.boost.org/trac/boost/ticket/9445
814 -
815 -hack to fix x32 builds
816 -
817 ---- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S
818 -+++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S
819 -@@ -31,6 +31,10 @@
820 - * *
821 - * *****************************************************************/
822 -
823 -+#ifdef __x86_64__
824 -+#include "jump_x86_64_sysv_elf_gas.S"
825 -+#else
826 -+
827 - .text
828 - .globl jump_fcontext
829 - .align 2
830 -@@ -73,3 +77,5 @@ jump_fcontext:
831 -
832 - /* Mark that we don't need executable stack. */
833 - .section .note.GNU-stack,"",%progbits
834 -+
835 -+#endif
836 ---- a/libs/context/src/asm/make_i386_sysv_elf_gas.S
837 -+++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S
838 -@@ -31,6 +31,10 @@
839 - * *
840 - * *****************************************************************/
841 -
842 -+#ifdef __x86_64__
843 -+#include "make_x86_64_sysv_elf_gas.S"
844 -+#else
845 -+
846 - .text
847 - .globl make_fcontext
848 - .align 2
849 -@@ -78,3 +82,5 @@ finish:
850 -
851 - /* Mark that we don't need executable stack. */
852 - .section .note.GNU-stack,"",%progbits
853 -+
854 -+#endif
855
856 diff --git a/dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch b/dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch
857 deleted file mode 100644
858 index df2a14a..0000000
859 --- a/dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch
860 +++ /dev/null
861 @@ -1,17 +0,0 @@
862 -Make tools compiled successfully with forced C++98
863 -
864 -Gentoo bugreport: https://bugs.gentoo.org/show_bug.cgi?id=503468
865 -
866 -diff --git a/tools/regression/src/compiler_status.cpp b/tools/regression/src/compiler_status.cpp
867 -index 63f8134..3f3374a 100644
868 ---- a/tools/regression/src/compiler_status.cpp
869 -+++ b/tools/regression/src/compiler_status.cpp
870 -@@ -128,7 +128,7 @@ namespace
871 - string ln(line);
872 - if (ln.find("Revision: ") != string::npos)
873 - {
874 -- for(auto itr = ln.begin()+10; itr != ln.end() && isdigit(*itr); ++itr)
875 -+ for(string::iterator itr = ln.begin()+10; itr != ln.end() && isdigit(*itr); ++itr)
876 - rev += *itr;
877 - }
878 - }
879
880 diff --git a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
881 deleted file mode 100644
882 index 5175800..0000000
883 --- a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
884 +++ /dev/null
885 @@ -1,13 +0,0 @@
886 -Build auto_index tool with USE="tools"
887 -Gentoo bug report: https://bugs.gentoo.org/show_bug.cgi?id=529066
888 -
889 ---- tools/Jamfile.v2.orig 2014-12-24 12:57:32.290880067 +0300
890 -+++ tools/Jamfile.v2 2014-12-24 12:58:38.403883250 +0300
891 -@@ -20,6 +20,7 @@
892 - use-project /boost/regression : regression/build ;
893 -
894 - TOOLS =
895 -+ auto_index/build//auto_index
896 - bcp//bcp
897 - inspect/build//inspect
898 - quickbook//quickbook
899
900 diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
901 deleted file mode 100644
902 index 3fc1693..0000000
903 --- a/dev-libs/boost/metadata.xml
904 +++ /dev/null
905 @@ -1,41 +0,0 @@
906 -<?xml version="1.0" encoding="UTF-8"?>
907 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
908 -<pkgmetadata>
909 - <herd>cpp</herd>
910 - <use>
911 - <flag name="context">
912 - Build and install the Boost.Context library and all other
913 - Boostlibraries that depends on it
914 - </flag>
915 - <flag name="tools">
916 - Build and install the boost tools (bcp, quickbook, inspect,
917 - wave)
918 - </flag>
919 - <flag name="debug" restrict="&lt;dev-libs/boost-1.50.0-r3">
920 - Build and install debug versions of the Boost libraries. These
921 - libraries are not used by default, and should not be used unless
922 - you're developing against Boost.
923 - </flag>
924 - <flag name="debug" restrict="&gt;dev-libs/boost-1.52.0-r2">
925 - Build and install only the debug version of the Boost
926 - libraries. Only enable this flag if you're developing against
927 - boost.
928 - </flag>
929 - <flag name="threads">
930 - Build multi-thread-compatible libraries instead of
931 - single-threaded only.
932 - </flag>
933 - <flag name="nls">
934 - Build libboost_locale. This library requires compatible C
935 - library interfaces, which might not be provided by uClibc or
936 - other embedded libraries.
937 - </flag>
938 - <flag name="doc">
939 - Install the full API documentation documentation. This takes
940 - over 200MB of extra disk space.
941 - </flag>
942 - </use>
943 - <upstream>
944 - <remote-id type="sourceforge">boost</remote-id>
945 - </upstream>
946 -</pkgmetadata>