commit: 02d60f710015005b938d501e5f4f0615c1667fda
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 06:14:58 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 06:14:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d60f71
dev-libs/boost: drop old masked versions
Package-Manager: portage-2.2.26
dev-libs/boost/Manifest | 3 -
dev-libs/boost/boost-1.52.0-r7.ebuild | 352 --------------------
dev-libs/boost/boost-1.53.0-r1.ebuild | 365 ---------------------
dev-libs/boost/boost-1.54.0-r1.ebuild | 365 ---------------------
.../boost/files/boost-1.48.0-mpi_python3.patch | 95 ------
dev-libs/boost/files/boost-1.52.0-locale-utf.patch | 52 ---
dev-libs/boost/files/boost-1.52.0-tuple.patch | 11 -
.../files/boost-1.53.0-glibc-2.18-compat.patch | 18 -
.../boost/files/boost-1.53.0-library_status.patch | 57 ----
dev-libs/boost/files/remove-toolset-1.48.0.patch | 11 -
10 files changed, 1329 deletions(-)
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index bc223f6..fb6648e 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,6 +1,3 @@
-DIST boost_1_52_0.tar.bz2 54421709 SHA256
222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512
fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d
WHIRLPOOL
73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
-DIST boost_1_53_0.tar.bz2 55765258 SHA256
f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 SHA512
8cd7806653cb6ea4a1c6862796ef698de5ae0bdbda96954fedbe090c59e3e6cb8f8d385df35183e9063ac4e2c2fccf10744516c47a994cde5f1d1cba1b07e522
WHIRLPOOL
e8c5ed6b34dd5f68dc7e102a9e22b302616a65077d3f4af370ece6352b02a866e04294a4fc76bbd5555b6a4131f590e6455e6a74b5f12c4ffc2dd15af0bc8746
-DIST boost_1_54_0.tar.bz2 57873778 SHA256
047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d SHA512
3467a2bb9b4797cadfc52150cb036939ef35263f421870897dbe9492d1504a714805668a193b0811fdaf39a3527ee693ff70da5b942d7ab11b307e2e693e1760
WHIRLPOOL
dbe3cbecaccf86ca184cf73cff75c17d6307b680bab098e38a9efd24d17776481e597017fc9f8fc8f488495f315c6d2b14b9212c51cf98529c302482bf67e92a
DIST boost_1_55_0.tar.bz2 58146647 SHA256
fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 SHA512
dc606477f4c303e8f40de2586c16394b6d758e198b35bf3a7d3e576a2f49171aadc4f95e8d685fa731bc4e61e19869d5a24e1e816febfca9de078d66e096e041
WHIRLPOOL
6ae111d6a956651bd91914432b743faffeb466703191b05193db47f02fd3528a14ce200f26c1ab77bf2c68994eb5b135b0176f66a746964d334b4793ba113ad5
DIST boost_1_56_0.tar.bz2 94777674 SHA256
134732acaf3a6e7eba85988118d943f0fa6b7f0850f65131fff89823ad30ff1d SHA512
1ce9871c3a2519682538a5f1331938b948123432d99aea0ce026958cbebd25d84019a3a28c452724b9693df98a8d1264bb2d93d2fee508453f8b42836e67481e
WHIRLPOOL
e9e9bb965816b687141d55bc026e378a56ed577a2bf0bdad61a1736e7f11d1797e0cac0185a1fa25b6c4b9fe1f75cbb0bb73a5ea05e84d59385bb3b17a90fd12
DIST boost_1_57_0.tar.bz2 60821561 SHA256
910c8c022a33ccec7f088bd65d4f14b466588dda94ba2124e78b8c57db264967 SHA512
61881440fd89644c43c6e3bc6292e9fed75a6d3a76f98654b189d0ed4e1087d77b585884e882270c08bf9f7132b173bfc1fde05848e06aa78ba7f1008d10714d
WHIRLPOOL
ff092af332434082a774645a5eb42829cdbdac805ef86dccce8988542062901524bd4d5fc890e3a9c01f0a721047501e5d8b13d50ffa5368066c3438dcf719d6
diff --git a/dev-libs/boost/boost-1.52.0-r7.ebuild
b/dev-libs/boost/boost-1.52.0-r7.ebuild
deleted file mode 100644
index 04e7578..0000000
--- a/dev-libs/boost/boost-1.52.0-r7.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs
versionator
-
-MY_P=${PN}_$(replace_all_version_separators _)
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/";
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-MAJOR_V="$(get_version_component_range 1-2)"
-SLOT="0/${MAJOR_V}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
- !icu? ( virtual/libiconv )
- mpi? ( virtual/mpi[cxx,threads] )
- python? ( ${PYTHON_DEPS} )
- app-arch/bzip2
- sys-libs/zlib
- !app-admin/eselect-boost"
-DEPEND="${RDEPEND}
- =dev-util/boost-build-1.52.0*"
-
-REQUIRED_USE="mpi? ( threads )"
-
-S="${WORKDIR}/${MY_P}"
-
-create_user-config.jam() {
- local compiler compiler_version compiler_executable
-
- if [[ ${CHOST} == *-darwin* ]]; then
- compiler="darwin"
- compiler_version="$(gcc-fullversion)"
- compiler_executable="$(tc-getCXX)"
- else
- compiler="gcc"
- compiler_version="$(gcc-version)"
- compiler_executable="$(tc-getCXX)"
- fi
- local mpi_configuration python_configuration
-
- if use mpi; then
- mpi_configuration="using mpi ;"
- fi
-
- if use python; then
- python_configuration="using python : : ${PYTHON} ;"
- fi
-
- cat > user-config.jam << __EOF__
-using ${compiler} : ${compiler_version} : ${compiler_executable} :
<cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
- # Bail out on unsupported build configuration, bug #456792
- if [[ -f "${EROOT}etc/site-config.jam" ]]; then
- grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q
gentoodebug "${EROOT}etc/site-config.jam" ||
- (
- eerror "You are using custom
${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
- eerror "Boost can not be built in such configuration."
- eerror "Please, either remove this file or add targets
from ${EROOT}usr/share/boost-build/site-config.jam to it."
- die
- )
- fi
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \
- "${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
- "${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch"
\
- "${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
- "${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
- "${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
- "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
- "${FILESDIR}/remove-toolset-1.48.0.patch" \
- "${FILESDIR}/${PN}-1.52.0-tuple.patch" \
- "${FILESDIR}/${P}-locale-utf.patch" \
- "${FILESDIR}/${PN}-1.52.0-threads.patch" \
- "${FILESDIR}/${PN}-1.53.0-glibc-2.18-compat.patch" # bug 482372
-
- # Avoid a patch for now
- for file in libs/context/src/asm/*.S; do
- cat - >> $file <<EOF
-
-#if defined(__linux__) && defined(__ELF__)
-.section .note.GNU-stack,"",%progbits
-#endif
-EOF
- done
-
- epatch_user
-}
-
-ejam() {
- echo b2 "$@"
- b2 "$@"
-}
-
-src_configure() {
- # Workaround for too many parallel processes requested, bug #506064
- [ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64"
-
- OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q
-d+2 --user-config=${S}/user-config.jam"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- # We need to add the prefix, and in two cases this exceeds, so
prepare
- # for the largest possible space allocation.
- append-ldflags -Wl,-headerpad_max_install_names
- fi
-
- # bug 298489
- if use ppc || use ppc64; then
- [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
- fi
-
- # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
- append-cxxflags -std=gnu++98
-
- use icu && OPTIONS+=" -sICU_PATH=/usr"
- use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
- use mpi || OPTIONS+=" --without-mpi"
- use python || OPTIONS+=" --without-python"
- use nls || OPTIONS+=" --without-locale"
-
- OPTIONS+=" pch=off --boost-build=/usr/share/boost-build
--prefix=\"${D}usr\" --layout=system threading=$(usex threads multi single)
link=$(usex static-libs shared,static shared) --without-context"
-}
-
-src_compile() {
- export BOOST_ROOT="${S}"
- PYTHON_DIRS=""
- MPI_PYTHON_MODULE=""
-
- building() {
- create_user-config.jam
-
- ejam ${OPTIONS} \
- $(use python && echo
--python-buildid=${EPYTHON#python}) \
- || die "Building of Boost libraries failed"
-
- if use python; then
- if [[ -z "${PYTHON_DIRS}" ]]; then
- PYTHON_DIRS="$(find bin.v2/libs -name python |
sort)"
- else
- if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs
-name python | sort)" ]]; then
- die "Inconsistent structure of build
directories"
- fi
- fi
-
- local dir
- for dir in ${PYTHON_DIRS}; do
- mv ${dir} ${dir}-${EPYTHON} \
- || die "Renaming of '${dir}' to
'${dir}-${EPYTHON}' failed"
- done
-
- if use mpi; then
- if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
- MPI_PYTHON_MODULE="$(find
bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
- if [[ "$(echo "${MPI_PYTHON_MODULE}" |
wc -l)" -ne 1 ]]; then
- die "Multiple mpi.so files
found"
- fi
- else
- if [[ "${MPI_PYTHON_MODULE}" != "$(find
bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
- die "Inconsistent structure of
build directories"
- fi
- fi
-
- mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON}
\
- || die "Renaming of 'stage/lib/mpi.so'
to 'stage/lib/mpi.so-${EPYTHON}' failed"
- fi
- fi
- }
- if use python; then
- python_foreach_impl building
- else
- building
- fi
-
- if use tools; then
- pushd tools > /dev/null || die
-
- ejam ${OPTIONS} \
- || die "Building of Boost tools failed"
- popd > /dev/null || die
- fi
-}
-
-src_install () {
- installation() {
- create_user-config.jam
-
- if use python; then
- local dir
- for dir in ${PYTHON_DIRS}; do
- cp -pr ${dir}-${EPYTHON} ${dir} \
- || die "Copying of '${dir}-${EPYTHON}'
to '${dir}' failed"
- done
-
- if use mpi; then
- cp -p stage/lib/mpi.so-${EPYTHON}
"${MPI_PYTHON_MODULE}" \
- || die "Copying of
'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
- cp -p stage/lib/mpi.so-${EPYTHON}
stage/lib/mpi.so \
- || die "Copying of
'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
- fi
- fi
-
- ejam ${OPTIONS} \
- --includedir="${D}usr/include" \
- --libdir="${D}usr/$(get_libdir)" \
- $(use python && echo
--python-buildid=${EPYTHON#python}) \
- install || die "Installation of Boost libraries failed"
-
- if use python; then
- rm -r ${PYTHON_DIRS} || die
-
- # Move mpi.so Python module to Python site-packages
directory.
- # https://svn.boost.org/trac/boost/ticket/2838
- if use mpi; then
- local moddir=$(python_get_sitedir)/boost
- dodir "${moddir}"
- mv "${D}usr/$(get_libdir)/mpi.so"
"${D}${moddir}" || die
- cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
- import DLFCN
- flags = sys.getdlopenflags()
- sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
- from . import mpi
- sys.setdlopenflags(flags)
- del DLFCN, flags
-else:
- from . import mpi
-del sys
-EOF
- fi
-
- python_optimize
- fi
- }
- if use python; then
- python_foreach_impl installation
- else
- installation
- fi
-
- if ! use python; then
- rm -r "${D}"/usr/include/boost/python* || die
- fi
-
- if ! use nls; then
- rm -r "${D}"/usr/include/boost/locale || die
- fi
-
- rm -r "${D}"/usr/include/boost/context || die
-
- if use doc; then
- find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
- dohtml \
- -A pdf,txt,cpp,hpp \
- *.{htm,html,png,css} \
- -r doc
- dohtml -A pdf,txt -r tools
- insinto /usr/share/doc/${PF}/html
- doins -r libs
- doins -r more
-
- # To avoid broken links
- insinto /usr/share/doc/${PF}/html
- doins LICENSE_1_0.txt
-
- dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
- fi
-
- pushd "${D}usr/$(get_libdir)" > /dev/null || die
-
- local ext=$(get_libname)
- if use threads; then
- local f
- for f in *${ext}; do
- dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
- done
- fi
-
- popd > /dev/null || die
-
- if use tools; then
- dobin dist/bin/*
-
- insinto /usr/share
- doins -r dist/share/boostbook
- fi
-
- # boost's build system truely sucks for not having a destdir. Because
for
- # this reason we are forced to build with a prefix that includes the
- # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
- # DESTROOT instread of the actual EPREFIX. There is no way out of here
- # but to do it the dirty way of manually setting the right
install_names.
- if [[ ${CHOST} == *-darwin* ]]; then
- einfo "Working around completely broken build-system(tm)"
- local d
- for d in "${ED}"usr/lib/*.dylib; do
- if [[ -f ${d} ]]; then
- # fix the "soname"
- ebegin " correcting install_name of ${d#${ED}}"
- install_name_tool -id "/${d#${D}}" "${d}"
- eend $?
- # fix references to other libs
- refs=$(otool -XL "${d}" | \
- sed -e '1d' -e 's/^\t//' | \
- grep "^libboost_" | \
- cut -f1 -d' ')
- local r
- for r in ${refs}; do
- ebegin " correcting reference to
${r}"
- install_name_tool -change \
- "${r}" \
- "${EPREFIX}/usr/lib/${r}" \
- "${d}"
- eend $?
- done
- fi
- done
- fi
-}
-
-pkg_preinst() {
- # Yai for having symlinks that are nigh-impossible to remove without
- # resorting to dirty hacks like these. Removes lingering symlinks
- # from the slotted versions.
- local symlink
- for symlink in "${EROOT}usr/include/boost"
"${EROOT}usr/share/boostbook"; do
- [[ -L ${symlink} ]] && rm -f "${symlink}"
- done
-}
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-src_test() { :; }
diff --git a/dev-libs/boost/boost-1.53.0-r1.ebuild
b/dev-libs/boost/boost-1.53.0-r1.ebuild
deleted file mode 100644
index 200101b..0000000
--- a/dev-libs/boost/boost-1.53.0-r1.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs
versionator
-
-MY_P=${PN}_$(replace_all_version_separators _)
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/";
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-MAJOR_V="$(get_version_component_range 1-2)"
-SLOT="0/${MAJOR_V}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
-IUSE="debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
- !icu? ( virtual/libiconv )
- mpi? ( virtual/mpi[cxx,threads] )
- python? ( ${PYTHON_DEPS} )
- app-arch/bzip2
- sys-libs/zlib
- !app-admin/eselect-boost"
-DEPEND="${RDEPEND}
- =dev-util/boost-build-${MAJOR_V}*"
-REQUIRED_USE="
- mpi? ( threads )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-create_user-config.jam() {
- local compiler compiler_version compiler_executable
-
- if [[ ${CHOST} == *-darwin* ]]; then
- compiler="darwin"
- compiler_version="$(gcc-fullversion)"
- compiler_executable="$(tc-getCXX)"
- else
- compiler="gcc"
- compiler_version="$(gcc-version)"
- compiler_executable="$(tc-getCXX)"
- fi
- local mpi_configuration python_configuration
-
- if use mpi; then
- mpi_configuration="using mpi ;"
- fi
-
- if use python; then
- python_configuration="using python : : ${PYTHON} ;"
- fi
-
- cat > user-config.jam << __EOF__
-using ${compiler} : ${compiler_version} : ${compiler_executable} :
<cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
- # Bail out on unsupported build configuration, bug #456792
- if [[ -f "${EROOT}etc/site-config.jam" ]]; then
- grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q
gentoodebug "${EROOT}etc/site-config.jam" ||
- (
- eerror "You are using custom
${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
- eerror "Boost can not be built in such configuration."
- eerror "Please, either remove this file or add targets
from ${EROOT}usr/share/boost-build/site-config.jam to it."
- die
- )
- fi
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \
- "${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
- "${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch"
\
- "${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
- "${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
- "${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
- "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
- epatch "${FILESDIR}/${PN}-1.53.0-library_status.patch" # bug 459112
- epatch "${FILESDIR}/${PN}-1.53.0-glibc-2.18-compat.patch" # bug 482372
- epatch "${FILESDIR}/${PN}-1.52.0-threads.patch"
-
- # Avoid a patch for now
- for file in libs/context/src/asm/*.S; do
- cat - >> $file <<EOF
-
-#if defined(__linux__) && defined(__ELF__)
-.section .note.GNU-stack,"",%progbits
-#endif
-EOF
- done
-
- epatch_user
-}
-
-ejam() {
- echo b2 "$@"
- b2 "$@"
-}
-
-src_configure() {
- # Workaround for too many parallel processes requested, bug #506064
- [ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64"
-
- OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q
-d+2 --user-config=${S}/user-config.jam"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- # We need to add the prefix, and in two cases this exceeds, so
prepare
- # for the largest possible space allocation.
- append-ldflags -Wl,-headerpad_max_install_names
- elif [[ ${CHOST} == *-winnt* ]]; then
- compiler=parity
- if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
- compilerVersion=trunk
- else
- compilerVersion=$($(tc-getCXX) -v | sed '1q' \
- | sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^
\t]*\) .*,\2,')
- fi
- compilerExecutable=$(tc-getCXX)
- fi
-
- # bug 298489
- if use ppc || use ppc64; then
- [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
- fi
-
- # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
- append-cxxflags -std=gnu++98
-
- use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/usr"
- use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
- use mpi || OPTIONS+=" --without-mpi"
- use python || OPTIONS+=" --without-python"
- use nls || OPTIONS+=" --without-locale"
-
- OPTIONS+=" pch=off --boost-build=${EPREFIX}/usr/share/boost-build
--prefix=\"${ED}usr\" --layout=system threading=$(usex threads multi single)
link=$(usex static-libs shared,static shared)"
- OPTIONS+=" --without-context"
-
- [[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1"
-}
-
-src_compile() {
- export BOOST_ROOT="${S}"
- PYTHON_DIRS=""
- MPI_PYTHON_MODULE=""
-
- building() {
- create_user-config.jam
-
- ejam ${OPTIONS} \
- $(use python && echo
--python-buildid=${EPYTHON#python}) \
- || die "Building of Boost libraries failed"
-
- if use python; then
- if [[ -z "${PYTHON_DIRS}" ]]; then
- PYTHON_DIRS="$(find bin.v2/libs -name python |
sort)"
- else
- if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs
-name python | sort)" ]]; then
- die "Inconsistent structure of build
directories"
- fi
- fi
-
- local dir
- for dir in ${PYTHON_DIRS}; do
- mv ${dir} ${dir}-${EPYTHON} \
- || die "Renaming of '${dir}' to
'${dir}-${EPYTHON}' failed"
- done
-
- if use mpi; then
- if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
- MPI_PYTHON_MODULE="$(find
bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
- if [[ "$(echo "${MPI_PYTHON_MODULE}" |
wc -l)" -ne 1 ]]; then
- die "Multiple mpi.so files
found"
- fi
- else
- if [[ "${MPI_PYTHON_MODULE}" != "$(find
bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
- die "Inconsistent structure of
build directories"
- fi
- fi
-
- mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON}
\
- || die "Renaming of 'stage/lib/mpi.so'
to 'stage/lib/mpi.so-${EPYTHON}' failed"
- fi
- fi
- }
- if use python; then
- python_foreach_impl building
- else
- building
- fi
-
- if use tools; then
- pushd tools > /dev/null || die
-
- ejam ${OPTIONS} \
- || die "Building of Boost tools failed"
- popd > /dev/null || die
- fi
-}
-
-src_install () {
- installation() {
- create_user-config.jam
-
- if use python; then
- local dir
- for dir in ${PYTHON_DIRS}; do
- cp -pr ${dir}-${EPYTHON} ${dir} \
- || die "Copying of '${dir}-${EPYTHON}'
to '${dir}' failed"
- done
-
- if use mpi; then
- cp -p stage/lib/mpi.so-${EPYTHON}
"${MPI_PYTHON_MODULE}" \
- || die "Copying of
'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
- cp -p stage/lib/mpi.so-${EPYTHON}
stage/lib/mpi.so \
- || die "Copying of
'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
- fi
- fi
-
- ejam ${OPTIONS} \
- --includedir="${ED}usr/include" \
- --libdir="${ED}usr/$(get_libdir)" \
- $(use python && echo
--python-buildid=${EPYTHON#python}) \
- install || die "Installation of Boost libraries failed"
-
- if use python; then
- rm -r ${PYTHON_DIRS} || die
-
- # Move mpi.so Python module to Python site-packages
directory.
- # https://svn.boost.org/trac/boost/ticket/2838
- if use mpi; then
- local moddir=$(python_get_sitedir)/boost
- # moddir already includes eprefix
- mkdir -p "${D}${moddir}" || die
- mv "${ED}usr/$(get_libdir)/mpi.so"
"${D}${moddir}" || die
- cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
- import DLFCN
- flags = sys.getdlopenflags()
- sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
- from . import mpi
- sys.setdlopenflags(flags)
- del DLFCN, flags
-else:
- from . import mpi
-del sys
-EOF
- fi
-
- python_optimize
- fi
- }
- if use python; then
- python_foreach_impl installation
- else
- installation
- fi
-
- if ! use python; then
- rm -r "${ED}"/usr/include/boost/python* || die
- fi
-
- if ! use nls; then
- rm -r "${ED}"/usr/include/boost/locale || die
- fi
-
- rm -r "${ED}"/usr/include/boost/context || die
- rm -r "${ED}"/usr/include/boost/coroutine || die
-
- if use doc; then
- find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
- dohtml \
- -A pdf,txt,cpp,hpp \
- *.{htm,html,png,css} \
- -r doc
- dohtml -A pdf,txt -r tools
- insinto /usr/share/doc/${PF}/html
- doins -r libs
- doins -r more
-
- # To avoid broken links
- insinto /usr/share/doc/${PF}/html
- doins LICENSE_1_0.txt
-
- dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
- fi
-
- pushd "${ED}usr/$(get_libdir)" > /dev/null || die
-
- local ext=$(get_libname)
- if use threads; then
- local f
- for f in *${ext}; do
- dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
- done
- fi
-
- popd > /dev/null || die
-
- if use tools; then
- dobin dist/bin/*
-
- insinto /usr/share
- doins -r dist/share/boostbook
- fi
-
- # boost's build system truely sucks for not having a destdir. Because
for
- # this reason we are forced to build with a prefix that includes the
- # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
- # DESTROOT instread of the actual EPREFIX. There is no way out of here
- # but to do it the dirty way of manually setting the right
install_names.
- if [[ ${CHOST} == *-darwin* ]]; then
- einfo "Working around completely broken build-system(tm)"
- local d
- for d in "${ED}"usr/lib/*.dylib; do
- if [[ -f ${d} ]]; then
- # fix the "soname"
- ebegin " correcting install_name of ${d#${ED}}"
- install_name_tool -id "/${d#${D}}" "${d}"
- eend $?
- # fix references to other libs
- refs=$(otool -XL "${d}" | \
- sed -e '1d' -e 's/^\t//' | \
- grep "^libboost_" | \
- cut -f1 -d' ')
- local r
- for r in ${refs}; do
- ebegin " correcting reference to
${r}"
- install_name_tool -change \
- "${r}" \
- "${EPREFIX}/usr/lib/${r}" \
- "${d}"
- eend $?
- done
- fi
- done
- fi
-}
-
-pkg_preinst() {
- # Yai for having symlinks that are nigh-impossible to remove without
- # resorting to dirty hacks like these. Removes lingering symlinks
- # from the slotted versions.
- local symlink
- for symlink in "${EROOT}usr/include/boost"
"${EROOT}usr/share/boostbook"; do
- [[ -L ${symlink} ]] && rm -f "${symlink}"
- done
-}
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-src_test() { :; }
diff --git a/dev-libs/boost/boost-1.54.0-r1.ebuild
b/dev-libs/boost/boost-1.54.0-r1.ebuild
deleted file mode 100644
index a5f9bc2..0000000
--- a/dev-libs/boost/boost-1.54.0-r1.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs
versionator
-
-MY_P=${PN}_$(replace_all_version_separators _)
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/";
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-MAJOR_V="$(get_version_component_range 1-2)"
-SLOT="0/${MAJOR_V}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
-IUSE="debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
- !icu? ( virtual/libiconv )
- mpi? ( virtual/mpi[cxx,threads] )
- python? ( ${PYTHON_DEPS} )
- app-arch/bzip2
- sys-libs/zlib
- !app-admin/eselect-boost"
-DEPEND="${RDEPEND}
- =dev-util/boost-build-${MAJOR_V}*"
-REQUIRED_USE="
- mpi? ( threads )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-create_user-config.jam() {
- local compiler compiler_version compiler_executable
-
- if [[ ${CHOST} == *-darwin* ]]; then
- compiler="darwin"
- compiler_version="$(gcc-fullversion)"
- compiler_executable="$(tc-getCXX)"
- else
- compiler="gcc"
- compiler_version="$(gcc-version)"
- compiler_executable="$(tc-getCXX)"
- fi
- local mpi_configuration python_configuration
-
- if use mpi; then
- mpi_configuration="using mpi ;"
- fi
-
- if use python; then
- python_configuration="using python : : ${PYTHON} ;"
- fi
-
- cat > user-config.jam << __EOF__
-using ${compiler} : ${compiler_version} : ${compiler_executable} :
<cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
- # Bail out on unsupported build configuration, bug #456792
- if [[ -f "${EROOT}etc/site-config.jam" ]]; then
- grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q
gentoodebug "${EROOT}etc/site-config.jam" ||
- (
- eerror "You are using custom
${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
- eerror "Boost can not be built in such configuration."
- eerror "Please, either remove this file or add targets
from ${EROOT}usr/share/boost-build/site-config.jam to it."
- die
- )
- fi
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \
- "${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
- "${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch"
\
- "${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
- "${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
- "${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
- "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
- epatch "${FILESDIR}/${PN}-1.53.0-library_status.patch" # bug 459112
- epatch "${FILESDIR}/${PN}-1.53.0-glibc-2.18-compat.patch" # bug 482372
- epatch "${FILESDIR}/${PN}-1.52.0-threads.patch"
-
- # Avoid a patch for now
- for file in libs/context/src/asm/*.S; do
- cat - >> $file <<EOF
-
-#if defined(__linux__) && defined(__ELF__)
-.section .note.GNU-stack,"",%progbits
-#endif
-EOF
- done
-
- epatch_user
-}
-
-ejam() {
- echo b2 "$@"
- b2 "$@"
-}
-
-src_configure() {
- # Workaround for too many parallel processes requested, bug #506064
- [ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64"
-
- OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q
-d+2 --user-config=${S}/user-config.jam"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- # We need to add the prefix, and in two cases this exceeds, so
prepare
- # for the largest possible space allocation.
- append-ldflags -Wl,-headerpad_max_install_names
- elif [[ ${CHOST} == *-winnt* ]]; then
- compiler=parity
- if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
- compilerVersion=trunk
- else
- compilerVersion=$($(tc-getCXX) -v | sed '1q' \
- | sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^
\t]*\) .*,\2,')
- fi
- compilerExecutable=$(tc-getCXX)
- fi
-
- # bug 298489
- if use ppc || use ppc64; then
- [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
- fi
-
- # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
- append-cxxflags -std=gnu++98
-
- use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/usr"
- use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
- use mpi || OPTIONS+=" --without-mpi"
- use python || OPTIONS+=" --without-python"
- use nls || OPTIONS+=" --without-locale"
-
- OPTIONS+=" pch=off --boost-build=${EPREFIX}/usr/share/boost-build
--prefix=\"${ED}usr\" --layout=system threading=$(usex threads multi single)
link=$(usex static-libs shared,static shared)"
- OPTIONS+=" --without-context --without-coroutine"
-
- [[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1"
-}
-
-src_compile() {
- export BOOST_ROOT="${S}"
- PYTHON_DIRS=""
- MPI_PYTHON_MODULE=""
-
- building() {
- create_user-config.jam
-
- ejam ${OPTIONS} \
- $(use python && echo
--python-buildid=${EPYTHON#python}) \
- || die "Building of Boost libraries failed"
-
- if use python; then
- if [[ -z "${PYTHON_DIRS}" ]]; then
- PYTHON_DIRS="$(find bin.v2/libs -name python |
sort)"
- else
- if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs
-name python | sort)" ]]; then
- die "Inconsistent structure of build
directories"
- fi
- fi
-
- local dir
- for dir in ${PYTHON_DIRS}; do
- mv ${dir} ${dir}-${EPYTHON} \
- || die "Renaming of '${dir}' to
'${dir}-${EPYTHON}' failed"
- done
-
- if use mpi; then
- if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
- MPI_PYTHON_MODULE="$(find
bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
- if [[ "$(echo "${MPI_PYTHON_MODULE}" |
wc -l)" -ne 1 ]]; then
- die "Multiple mpi.so files
found"
- fi
- else
- if [[ "${MPI_PYTHON_MODULE}" != "$(find
bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
- die "Inconsistent structure of
build directories"
- fi
- fi
-
- mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON}
\
- || die "Renaming of 'stage/lib/mpi.so'
to 'stage/lib/mpi.so-${EPYTHON}' failed"
- fi
- fi
- }
- if use python; then
- python_foreach_impl building
- else
- building
- fi
-
- if use tools; then
- pushd tools > /dev/null || die
-
- ejam ${OPTIONS} \
- || die "Building of Boost tools failed"
- popd > /dev/null || die
- fi
-}
-
-src_install () {
- installation() {
- create_user-config.jam
-
- if use python; then
- local dir
- for dir in ${PYTHON_DIRS}; do
- cp -pr ${dir}-${EPYTHON} ${dir} \
- || die "Copying of '${dir}-${EPYTHON}'
to '${dir}' failed"
- done
-
- if use mpi; then
- cp -p stage/lib/mpi.so-${EPYTHON}
"${MPI_PYTHON_MODULE}" \
- || die "Copying of
'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
- cp -p stage/lib/mpi.so-${EPYTHON}
stage/lib/mpi.so \
- || die "Copying of
'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
- fi
- fi
-
- ejam ${OPTIONS} \
- --includedir="${ED}usr/include" \
- --libdir="${ED}usr/$(get_libdir)" \
- $(use python && echo
--python-buildid=${EPYTHON#python}) \
- install || die "Installation of Boost libraries failed"
-
- if use python; then
- rm -r ${PYTHON_DIRS} || die
-
- # Move mpi.so Python module to Python site-packages
directory.
- # https://svn.boost.org/trac/boost/ticket/2838
- if use mpi; then
- local moddir=$(python_get_sitedir)/boost
- # moddir already includes eprefix
- mkdir -p "${D}${moddir}" || die
- mv "${ED}usr/$(get_libdir)/mpi.so"
"${D}${moddir}" || die
- cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
- import DLFCN
- flags = sys.getdlopenflags()
- sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
- from . import mpi
- sys.setdlopenflags(flags)
- del DLFCN, flags
-else:
- from . import mpi
-del sys
-EOF
- fi
-
- python_optimize
- fi
- }
- if use python; then
- python_foreach_impl installation
- else
- installation
- fi
-
- if ! use python; then
- rm -r "${ED}"/usr/include/boost/python* || die
- fi
-
- if ! use nls; then
- rm -r "${ED}"/usr/include/boost/locale || die
- fi
-
- rm -r "${ED}"/usr/include/boost/context || die
- rm -r "${ED}"/usr/include/boost/coroutine || die
-
- if use doc; then
- find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
- dohtml \
- -A pdf,txt,cpp,hpp \
- *.{htm,html,png,css} \
- -r doc
- dohtml -A pdf,txt -r tools
- insinto /usr/share/doc/${PF}/html
- doins -r libs
- doins -r more
-
- # To avoid broken links
- insinto /usr/share/doc/${PF}/html
- doins LICENSE_1_0.txt
-
- dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
- fi
-
- pushd "${ED}usr/$(get_libdir)" > /dev/null || die
-
- local ext=$(get_libname)
- if use threads; then
- local f
- for f in *${ext}; do
- dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
- done
- fi
-
- popd > /dev/null || die
-
- if use tools; then
- dobin dist/bin/*
-
- insinto /usr/share
- doins -r dist/share/boostbook
- fi
-
- # boost's build system truely sucks for not having a destdir. Because
for
- # this reason we are forced to build with a prefix that includes the
- # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
- # DESTROOT instread of the actual EPREFIX. There is no way out of here
- # but to do it the dirty way of manually setting the right
install_names.
- if [[ ${CHOST} == *-darwin* ]]; then
- einfo "Working around completely broken build-system(tm)"
- local d
- for d in "${ED}"usr/lib/*.dylib; do
- if [[ -f ${d} ]]; then
- # fix the "soname"
- ebegin " correcting install_name of ${d#${ED}}"
- install_name_tool -id "/${d#${D}}" "${d}"
- eend $?
- # fix references to other libs
- refs=$(otool -XL "${d}" | \
- sed -e '1d' -e 's/^\t//' | \
- grep "^libboost_" | \
- cut -f1 -d' ')
- local r
- for r in ${refs}; do
- ebegin " correcting reference to
${r}"
- install_name_tool -change \
- "${r}" \
- "${EPREFIX}/usr/lib/${r}" \
- "${d}"
- eend $?
- done
- fi
- done
- fi
-}
-
-pkg_preinst() {
- # Yai for having symlinks that are nigh-impossible to remove without
- # resorting to dirty hacks like these. Removes lingering symlinks
- # from the slotted versions.
- local symlink
- for symlink in "${EROOT}usr/include/boost"
"${EROOT}usr/share/boostbook"; do
- [[ -L ${symlink} ]] && rm -f "${symlink}"
- done
-}
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-src_test() { :; }
diff --git a/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch
b/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch
deleted file mode 100644
index a32eca9..0000000
--- a/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/4657
-https://svn.boost.org/trac/boost/changeset/76290
-
---- libs/mpi/src/python/datatypes.cpp
-+++ libs/mpi/src/python/datatypes.cpp
-@@ -17,7 +17,9 @@
-
- void export_datatypes()
- {
-+#if PY_MAJOR_VERSION < 3
- register_serialized(long(0), &PyInt_Type);
-+#endif
- register_serialized(false, &PyBool_Type);
- register_serialized(double(0.0), &PyFloat_Type);
- }
---- libs/mpi/src/python/py_environment.cpp
-+++ libs/mpi/src/python/py_environment.cpp
-@@ -11,6 +11,9 @@
- * This file reflects the Boost.MPI "environment" class into Python
- * methods at module level.
- */
-+
-+#include <locale>
-+#include <string>
- #include <boost/python.hpp>
- #include <boost/mpi.hpp>
-
-@@ -50,11 +53,64 @@
-
- // If anything changed, convert C-style argc/argv into Python argv
- if (mpi_argv != my_argv)
-+ {
-+#if PY_MAJOR_VERSION >= 3
-+
-+ wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
-+ /* We need a second copy, as Python might modify the first one. */
-+ wchar_t **argv_copy2 = (wchar_t
**)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
-+
-+ if (!argv_copy || !argv_copy2) {
-+ fprintf(stderr, "out of memory\n");
-+ return false;
-+ }
-+
-+ std::locale mylocale;
-+ mbstate_t mystate;
-+
-+ const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
-+ std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
-+
-+ for (int i = 0; i < mpi_argc; i++)
-+ {
-+ size_t length = strlen(mpi_argv[i]);
-+
-+ wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length +
1));
-+
-+ const char *from_next;
-+ wchar_t *to_next;
-+
-+ std::codecvt<wchar_t,char,mbstate_t>::result myresult =
-+ myfacet.out(mystate,
-+ mpi_argv[i], mpi_argv[i] + length + 1, from_next,
-+ dest, dest+length+1, to_next);
-+
-+ if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
-+ {
-+ fprintf(stderr, "failure translating argv\n");
-+ return 1;
-+ }
-+
-+ argv_copy2[i] = argv_copy[i] = dest;
-+ if (!argv_copy[i])
-+ return false;
-+ }
-+
-+ PySys_SetArgv(mpi_argc, argv_copy);
-+
-+ for (int i = 0; i < mpi_argc; i++) {
-+ PyMem_Free(argv_copy2[i]);
-+ }
-+ PyMem_Free(argv_copy);
-+ PyMem_Free(argv_copy2);
-+#else
- PySys_SetArgv(mpi_argc, mpi_argv);
-+#endif
-+ }
-
-- for (int arg = 0; arg < my_argc; ++arg)
-- free(my_argv[arg]);
-- delete [] my_argv;
-+ for (int arg = 0; arg < mpi_argc; ++arg)
-+ free(mpi_argv[arg]);
-+ delete [] mpi_argv;
-
- return true;
- }
diff --git a/dev-libs/boost/files/boost-1.52.0-locale-utf.patch
b/dev-libs/boost/files/boost-1.52.0-locale-utf.patch
deleted file mode 100644
index 7ef51e9..0000000
--- a/dev-libs/boost/files/boost-1.52.0-locale-utf.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: boost/locale/utf.hpp
-===================================================================
---- boost/locale/utf.hpp (revision 81589)
-+++ boost/locale/utf.hpp (revision 81590)
-@@ -219,16 +219,22 @@
- if(BOOST_LOCALE_UNLIKELY(p==e))
- return incomplete;
- tmp = *p++;
-+ if (!is_trail(tmp))
-+ return illegal;
- c = (c << 6) | ( tmp & 0x3F);
- case 2:
- if(BOOST_LOCALE_UNLIKELY(p==e))
- return incomplete;
- tmp = *p++;
-+ if (!is_trail(tmp))
-+ return illegal;
- c = (c << 6) | ( tmp & 0x3F);
- case 1:
- if(BOOST_LOCALE_UNLIKELY(p==e))
- return incomplete;
- tmp = *p++;
-+ if (!is_trail(tmp))
-+ return illegal;
- c = (c << 6) | ( tmp & 0x3F);
- }
-
-Index: libs/locale/test/test_codepage_converter.cpp
-===================================================================
---- libs/locale/test/test_codepage_converter.cpp (revision 81589)
-+++ libs/locale/test/test_codepage_converter.cpp (revision 81590)
-@@ -140,6 +140,20 @@
- TEST_TO("\xf8\x90\x80\x80\x80",illegal); // 400 0000
- TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal); // 7fff ffff
-
-+ std::cout << "-- Invalid trail" << std::endl;
-+ TEST_TO("\xC2\x7F",illegal);
-+ TEST_TO("\xdf\x7F",illegal);
-+ TEST_TO("\xe0\x7F\x80",illegal);
-+ TEST_TO("\xef\xbf\x7F",illegal);
-+ TEST_TO("\xe0\x7F\x80",illegal);
-+ TEST_TO("\xef\xbf\x7F",illegal);
-+ TEST_TO("\xf0\x7F\x80\x80",illegal);
-+ TEST_TO("\xf4\x7f\xbf\xbf",illegal);
-+ TEST_TO("\xf0\x90\x7F\x80",illegal);
-+ TEST_TO("\xf4\x8f\x7F\xbf",illegal);
-+ TEST_TO("\xf0\x90\x80\x7F",illegal);
-+ TEST_TO("\xf4\x8f\xbf\x7F",illegal);
-+
- std::cout << "-- Invalid length" << std::endl;
-
- /// Test that this actually works
diff --git a/dev-libs/boost/files/boost-1.52.0-tuple.patch
b/dev-libs/boost/files/boost-1.52.0-tuple.patch
deleted file mode 100644
index 08bab86..0000000
--- a/dev-libs/boost/files/boost-1.52.0-tuple.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- boost/signals2/detail/variadic_slot_invoker.hpp.org 2012-11-20
09:15:55.000000000 +0400
-+++ boost/signals2/detail/variadic_slot_invoker.hpp 2012-11-20
09:19:56.000000000 +0400
-@@ -20,7 +20,7 @@
- // if compiler has std::tuple use it instead of boost::tuple
- // because boost::tuple does not have variadic template support at present.
- #ifdef BOOST_NO_CXX11_HDR_TUPLE
--#include <boost/tuple.hpp>
-+#include <boost/tuple/tuple.hpp>
- #define BOOST_SIGNALS2_TUPLE boost::tuple
- #else
- #include <tuple>
diff --git a/dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch
b/dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch
deleted file mode 100644
index 54d2e29..0000000
--- a/dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch for compatibility with glibc 2.18
-Gentoo bugreport: https://bugs.gentoo.org/show_bug.cgi?id=482372
-Upstream fix: https://svn.boost.org/trac/boost/changeset/84950
-
---- boost_1_53_0/boost/cstdint.hpp 2012-12-11 22:42:26.000000000 +0800
-+++ boost_1_53_0.fix/boost/cstdint.hpp 2013-08-25 20:48:53.683000000 +0800
-@@ -41,7 +41,10 @@
- // so we disable use of stdint.h when GLIBC does not define
__GLIBC_HAVE_LONG_LONG.
- // See https://svn.boost.org/trac/boost/ticket/3548 and
http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
- //
--#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) ||
defined(__GLIBC_HAVE_LONG_LONG))
-+#if defined(BOOST_HAS_STDINT_H) \
-+ && (!defined(__GLIBC__) \
-+ || defined(__GLIBC_HAVE_LONG_LONG) \
-+ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) &&
(__GLIBC_MINOR__ >= 17)))))
-
- // The following #include is an implementation artifact; not part of
interface.
- # ifdef __hpux
diff --git a/dev-libs/boost/files/boost-1.53.0-library_status.patch
b/dev-libs/boost/files/boost-1.53.0-library_status.patch
deleted file mode 100644
index 7d10461..0000000
--- a/dev-libs/boost/files/boost-1.53.0-library_status.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- tools_orig/regression/src/library_status.cpp 2012-12-11
15:42:26.000000000 +0100
-+++ tools/regression/src/library_status.cpp 2013-07-11 16:15:54.000000000
+0200
-@@ -171,16 +171,17 @@
- // find_element
------------------------------------------------------------//
-
-+ struct element_equal {
-+ const string & m_name;
-+ element_equal(const string & name) :
-+ m_name(name)
-+ {}
-+ bool operator()(const xml::element_ptr & xep) const {
-+ return xep.get()->name == m_name;
-+ }
-+ };
-+
- xml::element_list::const_iterator find_element(
- const xml::element & root, const string & name
- ){
-- struct element_equal {
-- const string & m_name;
-- element_equal(const string & name) :
-- m_name(name)
-- {}
-- bool operator()(const xml::element_ptr & xep) const {
-- return xep.get()->name == m_name;
-- }
-- };
- return std::find_if(
- root.elements.begin(),
-@@ -203,17 +204,18 @@
- // attribute_value
----------------------------------------------------------//
-
-+ struct attribute_equal {
-+ const string & m_name;
-+ attribute_equal(const string & name) :
-+ m_name(name)
-+ {}
-+ bool operator()(const xml::attribute & a) const {
-+ return a.name == m_name;
-+ }
-+ };
-+
- const string & attribute_value(
- const xml::element & element,
- const string & attribute_name
- ){
-- struct attribute_equal {
-- const string & m_name;
-- attribute_equal(const string & name) :
-- m_name(name)
-- {}
-- bool operator()(const xml::attribute & a) const {
-- return a.name == m_name;
-- }
-- };
- xml::attribute_list::const_iterator itr;
- itr = std::find_if(
diff --git a/dev-libs/boost/files/remove-toolset-1.48.0.patch
b/dev-libs/boost/files/remove-toolset-1.48.0.patch
deleted file mode 100644
index df91529..0000000
--- a/dev-libs/boost/files/remove-toolset-1.48.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- boostcpp.jam
-+++ boostcpp.jam
-@@ -377,7 +377,7 @@
- if $(layout) = versioned
- {
- result = [ common.format-name
-- <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
-+ <base> <threading> <runtime> -$(BOOST_VERSION_TAG)
- -$(BUILD_ID)
- : $(name) : $(type) : $(property-set) ] ;
- }
