Version bump, wrt bug #549138

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

3 files changed, 420 insertions, 19 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 5db293b4f699..fcb62f7b1caa 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/boost
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.354 2015/06/09 14:13:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.355 2015/07/13 12:51:01 pinkbyte Exp $
+
+*boost-1.58.0 (13 Jul 2015)
+
+  13 Jul 2015; Sergey Popov <pinkbyte@gentoo.org> +boost-1.58.0.ebuild:
+  Version bump, wrt bug #549138
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index cf7cf6cfab3d..5d9224f25251 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX boost-1.48.0-disable_icu_rpath.patch 1073 SHA256 e1c947d20f0864e22f6dd2b091da6948bb51aec0d3323c37fe4264ddf57204b4 SHA512 efb62b65dbcb52258dcca074997a0380dfc52f48161777a8b6f9672179247e534e098784dcbb574826f495981fd2189290c7fe733d943bba2b668bb62ef50087 WHIRLPOOL 6f9a142e15bf3674114f2b07c8708055888e74cda4c3c775ca5470e8f54c921aa12660a1f905a370ec5f44f16b73f05025d3ff1ccad557d379ff55ad3ad0a8f0
 AUX boost-1.48.0-disable_libboost_python3.patch 1509 SHA256 0b229762863b72a5faa39ea57538f757548abc492325e6458d3801fd49e4804e SHA512 5aa0eb72365a0674d7d654b924c3189501495c22cc1eb50dc1ce7aaee941ba418c17857475ebbcc4d8f8102100d889aa1c059e3782dbff9eb03ff101bea2ffbb WHIRLPOOL 5710ac3ecf1f6d18db0307f07c720d12646666ec83adde2b2464cb87c901d57088e98801720efb176420f9728967c8752382b15ca69f632b00852d51be412795
@@ -23,30 +23,24 @@ DIST boost_1_54_0.tar.bz2 57873778 SHA256 047e927de336af106a24bceba30069980c1915
 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
+DIST boost_1_58_0.tar.bz2 70394057 SHA256 fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5 SHA512 7480ec713b0aa13f0ec990603e87e3b5c8d53f4411329b10fae37fc963b90aad12dbd9290a33c3669ae801e9012a68683eadff057591e9ca2ebcd22b1a67b5d1 WHIRLPOOL 0ed66f7de8b2ac28eda89e2fcadfc5533e6a3887ef7a929610804efa3ca66b850fecafeb61c986d37cb704ec844744e47d08f87e08ea25c779f57cffd26a1be2
 EBUILD boost-1.52.0-r7.ebuild 10032 SHA256 4da306bc39ade5bc4236ed06e0b400cd445f9b0ec071d0e1a6b8dd6fcfff618b SHA512 d7328631a6c639bafce3eb4fc3de08ce4addd25738f102a169210e9bd775383fcb228a0a8c36040d19f5683699bd787b9ff498db590f9eeaed7978d726160e78 WHIRLPOOL b1804a8d6fa731720d8e120054d1af2bfd6183c1e117caa6be323eb656be506e89cec3b1fe5804ca1e5a3317cf90f530f60a0467a76094dcb07bf4586ce9aac9
 EBUILD boost-1.53.0-r1.ebuild 10545 SHA256 68e732e4b74f2160aea1343c6f7d8cc62e27bef8678b2ec161b6a631d16fdfe3 SHA512 b9220d8b8eddd30efd737272f4a2bc586521464c9cdac3adc3f1c4f4495db6dd7564b10a9433634383d113c1d08913b23ea0cf4080dbbf34ecb37aa1363c3102 WHIRLPOOL d1aee94c909f9ab75cf13b237cf3cf6e99304467c744816503db3c68cc273e67b4917dbc4412274022273a398ded7807d20069e513e5da37ef3849061e6dca0a
 EBUILD boost-1.54.0-r1.ebuild 10565 SHA256 71ca74dc42fe85956cf0d3999ada4c95c7656a47abe4ffe9592ee049af29a312 SHA512 cd7615045137c8084168fa36308cb25ebedef99e97627525af95abcea6b5168635b0e5a110bb4e96dcc016be4e65ff879632153d269826bdf34e39ef965cb7a6 WHIRLPOOL 1c8d19f73908de3445da39c8dbbce6dcfd32cdd28aef09d923de57e6287711f19c9a652e73374fac277c6d0491f5d85a0bf96bb94612f4f4f438177fa66b4fbf
 EBUILD boost-1.55.0-r2.ebuild 11312 SHA256 2570e7d6d1ae6bd2b98ac35c8fb6fffff841a500d6829d5abf9f946b1b39dc10 SHA512 63ee682989487042f7371eaaf59666b99d0a4d6bb0cf97adb6fe5770aca29e61229f42af44a26ac751e214b02047e7a264404f717edc31f2cd483726c14dc995 WHIRLPOOL a139bec8af17a79ef3662106d7ebf8656391fa8063331d6a72d4289b3d0a6ebaaf1fd78d6c37eb093ef71f177c7839103490a46d5903ab845e63c0b378f01c5e
 EBUILD boost-1.56.0-r1.ebuild 11857 SHA256 db3079b88c717a576589ffc2114939c6fbe62bfd44a47ff697daeea43b3934ba SHA512 35d27c24f73b05a36b66a3e392e9a6f5170971d792be6bce0f9022813d3f95ebe463e56d2ef14d4b946a34501293e70d29019347fe96fd729f50725304315263 WHIRLPOOL 0ff3ada64fd7686de936c891cb2e9ff74e1b31d59bd0fc6cd2e85c09410281bca080301411596ed695b7aada646e8e49e6a8f31b6e32544f9dd118f74387210d
 EBUILD boost-1.57.0.ebuild 11854 SHA256 9e544f22ce30612be9c5264f30fce874f3dff569fe17ab6b48895f18e14b60d3 SHA512 f250657a1af67c7a7dfbeff32d3f82d0fd32a177055da71654f0d124eb53a57013ec75628e96d08a55396fb9c12a916195eadb04311a732aa37da4f9ae7c166e WHIRLPOOL a3084e0e71ada473992d7096bdbd54d2750eda6ab9fa3839de7f6fabf7022c5363a42b5fbb200abf901a218c0d58844e9de9580920299301ac47b19e17bf695f
-MISC ChangeLog 59465 SHA256 02202c689e0219cffcaac8d3905c0b10f315b0930adb6675f9bde9c2e8832c0d SHA512 36916e3698de1c3e2245fd78da46f3e46119dffe3d46b4ed3544dc70f13d254934e3c6e70c8da62359d9be59158061c998f0121322b02a9f1b6d597e2d9f2fe9 WHIRLPOOL 553969baf1e8751446a30f40433d1d96eafd98c1486b42a159b296c086ccc045b8b840a0568414b4f94a20365984af687058bb8d773762dfbb9022da967267f6
+EBUILD boost-1.58.0.ebuild 11784 SHA256 073b4599a2a326aeb22d415a2093fb4e2aa92d905b3da90c44a3989c14cebc24 SHA512 70889cc844dc386a7acc3fd04cd96b190b996c932831fcd28e328d1a4a20599edaab1057f4c5ab9cd7e8b843441e824e77ef5258de9d4b39429f844649cd8ea6 WHIRLPOOL 48f894fe7af1f4d8632d53abb82d9611a468518c7c260e76bb686c7836128910ae4e74de722b0ef8b0e9ca456522d97d9bbf73c99d7f96881958af78034d72a1
+MISC ChangeLog 59603 SHA256 78351dda80c137b94a22f78c7090b6860d9fc0e2b0293c7bcc007d0e36a69c8d SHA512 1d2422f7cf7fb816a6de446d74cf18cba1325c9cc1bd1a7ebbeea6eb74c3377f3b6ecd70b775b650ba8773bf06fcde3f77f617da5d86f49d228876baa3f32dd8 WHIRLPOOL 82c76995d0104b7a6f8a3636d29260342552ee2a0d2c62dd3cecb6c8605a9625b47e3ac2a6ad8feb5373f1d96e16b5bf0354bec9d69c427c470c64baeedc0a5c
 MISC metadata.xml 1421 SHA256 e8165c32ec94a53a4a7506562266a61923cab8ba8c4ed4a66eb63a765405b0e3 SHA512 71872caa09cd6f240b4ba83e98207cec33d7391feaafc40d5ca5b6939983e7f6efd1e177a0f60f365054b046db4d7a0147f7455123e8eee9f942db15809fdbd7 WHIRLPOOL fcdd5e2b37239c17a1a6c1e136d4835539efadab230544651a8c7b0814f14c8a861a8440f08694a228de4a0b4769961f6d01b81730af06d1a98eafb3af937e13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdvR7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiTmQP/1Z8ELcoLS35lTCnGEQF7g6c
-PNF2bNNMh5mqww1RMNQvvr45dMZ9/T6WgAs0Y3wGhMFPt9PjRjDCxlDR6Mu5oYYb
-XoEKXenn7jmy/g9W8ibirbUZUugdq9ui4kjxrhuvoZe+wqtNgND2K2kQ0sJmXI71
-MN6e6NrFsUepFI5jbb2PN8apUwf7HpyFay+Gt1uwCvKonGqwwa9xvoIyIbXFqiLc
-HsqIgT4FIfVeslRzmEZPDlm3Pg+PDO3g0wslbC0KsAHYnrqR4o5fUTzryNbp6VKi
-vSdYug26dVm5ApdwfI6NSoBQk8VWOexsQaQ9I9nBj1ZhOauSWhOmrp61GDU8RHOJ
-L47p/lP0ppobfrUVSBeZmr0YUXEltI6YVNJieGsBdDePlRektTaaQ/94HXLSB+PY
-4XAnvwU+4F8Omt3Te4cPXFDRBe3kSbzNh8IBAyQrUEcd19uELUj6frwaObShmQiT
-e5W2MaGarf5qRxA6havGO9/+hyVBBtdtTvZmKAbT8T/thZr34Jq2U4ArHAsLzk0Y
-BV3LZ7hkDKG3EXnfUVUiQ/3cf6U2D3sibNsKyjfd15/t/u2YP3+S2JaZqM1k92+V
-qMTT5UkMoBeDPThzDzovP4IRlafNU/oNArGTvNxUXp5g6VDKiao99vlnfsmgjZrv
-ce5MbG+DsoZqqsW1VRzN
-=g+z9
+iQEcBAEBCAAGBQJVo7QxAAoJECo/aRed9267Sj8H/17UEsMn0ZP21Z250XXidHip
+J2XsCl8pajPw9OgXlg7seK7NR6BdlAxzdIvSx72PhyOMEluLQcSYdDpnzazqMOdo
+i66oevFYkGT+hwVhyt6F2nwH+Jz5NAMVK0Jt+eZtFAuwKFtasIMtzi8oI6P6Q5Fa
+1UZRFWlHCoP1zwV9uEe/NNdweAvxdTR0bxvcCR6pBctK8WKmR5AYfmLG6JKWnDiV
+GfvJyn82t4yil1qor0452QUK5vASAgZKgyqNcPDnm26Y9TvhKFiqHwb7UF1T5/cl
+9+5bmlgG8aWIiRTcAVAhT2XATsuX6qUb2x7Kvn+mb06mPRoff6ErHFgtniX1Y+k=
+=gZO0
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.58.0.ebuild b/dev-libs/boost/boost-1.58.0.ebuild
new file mode 100644
index 000000000000..a001459d1687
--- /dev/null
+++ b/dev-libs/boost/boost-1.58.0.ebuild
@@ -0,0 +1,402 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.58.0.ebuild,v 1.1 2015/07/13 12:51:01 pinkbyte Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
+
+MY_P="${PN}_$(replace_all_version_separators _)"
+MAJOR_V="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="http://www.boost.org/"
+SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~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"
+
+IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
+
+RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	mpi? ( virtual/mpi[cxx,threads] )
+	python? ( ${PYTHON_DEPS} )
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	!app-admin/eselect-boost"
+DEPEND="${RDEPEND}
+	=dev-util/boost-build-${MAJOR_V}*"
+REQUIRED_USE="
+	mpi? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+# 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.
+RESTRICT="test"
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+# MPI stuff is not ported on multilib yet, disabling it for non-native ABIs
+mpi_needed() {
+	multilib_is_native_abi && use mpi
+}
+
+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 mpi_needed; then
+		mpi_configuration="using mpi ;"
+	fi
+
+	if python_bindings_needed; then
+		if tc-is-cross-compiler; then
+			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
+		else
+			python_configuration="using python : : ${PYTHON} ;"
+		fi
+	fi
+
+	cat > "${BOOST_ROOT}/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.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}/${PN}-1.55.0-context-x32.patch" \
+		"${FILESDIR}/${PN}-1.52.0-threads.patch" \
+		"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
+
+	# Do not try to build missing 'wave' tool, bug #522682
+	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
+	sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
+
+	epatch_user
+
+	multilib_copy_sources
+}
+
+ejam() {
+	local b2_opts="--user-config=${BOOST_ROOT}/user-config.jam $@"
+	echo b2 ${b2_opts}
+	b2 ${b2_opts}
+}
+
+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"
+
+	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"
+	mpi_needed || OPTIONS+=" --without-mpi"
+	use nls || OPTIONS+=" --without-locale"
+	use context || OPTIONS+=" --without-context --without-coroutine"
+
+	OPTIONS+=" pch=off"
+	OPTIONS+=" --boost-build=${EPREFIX}/usr/share/boost-build --prefix=\"${ED}usr\""
+	OPTIONS+=" --layout=system"
+	OPTIONS+=" threading=$(usex threads multi single) link=$(usex static-libs shared,static shared)"
+
+	[[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1"
+}
+
+multilib_src_compile() {
+	local -x BOOST_ROOT="${BUILD_DIR}"
+	PYTHON_DIRS=""
+	MPI_PYTHON_MODULE=""
+
+	building() {
+		create_user-config.jam
+
+		local PYTHON_OPTIONS
+		if python_bindings_needed; then
+			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
+		else
+			PYTHON_OPTIONS=" --without-python"
+		fi
+
+		ejam \
+			${OPTIONS} \
+			${PYTHON_OPTIONS} \
+			|| die "Building of Boost libraries failed"
+
+		if python_bindings_needed; 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 mpi_needed; 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 python_bindings_needed; then
+		python_foreach_impl building
+	else
+		building
+	fi
+
+	if tools_needed; then
+		pushd tools > /dev/null || die
+
+		ejam \
+			${OPTIONS} \
+			${PYTHON_OPTIONS} \
+			|| die "Building of Boost tools failed"
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_install_all() {
+	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
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	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
+}
+
+multilib_src_install() {
+	local -x BOOST_ROOT="${BUILD_DIR}"
+	installation() {
+		create_user-config.jam
+
+		local PYTHON_OPTIONS
+		if python_bindings_needed; then
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				cp -pr ${dir}-${EPYTHON} ${dir} \
+					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
+			done
+
+			if mpi_needed; 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
+			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
+		else
+			PYTHON_OPTIONS=" --without-python"
+		fi
+
+		ejam \
+			${OPTIONS} \
+			${PYTHON_OPTIONS} \
+			--includedir="${ED}usr/include" \
+			--libdir="${ED}usr/$(get_libdir)" \
+			install || die "Installation of Boost libraries failed"
+
+		if python_bindings_needed; 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 mpi_needed; 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 python_bindings_needed; then
+		python_foreach_impl installation
+	else
+		installation
+	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 tools_needed; 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
+}