Multiple fixes. Please read the ChangeLog to see what changed

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

12 files changed, 977 insertions, 505 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index eac7a2d20189..30952e33dfc9 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for dev-libs/boost
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.234 2012/01/08 11:42:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.235 2012/01/23 22:23:22 hwoarang Exp $
+
+*boost-1.48.0-r1 (23 Jan 2012)
+
+  23 Jan 2012; Markos Chandras <hwoarang@gentoo.org> -boost-1.48.0.ebuild,
+  +boost-1.48.0-r1.ebuild, +files/boost-1.48.0-disable_icu_rpath.patch,
+  +files/boost-1.48.0-disable_libboost_python3.patch,
+  +files/boost-1.48.0-mpi_python3.patch,
+  +files/boost-1.48.0-no_strict_aliasing_python2.patch,
+  +files/boost-1.48.0-python_linking.patch,
+  +files/boost-1.48.0-respect_python-buildid.patch,
+  +files/boost-1.48.0-support_dots_in_python-buildid.patch,
+  files/remove-toolset-1.48.0.patch:
+  Support for installation for multiple Python ABIs (bug #312155). Link
+  libboost_python-*, libboost_mpi_python-* and mpi.so against libpythonX.Y.so
+  (bug #312155). Fix building of mpi.so with Python 3 (bug #295705). Use
+  -fno-strict-aliasing only for libboost_python-2.*. Delete /usr/bin from rpath
+  of all libraries with USE="icu". All changes backported from Progress
+  Overlay. Ebuild and patches by Arfrever.
+  See: http://archives.gentoo.org/gentoo-dev/msg_ab39d8366b714ecacfc7fa64cd48ad00.xml
 
   08 Jan 2012; Markos Chandras <hwoarang@gentoo.org> boost-1.45.0.ebuild,
   boost-1.46.1-r1.ebuild, boost-1.47.0-r1.ebuild, boost-1.47.0.ebuild,
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index ea44915a1cc3..3a3db9484420 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -14,6 +14,13 @@ AUX boost-1.42.0-template_arity-gcc45.patch 970 RMD160 0edcdbcaf0165e4e285b041f6
 AUX boost-1.45.0-lambda_bind.patch 1607 RMD160 ea61aaac83cfebfcb10c0e20de72022d4d4c1b27 SHA1 39856bef27d2a55f1ae2e0d7a7005264a8613289 SHA256 0ff6a7bf481d5311ec57be1eeaafdd0c0e9e0c09b896700d40295f67bf77be0b
 AUX boost-1.46.1-python32.patch 579 RMD160 bf659da8646379b73ce255d2432467724c33c4be SHA1 0d3f2896ca46179cf2138fa4571fb48f5f496a2d SHA256 6227eb2692777b70896fe63a6726b630239b07845f4ae1ae57d2e83a062dc57e
 AUX boost-1.47.0-exceptions.patch 748 RMD160 dbbf5f31a97306febdad393bb7e6530048faed19 SHA1 d6fae686665f8cc9bbab6ed2e3094f387b7072f6 SHA256 c19d6043851692c03d3c04d96f1a75b2c054322de0a20910262eab2bab643ecf
+AUX boost-1.48.0-disable_icu_rpath.patch 1073 RMD160 3a31b1edfea4438d08eb233558164d06830f6c15 SHA1 814b8b53aaae586de580d3cc79727dcf30ebe04c SHA256 e1c947d20f0864e22f6dd2b091da6948bb51aec0d3323c37fe4264ddf57204b4
+AUX boost-1.48.0-disable_libboost_python3.patch 1509 RMD160 d5134496aa1ac560c545d83d5d8cc3e13fc6f31f SHA1 c8d295ad9e3cd72526608d8749e67244402e8c7b SHA256 0b229762863b72a5faa39ea57538f757548abc492325e6458d3801fd49e4804e
+AUX boost-1.48.0-mpi_python3.patch 2549 RMD160 9002feff5b234c7b134f3ffc67423b241ebfbdfc SHA1 7742a397ed5fc6760b66950eea88555f00733c02 SHA256 9120a660469fba15554e790150e03a665ea5497e94a79469053506147bd7dad1
+AUX boost-1.48.0-no_strict_aliasing_python2.patch 741 RMD160 1d9a5379bf40f680009cf0051ebf4276c4c8671a SHA1 8a1567ac686d72c834743177474efed690e6cdf7 SHA256 d11db74992a7a692f655b36c1cd78355fcec6703007fde522b6a82c88f171689
+AUX boost-1.48.0-python_linking.patch 1278 RMD160 67348eb4413b1c95d5a5739fde98bf27baf67f88 SHA1 52504489bcab2bbbb9e949fc286999303facefe1 SHA256 5bb937bd4423e039aa406ee4a366c61542a8067ec96b22dbcc48e8826bb7b1f8
+AUX boost-1.48.0-respect_python-buildid.patch 1648 RMD160 790dd30b0f61779c3d7320976e87eed60755cdad SHA1 a7f379da9e8646ff16e8c1c5d6a1f5a048f4f9f7 SHA256 996395941b5518dd2782cb18ed937273ccb256d5c5e64301b1d152dc81be39cd
+AUX boost-1.48.0-support_dots_in_python-buildid.patch 625 RMD160 de8c3672bd03cbe576c75b11bc05e7d80eaea119 SHA1 10e874c35f5821fba23d845ffb9a05d04b27339d SHA256 da1a6c1b501f6c3bd152b2d13ec690adc2566b159f0e489723ea84865d43b88d
 AUX buildid-fix.patch 1045 RMD160 ce9dbea25e21ed1ac177b16982ef1850957474f2 SHA1 af1069055e6f8d8fa143fb2ddeccb2fc36ddce9a SHA256 42a2aa4c0f4d8579a501d6133f55852acbd1d7b497598983c50bdebaa17df17f
 AUX point_release_naming_fix.patch 379 RMD160 5b6aa6b70d761cf4a847063843c03cb2683e844a SHA1 663c41d641e4908f1e4b565a2eaa3f4a6b330c54 SHA256 9369cf6effe61948c3ec6536172c97474b37a84311171a23189189b6c03b86d8
 AUX random-Jamfile 355 RMD160 478b592e9d33d371b07e5364e63512c8208263bf SHA1 8ca047df78758f62a6c131bd27441173e9079fa6 SHA256 7dc71ab8b862ccd5ea9c21c42557adfe0c711ea7fbe7faa47328a37aa84bc096
@@ -26,7 +33,7 @@ AUX remove-toolset-1.42.0.patch 465 RMD160 5d93141f9cf98fc558e15c273d4ede298a96d
 AUX remove-toolset-1.45.0.patch 465 RMD160 18b160e97e183392a635ebc60f840d10c30a0b1b SHA1 e476d9b06e7e16499ee7659f5178a52564d6831a SHA256 c1cc35cd5e25160e481912dcdd1e45a86d518bb0ac009ad50bd3811b097226b7
 AUX remove-toolset-1.46.1.patch 465 RMD160 18b160e97e183392a635ebc60f840d10c30a0b1b SHA1 e476d9b06e7e16499ee7659f5178a52564d6831a SHA256 c1cc35cd5e25160e481912dcdd1e45a86d518bb0ac009ad50bd3811b097226b7
 AUX remove-toolset-1.47.0.patch 475 RMD160 affc424b21d5f72f164549a924530fc97ed161f3 SHA1 a16fbb8e43b1fdb650eac0440f3e2d0bc359c55b SHA256 c16838de102445b12c6fc3818d1b1c82adddeb639f05fb3493c15a25ce8b48fa
-AUX remove-toolset-1.48.0.patch 475 RMD160 affc424b21d5f72f164549a924530fc97ed161f3 SHA1 a16fbb8e43b1fdb650eac0440f3e2d0bc359c55b SHA256 c16838de102445b12c6fc3818d1b1c82adddeb639f05fb3493c15a25ce8b48fa
+AUX remove-toolset-1.48.0.patch 396 RMD160 52a5c9a4f31b4aa92d98d2edec42c517fbfb8bca SHA1 a5c51ab293ac06bd39bd6d5a0f6d142c1c85644f SHA256 59af4c05d71def0b14e22a7a5f756a054ca82e3f9686b7668335af7d9bed28fa
 AUX remove_toolset_from_targetname.patch 490 RMD160 e050992fd79005af73410a2ea4037a82177ddf33 SHA1 80d96cca8cb0acb752c428ffcada3ef2964642b1 SHA256 5c5c6fea3c1e20e290d15a68f91b6c084cc5b34daae338e3aa0879a3fd5b9fb5
 DIST boost-patches-1.35.0-3.tbz2 4521 RMD160 8a1cac05a7db956482ffb9bc16accaae04891970 SHA1 bcb41aa6bba2ad46df82d9a87751a2ae046bf988 SHA256 e6360a99de6daa43daa3a605d1e2eeee2bf3a8bb4bf0128fc17b4e9d3f9348b8
 DIST boost-patches-1.35.0-5.tbz2 5537 RMD160 94ce8edab7127308b93705d6fb0317277dbd88db SHA1 2d195374d6cb6af3b187544afc58a00ee1e2309d SHA256 9d8d6c61d6915cb7629f5f1537054949b616301ecd1f1cfe1d0e2a5a7a676e11
@@ -53,23 +60,23 @@ EBUILD boost-1.45.0.ebuild 15793 RMD160 c583db21b892c47d7b9edd5fece5f2e214165309
 EBUILD boost-1.46.1-r1.ebuild 16224 RMD160 2a61c2f9bfae575018dd85f1d746ec27d38cf191 SHA1 920d8d3b118cd808f9ee311e63642398dd9c07b2 SHA256 9d7726f12645e301fcc9174880e45e44c9d1ae19d7a338da0503ce388e08138b
 EBUILD boost-1.47.0-r1.ebuild 15910 RMD160 501f37a32f879625facfd7134d342dc83688d95b SHA1 f9366a644df12335dfe9c960ced999b1acce5341 SHA256 f29520bcbd74fa8d75acfc6a1cd7f30329b401cc35b1197e67fc6da39e14ac00
 EBUILD boost-1.47.0.ebuild 15907 RMD160 72716bfd46f181c2bd096c34c977e3d2b02cb6c0 SHA1 3ca8410452f3198759f3e35a9a97b18631449082 SHA256 e79d396d32d06b5e3353664d3c95de05448b935d5a36a6df83d32b01047b7c46
-EBUILD boost-1.48.0.ebuild 15863 RMD160 58c5ed22c107726712bc1aa948fbccdc8f1f7821 SHA1 69e0ecf046e86eb14adef783965fbfa67fad7d66 SHA256 37ced519a34250f7cd1ba2cbc984c55c7c0ce6d914194e549b7dc2340a558b5b
-MISC ChangeLog 36718 RMD160 03a1a1d15f21a3928cffd70a05b051d5c1e8bfd4 SHA1 8da2fea52438e99534a4a8489518355db0c73c3e SHA256 14903f5dae374c8e798ad0127de3b098049d97e3a7706b408a995f2c857a14bf
+EBUILD boost-1.48.0-r1.ebuild 19575 RMD160 cac63df6f9da5131d91db770807e3ef77586e738 SHA1 9a25c73b36c76feabafddd2cccac5b2cf167126c SHA256 9587bed707c5565483cfdd321b086f674acf49c74f35af9d3f4bbfc649424f02
+MISC ChangeLog 37746 RMD160 b94c370f6ec0ccebf88830ffc6f829465e5efbf0 SHA1 df19fbcabd9555d0f78fdb7637254088e6b437cd SHA256 30da72bbbcbb4b85547e7053776505d5b20da85323d604cd34183545d1e7a9a6
 MISC metadata.xml 773 RMD160 3f4c57fa2861bb416fc5d92d839c41acb2b9861a SHA1 6c90f699901853658c41fbfdb3661eb617682040 SHA256 6563b78be463b4ae931f3dc07d5cd280281bf168c07ecea59fe5dc946f2d0ecf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPCY73AAoJEPqDWhW0r/LC8FkP/0u0II8xLGvgBHuq4G6qc7cH
-xflimTOzix+GYKqAF2RhgDOhLo9/PCiplSrwW8VnLHQOoRGODeOd4F4ZEkQU8WDT
-a8SjiQM+eW2AU0zfWUqxHL8IeqGwymvjqR/TPoQYeZUKkgFZ83AaItwx9pNShg3t
-0mkUICjT8+ipky7gDGcoGt2LuDG0ChLJo4d9W/CNIiLxkRd2sfKcz1VHMQtD7gYp
-+5qvWOqEOLQOm0w/0l0DXP2L6zhMwHEga3lUXff+8AdLaKh6vIwUvl9A7lh5JO2o
-6yh78htg0H7GvCtshhK4qkmfg9fkI2LAkQ7l6xQTyJcI+IC3EaAXFvGybISvDUPM
-rghj+HqqSc3EdlnvBeSwdWQduB5rDHpVXAkEeqgNjNZPRPYQpD3O2brrS2gfz+rS
-H0OGLHQ5/BYHNmQchM1NIap8F+UeZ/wm/IJPUy7SsFFawXxrKYnf5QNouCGDZVKW
-9SsdVLnmxngMwW0aXRii73Fa1YdE0vF6HfsnO1ywkKF6W01cu0lr335SW5EtNM0s
-MPaTqo2QfreZIHkSFRpNIi6QOQx8d3e5v44hSiZYDQQu1mIJazU2wklZL0Dd2TvI
-zdkKxZEaepdRWzIscqYEWFQP+sHjByPumL0vSsmeRwcNlOOtEdzhctmTobouNLk4
-owP82su/LmsMOWi1KKPl
-=sV9v
+iQIcBAEBCgAGBQJPHd3XAAoJEPqDWhW0r/LCLgoQALCaHsDwpUD0UhCYJy5ZqH04
+kn+f9zqj9d5zXyvOFInxqMv8FE7Rad6H2A3yLrP1UzdQkV8EhfTV2eSY7Eb7P0LC
+ebK9Z5leaOWyD1pzU3VztN9x1zLtaoGa8uL733wMZh0pYMpFhBXQP+JsMb9f7tof
+UOazXspCkRQs2ZkAp+2quK9yFKhqaFMiBBDin5YOY2vGEz8a2LHZ7ZnXKsKpkhsN
+PpJOPiWyfql28FfZ43gqufjruioWOUffOpjbYw0d/X9b4YC8mSSCvnaBd6Mqp9fi
+GMDOddyXIqCaDhoXAA/3C3RUTNcl+UwREAaTxDvpija2cZXxMj5DjsPAp05o+3yO
+u0UbGE6SqfH7UeLmQ1fM1bGPtah9sYfM7Ry55t6MmgeoFL5EqBGOHN8PGzr3wK8P
+/cMV21FbtCUtN4AiAEYPnYphARL/FSL6KvJQTELRerhUI4RZkGk7fudnBnQfJpwW
+/rWhOhw2XVbkp2pOAsJ3QIGk+3GlNqCrjz3Q8CoNrkku6+0sggxCyWFtn9O3gfXr
++FmV5RHSNGzSzi9lUT3hIIIAgLxHKaHhYUPHFPqwBTVN7ajqMFnooi1NWjhRhqOX
+Xp6fnpX9wDwid0RrMn0bwM5Q6q75jhzzCmbgl6RW/PgdIaVADhv76W99D+H+yT7m
+q5RtcHF7lyJf/beDilJS
+=Rfxu
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.48.0-r1.ebuild b/dev-libs/boost/boost-1.48.0-r1.ebuild
new file mode 100644
index 000000000000..5e043fbd1020
--- /dev/null
+++ b/dev-libs/boost/boost-1.48.0-r1.ebuild
@@ -0,0 +1,608 @@
+# Copyright owners: Gentoo Foundation
+#                   Arfrever Frehtes Taifersar Arahesis
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+
+inherit check-reqs flag-o-matic multilib python 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"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc +eselect icu mpi python static-libs test tools"
+
+RDEPEND="icu? ( >=dev-libs/icu-3.3 )
+	mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
+	sys-libs/zlib
+	!!<=dev-libs/boost-1.35.0-r2
+	>=app-admin/eselect-boost-0.3"
+DEPEND="${RDEPEND}
+	>=dev-util/boost-build-1.48.0-r1:${SLOT}"
+
+S=${WORKDIR}/${MY_P}
+
+MAJOR_PV=$(replace_all_version_separators _ ${SLOT})
+BJAM="b2-${MAJOR_PV}"
+
+# Usage:
+# _add_line <line-to-add> <profile>
+# ... to add to specific profile
+# or
+# _add_line <line-to-add>
+# ... to add to all profiles for which the use flag set
+
+_add_line() {
+	if [[ -z "$2" ]]; then
+		echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/default"
+		if use debug; then
+			echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/debug"
+		fi
+	else
+		echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/${2}"
+	fi
+}
+
+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_get_version) : /usr : $(python_get_includedir) : /usr/$(get_libdir) ;"
+	fi
+
+	# The debug-symbols=none and optimization=none are not official upstream flags but a Gentoo
+	# specific patch to make sure that all our CFLAGS/CXXFLAGS/LDFLAGS are being respected.
+	# Using optimization=off would for example add "-O0" and override "-O2" set by the user.
+	# Please take a look at the boost-build ebuild for more information.
+	cat > user-config.jam << __EOF__
+variant gentoorelease : release : <optimization>none <debug-symbols>none ;
+variant gentoodebug : debug : <optimization>none ;
+
+using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+${mpi_configuration}
+${python_configuration}
+__EOF__
+}
+
+pkg_pretend() {
+	if use test; then
+		CHECKREQS_DISK_BUILD="15G" check-reqs_pkg_pretend
+
+		ewarn "The tests may take several hours on a recent machine"
+		ewarn "but they will not fail (unless something weird happens ;-)"
+		ewarn "This is because the tests depend on the used compiler/-version"
+		ewarn "and the platform and upstream says that this is normal."
+		ewarn "If you are interested in the results, please take a look at the"
+		ewarn "generated results page:"
+		ewarn "  ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
+		ebeep 5
+	fi
+}
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+
+	if use debug; then
+		ewarn "The debug USE flag means that a second set of the boost libraries"
+		ewarn "will be built containing debug symbols. You'll be able to select them"
+		ewarn "using the boost-eselect module. But even though the optimization flags"
+		ewarn "you might have set are not stripped, there will be a performance"
+		ewarn "penalty and linking other packages against the debug version"
+		ewarn "of boost is _not_ recommended."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-mpi_python3.patch"
+	epatch "${FILESDIR}/${P}-respect_python-buildid.patch"
+	epatch "${FILESDIR}/${P}-support_dots_in_python-buildid.patch"
+	epatch "${FILESDIR}/${P}-no_strict_aliasing_python2.patch"
+	epatch "${FILESDIR}/${P}-disable_libboost_python3.patch"
+	epatch "${FILESDIR}/${P}-python_linking.patch"
+	epatch "${FILESDIR}/${P}-disable_icu_rpath.patch"
+	epatch "${FILESDIR}/remove-toolset-${PV}.patch"
+
+	# This enables building the boost.random library with /dev/urandom support
+	if [[ -e /dev/urandom ]]; then
+		mkdir -p libs/random/build || die
+		cp "${FILESDIR}/random-Jamfile-${PV}" libs/random/build/Jamfile.v2 || die
+	fi
+}
+
+src_configure() {
+	OPTIONS=""
+
+	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
+
+	use icu && OPTIONS+=" -sICU_PATH=/usr"
+	use icu || OPTIONS+=" --disable-icu"
+	use mpi || OPTIONS+=" --without-mpi"
+	use python || OPTIONS+=" --without-python"
+
+	# https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch
+	if use sparc || { use mips && [[ ${ABI} = "o32" ]]; } || use hppa || use arm || use x86-fbsd || use sh; then
+		OPTIONS+=" --disable-long-double"
+	fi
+
+	OPTIONS+=" pch=off --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}usr\" --layout=versioned"
+
+	if use static-libs; then
+		LINK_OPTS="link=shared,static"
+		LIBRARY_TARGETS="*.a *$(get_libname)"
+	else
+		LINK_OPTS="link=shared"
+		# There is no dynamically linked version of libboost_test_exec_monitor and libboost_exception.
+		LIBRARY_TARGETS="libboost_test_exec_monitor*.a libboost_exception*.a *$(get_libname)"
+	fi
+}
+
+src_compile() {
+	local jobs
+	jobs=$( echo " ${MAKEOPTS} " | \
+		sed -e 's/ --jobs[= ]/ -j /g' \
+			-e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \
+			-e 's/ -j\>/ -j1/g' | \
+			( while read -d ' ' j; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; jobs="${j#-j}"; done; echo ${jobs} ) )
+	if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi
+
+	export BOOST_ROOT="${S}"
+	PYTHON_DIRS=""
+	MPI_PYTHON_MODULE=""
+
+	building() {
+		create_user-config.jam
+
+		einfo "Using the following command to build:"
+		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+		${BJAM} ${NUMJOBS} -q -d+2 \
+			gentoorelease \
+			--user-config=user-config.jam \
+			${OPTIONS} \
+			threading=single,multi ${LINK_OPTS} runtime-link=shared \
+			$(use python && echo --python-buildid=${PYTHON_ABI}) \
+			|| die "Building of Boost libraries failed"
+
+		# ... and do the whole thing one more time to get the debug libs
+		if use debug; then
+			einfo "Using the following command to build:"
+			einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+			${BJAM} ${NUMJOBS} -q -d+2 \
+				gentoodebug \
+				--user-config=user-config.jam \
+				${OPTIONS} \
+				threading=single,multi ${LINK_OPTS} runtime-link=shared \
+				--buildid=debug \
+				$(use python && echo --python-buildid=${PYTHON_ABI}) \
+				|| die "Building of Boost debug libraries failed"
+		fi
+
+		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}-${PYTHON_ABI} || die "Renaming of '${dir}' to '${dir}-${PYTHON_ABI}' failed"
+			done
+
+			if use mpi; then
+				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
+					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoorelease -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/*/gentoorelease -name mpi.so)" ]]; then
+						die "Inconsistent structure of build directories"
+					fi
+				fi
+
+				mv stage/lib/mpi.so stage/lib/mpi.so-${PYTHON_ABI} || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${PYTHON_ABI}' failed"
+			fi
+		fi
+	}
+	if use python; then
+		python_execute_function building
+	else
+		building
+	fi
+
+	if use tools; then
+		pushd tools > /dev/null || die
+		einfo "Using the following command to build the tools:"
+		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=../user-config.jam ${OPTIONS}"
+
+		${BJAM} ${NUMJOBS} -q -d+2\
+			gentoorelease \
+			--user-config=../user-config.jam \
+			${OPTIONS} \
+			|| die "Building of Boost tools failed"
+		popd > /dev/null || die
+	fi
+}
+
+src_install () {
+	dodir /usr/share/boost-eselect/profiles/${SLOT}
+	touch "${D}usr/share/boost-eselect/profiles/${SLOT}/default" || die
+	if use debug; then
+		 touch "${D}usr/share/boost-eselect/profiles/${SLOT}/debug" || die
+	fi
+
+	if use mpi && use python; then
+		_add_line "python=\""
+	fi
+
+	installation() {
+		create_user-config.jam
+
+		if use python; then
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				cp -pr ${dir}-${PYTHON_ABI} ${dir} || die "Copying of '${dir}-${PYTHON_ABI}' to '${dir}' failed"
+			done
+
+			if use mpi; then
+				cp -p stage/lib/mpi.so-${PYTHON_ABI} "${MPI_PYTHON_MODULE}" || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to '${MPI_PYTHON_MODULE}' failed"
+				cp -p stage/lib/mpi.so-${PYTHON_ABI} stage/lib/mpi.so || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to 'stage/lib/mpi.so' failed"
+			fi
+		fi
+
+		einfo "Using the following command to install:"
+		einfo "${BJAM} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" $(use python && echo --python-buildid=${PYTHON_ABI}) install"
+
+		${BJAM} -q -d+2 \
+			gentoorelease \
+			--user-config=user-config.jam \
+			${OPTIONS} \
+			threading=single,multi ${LINK_OPTS} runtime-link=shared \
+			--includedir="${D}usr/include" \
+			--libdir="${D}usr/$(get_libdir)" \
+			$(use python && echo --python-buildid=${PYTHON_ABI}) \
+			install || die "Installation of Boost libraries failed"
+
+		if use debug; then
+			einfo "Using the following command to install:"
+			einfo "${BJAM} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+			${BJAM} -q -d+2 \
+				gentoodebug \
+				--user-config=user-config.jam \
+				${OPTIONS} \
+				threading=single,multi ${LINK_OPTS} runtime-link=shared \
+				--includedir="${D}usr/include" \
+				--libdir="${D}usr/$(get_libdir)" \
+				--buildid=debug \
+				$(use python && echo --python-buildid=${PYTHON_ABI}) \
+				install || die "Installation of Boost debug libraries failed"
+		fi
+
+		if use python; then
+			rm -r ${PYTHON_DIRS} || die
+
+			# Move mpi.so Python module to Python site-packages directory and make sure it is slotted.
+			if use mpi; then
+				mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
+				mv "${D}usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
+				touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die
+				_add_line "$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so"
+			fi
+		fi
+	}
+	if use python; then
+		python_execute_function installation
+	else
+		installation
+	fi
+
+	if use mpi && use python; then
+		_add_line "\""
+	fi
+
+	use python || rm -rf "${D}usr/include/boost-${MAJOR_PV}/boost"/python* || 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-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost
+	fi
+
+	pushd "${D}usr/$(get_libdir)" > /dev/null || die
+
+	# Remove (unversioned) symlinks
+	# And check for what we remove to catch bugs
+	# got a better idea how to do it? tell me!
+	local f
+	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v "${MAJOR_PV}"); do
+		if [[ ! -h "${f}" ]]; then
+			eerror "Tried to remove '${f}' which is a regular file instead of a symlink"
+			die "Slotting/naming of the libraries broken!"
+		fi
+		rm "${f}" || die
+	done
+
+	# The threading libs obviously always gets the "-mt" (multithreading) tag
+	# some packages seem to have a problem with it. Creating symlinks...
+
+	if use static-libs; then
+		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)"
+	else
+		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)"
+	fi
+	local lib
+	for lib in ${THREAD_LIBS}; do
+		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+	done
+
+	# The same goes for the mpi libs
+	if use mpi; then
+		if use static-libs; then
+			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}.a libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
+		else
+			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
+		fi
+		local lib
+		for lib in ${MPI_LIBS}; do
+			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+		done
+	fi
+
+	if use debug; then
+		if use static-libs; then
+			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname) libboost_thread-mt-${MAJOR_PV}-debug.a"
+		else
+			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname)"
+		fi
+
+		local lib
+		for lib in ${THREAD_DEBUG_LIBS}; do
+			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+		done
+
+		if use mpi; then
+			if use static-libs; then
+				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug.a libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
+			else
+				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
+			fi
+
+			local lib
+			for lib in ${MPI_DEBUG_LIBS}; do
+				dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+			done
+		fi
+	fi
+
+	# Create a subdirectory with completely unversioned symlinks
+	# and store the names in the profiles-file for eselect
+	dodir /usr/$(get_libdir)/boost-${MAJOR_PV}
+
+	_add_line "libs=\"" default
+	local f
+	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug); do
+		dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}}
+		_add_line "/usr/$(get_libdir)/${f}" default
+	done
+	_add_line "\"" default
+
+	if use debug; then
+		_add_line "libs=\"" debug
+		dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug
+		local f
+		for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug); do
+			dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug}
+			_add_line "/usr/$(get_libdir)/${f}" debug
+		done
+		_add_line "\"" debug
+
+		_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" debug
+		_add_line "suffix=\"-debug\"" debug
+	fi
+
+	_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default
+
+	popd > /dev/null || die
+
+	if use tools; then
+		pushd dist/bin > /dev/null || die
+		# Append version postfix to binaries for slotting
+		_add_line "bins=\""
+		local b
+		for b in *; do
+			newbin "${b}" "${b}-${MAJOR_PV}"
+			_add_line "/usr/bin/${b}-${MAJOR_PV}"
+		done
+		_add_line "\""
+		popd > /dev/null || die
+
+		pushd dist > /dev/null || die
+		insinto /usr/share
+		doins -r share/boostbook
+		# Append version postfix for slotting
+		mv "${D}usr/share/boostbook" "${D}usr/share/boostbook-${MAJOR_PV}" || die
+		_add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\""
+		popd > /dev/null || die
+	fi
+
+	pushd status > /dev/null || die
+	if [[ -f regress.log ]]; then
+		docinto status
+		dohtml *.html ../boost.png
+		dodoc regress.log
+	fi
+	popd > /dev/null || die
+
+	# 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
+}
+
+src_test() {
+	testing() {
+		if use python; then
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				cp -pr ${dir}-${PYTHON_ABI} ${dir} || die "Copying of '${dir}-${PYTHON_ABI}' to '${dir}' failed"
+			done
+
+			if use mpi; then
+				cp -p stage/lib/mpi.so-${PYTHON_ABI} "${MPI_PYTHON_MODULE}" || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to '${MPI_PYTHON_MODULE}' failed"
+				cp -p stage/lib/mpi.so-${PYTHON_ABI} stage/lib/mpi.so || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to 'stage/lib/mpi.so' failed"
+			fi
+		fi
+
+		pushd tools/regression/build > /dev/null || die
+		einfo "Using the following command to build test helpers:"
+		einfo "${BJAM} -q -d+2 gentoorelease --user-config=../../../user-config.jam ${OPTIONS} process_jam_log compiler_status"
+
+		${BJAM} -q -d+2 \
+			gentoorelease \
+			--user-config=../../../user-config.jam \
+			${OPTIONS} \
+			process_jam_log compiler_status \
+			|| die "Building of regression test helpers failed"
+
+		popd > /dev/null || die
+		pushd status > /dev/null || die
+
+		# Some of the test-checks seem to rely on regexps
+		export LC_ALL="C"
+
+		# The following is largely taken from tools/regression/run_tests.sh,
+		# but adapted to our needs.
+
+		# Run the tests & write them into a file for postprocessing
+		einfo "Using the following command to test:"
+		einfo "${BJAM} --user-config=../user-config.jam ${OPTIONS} --dump-tests"
+
+		${BJAM} \
+			--user-config=../user-config.jam \
+			${OPTIONS} \
+			--dump-tests 2>&1 | tee regress.log || die
+
+		# Postprocessing
+		cat regress.log | tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/process_jam_log --v2
+		if test $? != 0; then
+			die "Postprocessing the build log failed"
+		fi
+
+		cat > comment.html <<- __EOF__
+		<p>Tests are run on a <a href="http://www.gentoo.org">Gentoo</a> system.</p>
+__EOF__
+
+		# Generate the build log html summary page
+		tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/compiler_status --v2 \
+			--comment comment.html .. \
+			cs-$(uname).html cs-$(uname)-links.html
+		if test $? != 0; then
+			die "Generating the build log html summary page failed"
+		fi
+
+		# And do some cosmetic fixes :)
+		sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html || die
+
+		popd > /dev/null || die
+
+		if use python; then
+			rm -r ${PYTHON_DIRS} || die
+		fi
+	}
+	if use python; then
+		python_execute_function -f -q testing
+	else
+		testing
+	fi
+}
+
+pkg_postinst() {
+	if use eselect; then
+		eselect boost update || ewarn "eselect boost update failed."
+	fi
+
+	if [[ ! -h "${ROOT}etc/eselect/boost/active" ]]; then
+		elog "No active boost version found. Calling eselect to select one..."
+		eselect boost update || ewarn "eselect boost update failed."
+	fi
+}
diff --git a/dev-libs/boost/boost-1.48.0.ebuild b/dev-libs/boost/boost-1.48.0.ebuild
deleted file mode 100644
index ff7bc7581988..000000000000
--- a/dev-libs/boost/boost-1.48.0.ebuild
+++ /dev/null
@@ -1,486 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.48.0.ebuild,v 1.2 2012/01/08 11:42:28 hwoarang Exp $
-
-EAPI="2"
-
-inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
-
-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"
-SLOT="$(get_version_component_range 1-2)"
-IUSE="debug doc +eselect icu mpi python static-libs test tools"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.3 )
-	mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
-	sys-libs/zlib
-	python? ( dev-lang/python )
-	!!<=dev-libs/boost-1.35.0-r2
-	>=app-admin/eselect-boost-0.3"
-DEPEND="${RDEPEND}
-	dev-util/boost-build:${SLOT}"
-
-S=${WORKDIR}/${MY_P}
-
-MAJOR_PV=$(replace_all_version_separators _ ${SLOT})
-BJAM="b2-${MAJOR_PV}"
-
-# Usage:
-# _add_line <line-to-add> <profile>
-# ... to add to specific profile
-# or
-# _add_line <line-to-add>
-# ... to add to all profiles for which the use flag set
-
-_add_line() {
-	if [ -z "$2" ] ; then
-		echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/default"
-		use debug && echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug"
-	else
-		echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/${2}"
-	fi
-}
-
-pkg_setup() {
-	# It doesn't compile with USE="python mpi" and python-3 (bug 295705)
-	if use python && use mpi ; then
-		if [[ "$(python_get_version --major)" != "2" ]]; then
-			eerror "The Boost.MPI python bindings do not support any other python version"
-			eerror "than 2.x. Please either use eselect to select a python 2.x version or"
-			eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}."
-			die "unsupported python version"
-		fi
-	fi
-
-	if use test ; then
-		CHECKREQS_DISK_BUILD="15G"
-		check_reqs
-
-		ewarn "The tests may take several hours on a recent machine"
-		ewarn "but they will not fail (unless something weird happens ;-)"
-		ewarn "This is because the tests depend on the used compiler/-version"
-		ewarn "and the platform and upstream says that this is normal."
-		ewarn "If you are interested in the results, please take a look at the"
-		ewarn "generated results page:"
-		ewarn "  ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
-		ebeep 5
-
-	fi
-
-	if use debug ; then
-		ewarn "The debug USE-flag means that a second set of the boost libraries"
-		ewarn "will be built containing debug-symbols. You'll be able to select them"
-		ewarn "using the boost-eselect module. But even though the optimization flags"
-		ewarn "you might have set are not stripped, there will be a performance"
-		ewarn "penalty and linking other packages against the debug version"
-		ewarn "of boost is _not_ recommended."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/remove-toolset-${PV}.patch"
-	# This enables building the boost.random library with /dev/urandom support
-	if [[ -e /dev/urandom ]] ; then
-		mkdir -p libs/random/build || die
-		cp "${FILESDIR}/random-Jamfile-${PV}" libs/random/build/Jamfile.v2 || die
-	fi
-}
-
-src_configure() {
-	einfo "Writing new user-config.jam"
-
-	local compiler compilerVersion compilerExecutable mpi
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		compiler=darwin
-		compilerVersion=$(gcc-fullversion)
-		compilerExecutable=$(tc-getCXX)
-		# 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
-	else
-		compiler=gcc
-		compilerVersion=$(gcc-version)
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	# Using -fno-strict-aliasing to prevent possible creation of invalid code.
-	append-flags -fno-strict-aliasing
-
-	# bug 298489
-	if use ppc || use ppc64 ; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi;
-
-	use mpi && mpi="using mpi ;"
-
-	if use python ; then
-		pystring="using python : $(python_get_version) : /usr :	$(python_get_includedir) : $(python_get_libdir) ;"
-	fi
-
-	cat > "${S}/user-config.jam" << __EOF__
-
-variant gentoorelease : release : <optimization>none <debug-symbols>none ;
-variant gentoodebug : debug : <optimization>none ;
-
-using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-
-${pystring}
-
-${mpi}
-
-__EOF__
-
-	# Maintainer information:
-	# The debug-symbols=none and optimization=none
-	# are not official upstream flags but a Gentoo
-	# specific patch to make sure that all our
-	# CXXFLAGS/LDFLAGS are being respected.
-	# Using optimization=off would for example add
-	# "-O0" and override "-O2" set by the user.
-	# Please take a look at the boost-build ebuild
-	# for more infomration.
-
-	use icu && OPTIONS="-sICU_PATH=/usr"
-	use icu || OPTIONS="--disable-icu"
-	use mpi || OPTIONS="${OPTIONS} --without-mpi"
-	use python || OPTIONS="${OPTIONS} --without-python"
-
-	# https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch
-	if use sparc || { use mips && [[ ${ABI} = "o32" ]]; } || use hppa || use arm || use x86-fbsd || use sh; then
-		OPTIONS="${OPTIONS} --disable-long-double"
-	fi
-
-	OPTIONS="${OPTIONS} pch=off --user-config=\"${S}/user-config.jam\" --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}/usr\" --layout=versioned"
-
-	if use static-libs ; then
-		LINK_OPTS="link=shared,static"
-		LIBRARY_TARGETS="*.a *$(get_libname)"
-	else
-		LINK_OPTS="link=shared"
-		#there is no dynamicly linked version of libboost_test_exec_monitor and libboost_exception
-		LIBRARY_TARGETS="libboost_test_exec_monitor*.a libboost_exception*.a *$(get_libname)"
-	fi
-}
-
-src_compile() {
-	jobs=$( echo " ${MAKEOPTS} " | \
-		sed -e 's/ --jobs[= ]/ -j /g' \
-			-e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \
-			-e 's/ -j\>/ -j1/g' | \
-			( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; jobs="${j#-j}"; done; echo ${jobs} ) )
-	if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi;
-
-	export BOOST_ROOT="${S}"
-
-	einfo "Using the following command to build: "
-	einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared"
-
-	${BJAM} ${NUMJOBS} -q -d+2 \
-		gentoorelease \
-		${OPTIONS} \
-		threading=single,multi ${LINK_OPTS} runtime-link=shared \
-		|| die "building boost failed"
-
-	# ... and do the whole thing one more time to get the debug libs
-	if use debug ; then
-		einfo "Using the following command to build: "
-		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --buildid=debug"
-
-		${BJAM} ${NUMJOBS} -q -d+2 \
-			gentoodebug \
-			${OPTIONS} \
-			threading=single,multi ${LINK_OPTS} runtime-link=shared \
-			--buildid=debug \
-			|| die "building boost failed"
-	fi
-
-	if use tools; then
-		cd "${S}/tools/"
-		einfo "Using the following command to build the tools: "
-		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS}"
-
-		${BJAM} ${NUMJOBS} -q -d+2\
-			gentoorelease \
-			${OPTIONS} \
-			|| die "building tools failed"
-	fi
-
-}
-
-src_install () {
-	export BOOST_ROOT="${S}"
-
-	einfo "Using the following command to install: "
-	einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" install"
-
-	${BJAM} -q -d+2 \
-		gentoorelease \
-		${OPTIONS} \
-		threading=single,multi ${LINK_OPTS} runtime-link=shared \
-		--includedir="${D}/usr/include" \
-		--libdir="${D}/usr/$(get_libdir)" \
-		install || die "install failed for options '${OPTIONS}'"
-
-	if use debug ; then
-		einfo "Using the following command to install: "
-		einfo "${BJAM} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" --buildid=debug"
-
-		${BJAM} -q -d+2 \
-			gentoodebug \
-			${OPTIONS} \
-			threading=single,multi ${LINK_OPTS} runtime-link=shared \
-			--includedir="${D}/usr/include" \
-			--libdir="${D}/usr/$(get_libdir)" \
-			--buildid=debug \
-			install || die "install failed for options '${OPTIONS}'"
-	fi
-
-	use python || rm -rf "${D}/usr/include/boost-${MAJOR_PV}/boost"/python* || die
-
-	dodir /usr/share/boost-eselect/profiles/${SLOT} || die
-	touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/default" || die
-	if use debug ; then
-		 touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug" || die
-	fi
-
-	# Move the mpi.so to the right place and make sure it's slotted
-	if use mpi && use python; then
-		mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
-		mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/" || die
-		touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die
-		_add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\""
-	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 || die
-		dohtml \
-			-A pdf,txt \
-			-r tools || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r libs || die
-		doins -r more || die
-
-		# To avoid broken links
-		insinto /usr/share/doc/${PF}/html
-		doins LICENSE_1_0.txt || die
-
-		dosym /usr/include/boost-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost || die
-	fi
-
-	cd "${D}/usr/$(get_libdir)" || die
-
-	# Remove (unversioned) symlinks
-	# And check for what we remove to catch bugs
-	# got a better idea how to do it? tell me!
-	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v "${MAJOR_PV}") ; do
-		if [ ! -h "${f}" ] ; then
-			eerror "Ups, tried to remove '${f}' which is a a real file instead of a symlink"
-			die "slotting/naming of the libs broken!"
-		fi
-		rm "${f}" || die
-	done
-
-	# The threading libs obviously always gets the "-mt" (multithreading) tag
-	# some packages seem to have a problem with it. Creating symlinks...
-
-	if use static-libs ; then
-		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)"
-	else
-		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)"
-	fi
-	for lib in ${THREAD_LIBS} ; do
-		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-	done
-
-	# The same goes for the mpi libs
-	if use mpi ; then
-		if use static-libs ; then
-			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}.a libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
-		else
-			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
-		fi
-		for lib in ${MPI_LIBS} ; do
-			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-		done
-	fi
-
-	if use debug ; then
-		if use static-libs ; then
-			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname) libboost_thread-mt-${MAJOR_PV}-debug.a"
-		else
-			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname)"
-		fi
-
-		for lib in ${THREAD_DEBUG_LIBS} ; do
-			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-		done
-
-		if use mpi ; then
-			if use static-libs ; then
-				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug.a libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
-			else
-				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
-			fi
-
-			for lib in ${MPI_DEBUG_LIBS} ; do
-				dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-			done
-		fi
-	fi
-
-	# Create a subdirectory with completely unversioned symlinks
-	# and store the names in the profiles-file for eselect
-	dodir /usr/$(get_libdir)/boost-${MAJOR_PV} || die
-
-	_add_line "libs=\"" default
-	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug) ; do
-		dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}} || die
-		_add_line "/usr/$(get_libdir)/${f}" default
-	done
-	_add_line "\"" default
-
-	if use debug ; then
-		_add_line "libs=\"" debug
-		dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug || die
-		for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug) ; do
-			dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug} || die
-			_add_line "/usr/$(get_libdir)/${f}" debug
-		done
-		_add_line "\"" debug
-
-		_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" debug
-		_add_line "suffix=\"-debug\"" debug
-	fi
-
-	_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default
-
-	if use tools; then
-		cd "${S}/dist/bin" || die
-		# Append version postfix to binaries for slotting
-		_add_line "bins=\""
-		for b in * ; do
-			newbin "${b}" "${b}-${MAJOR_PV}" || die
-			_add_line "/usr/bin/${b}-${MAJOR_PV}"
-		done
-		_add_line "\""
-
-		cd "${S}/dist" || die
-		insinto /usr/share || die
-		doins -r share/boostbook || die
-		# Append version postfix for slotting
-		mv "${D}/usr/share/boostbook" "${D}/usr/share/boostbook-${MAJOR_PV}" || die
-		_add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\""
-	fi
-
-	cd "${S}/status" || die
-	if [ -f regress.log ] ; then
-		docinto status || die
-		dohtml *.html ../boost.png || die
-		dodoc regress.log || die
-	fi
-
-	use python && python_need_rebuild
-
-	# 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.
-	[[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		einfo "Working around completely broken build-system(tm)"
-		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' ')
-				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
-}
-
-src_test() {
-	export BOOST_ROOT=${S}
-
-	cd "${S}/tools/regression/build" || die
-	einfo "Using the following command to build test helpers: "
-	einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} process_jam_log compiler_status"
-
-	${BJAM} -q -d+2 \
-		gentoorelease \
-		${OPTIONS} \
-		process_jam_log compiler_status \
-		|| die "building regression test helpers failed"
-
-	cd "${S}/status" || die
-
-	# Some of the test-checks seem to rely on regexps
-	export LC_ALL="C"
-
-	# The following is largely taken from tools/regression/run_tests.sh,
-	# but adapted to our needs.
-
-	# Run the tests & write them into a file for postprocessing
-	einfo "Using the following command to test: "
-	einfo "${BJAM} ${OPTIONS} --dump-tests"
-
-	${BJAM} \
-		${OPTIONS} \
-		--dump-tests 2>&1 | tee regress.log || die
-
-	# Postprocessing
-	cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/process_jam_log" --v2
-	if test $? != 0 ; then
-		die "Postprocessing the build log failed"
-	fi
-
-	cat > "${S}/status/comment.html" <<- __EOF__
-		<p>Tests are run on a <a href="http://www.gentoo.org">Gentoo</a> system.</p>
-__EOF__
-
-	# Generate the build log html summary page
-	"${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/compiler_status" --v2 \
-		--comment "${S}/status/comment.html" "${S}" \
-		cs-$(uname).html cs-$(uname)-links.html
-	if test $? != 0 ; then
-		die "Generating the build log html summary page failed"
-	fi
-
-	# And do some cosmetic fixes :)
-	sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html || die
-}
-
-pkg_postinst() {
-	if use eselect ; then
-		eselect boost update || ewarn "eselect boost update failed."
-	fi
-
-	if [ ! -h "${ROOT}/etc/eselect/boost/active" ] ; then
-		elog "No active boost version found. Calling eselect to select one..."
-		eselect boost update || ewarn "eselect boost update failed."
-	fi
-}
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
new file mode 100644
index 000000000000..a902d61bba78
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
@@ -0,0 +1,29 @@
+--- libs/locale/build/Jamfile.v2
++++ libs/locale/build/Jamfile.v2
+@@ -58,8 +58,8 @@
+ 
+ if $(ICU_LINK)
+ {
+-    ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
+-    ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
++    ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
++    ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
+ }
+ else
+ {
+@@ -117,7 +117,6 @@
+       <library>icuuc/<link>shared/<runtime-link>shared 
+       <library>icudt/<link>shared/<runtime-link>shared 
+       <library>icuin/<link>shared/<runtime-link>shared
+-      <dll-path>$(ICU_PATH)/bin
+         <runtime-link>shared ;
+ 
+ 
+@@ -176,7 +175,6 @@
+       <library>icuuc_64/<link>shared/<runtime-link>shared 
+       <library>icudt_64/<link>shared/<runtime-link>shared 
+       <library>icuin_64/<link>shared/<runtime-link>shared
+-      <dll-path>$(ICU_PATH)/bin64
+         <runtime-link>shared ;
+  
+     
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
new file mode 100644
index 000000000000..c24a56c6bd5d
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
@@ -0,0 +1,62 @@
+--- libs/python/build/Jamfile.v2
++++ libs/python/build/Jamfile.v2
+@@ -39,23 +39,6 @@
+     PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
+ }
+ 
+-
+-rule find-py3-version
+-{
+-    local versions = [ feature.values python ] ;
+-    local py3ver ;
+-    for local v in $(versions)
+-    {
+-        if $(v) >= 3.0
+-        {
+-            py3ver = $(v) ;
+-        }
+-    }
+-    return $(py3ver) ;
+-}
+-
+-py3-version = [ find-py3-version ] ;
+-
+ project boost/python
+   : source-location ../src
+   : requirements
+@@ -82,7 +65,7 @@
+ rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
+ rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
+ 
+-rule lib_boost_python ( is-py3 ? )
++rule lib_boost_python
+ {
+ 
+     local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
+@@ -91,7 +74,7 @@
+     {
+         python2 = true ;
+     }
+-    lib [ cond $(is-py3) : boost_python3 : boost_python ]
++    lib boost_python
+         : # sources
+         numeric.cpp
+         list.cpp
+@@ -148,7 +131,6 @@
+             <dependency>config-warning
+ 
+             <python-debugging>on:<define>BOOST_DEBUG_PYTHON
+-            [ cond $(is-py3) : <python>$(py3-version) ]
+         :   # default build
+             <link>shared
+         :   # usage requirements
+@@ -160,9 +142,3 @@
+ 
+ lib_boost_python ;
+ boost-install boost_python ;
+-
+-if $(py3-version)
+-{
+-    lib_boost_python yes ;
+-    boost-install boost_python3 ;
+-}
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
new file mode 100644
index 000000000000..a32eca94b90b
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch
@@ -0,0 +1,95 @@
+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.48.0-no_strict_aliasing_python2.patch b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
new file mode 100644
index 000000000000..89f8109a411b
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
@@ -0,0 +1,23 @@
+--- libs/python/build/Jamfile.v2
++++ libs/python/build/Jamfile.v2
+@@ -85,6 +85,12 @@
+ rule lib_boost_python ( is-py3 ? )
+ {
+ 
++    local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
++    local python2 ;
++    if $(python_major_version) = 2
++    {
++        python2 = true ;
++    }
+     lib [ cond $(is-py3) : boost_python3 : boost_python ]
+         : # sources
+         numeric.cpp
+@@ -119,6 +125,7 @@
+         :   # requirements
+             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
+             <define>BOOST_PYTHON_SOURCE
++            [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
+           
+             # On Windows, all code using Python has to link to the Python
+             # import library.
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
new file mode 100644
index 000000000000..e7f4e7c99f24
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.48.0-python_linking.patch
@@ -0,0 +1,24 @@
+--- libs/python/build/Jamfile.v2
++++ libs/python/build/Jamfile.v2
+@@ -109,20 +109,7 @@
+             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
+             <define>BOOST_PYTHON_SOURCE
+             [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
+-          
+-            # On Windows, all code using Python has to link to the Python
+-            # import library.
+-            #
+-            # On *nix we never link libboost_python to libpython.  When
+-            # extending Python, all Python symbols are provided by the
+-            # Python interpreter executable.  When embedding Python, the
+-            # client executable is expected to explicitly link to
+-            # /python//python (the target representing libpython) itself.
+-            #
+-            # python_for_extensions is a target defined by Boost.Build to
+-            # provide the Python include paths, and on Windows, the Python
+-            # import library, as usage requirements.
+-            [ cond [ python.configured ] : <library>/python//python_for_extensions ]
++            [ cond [ python.configured ] : <library>/python//python ]
+             
+             # we prevent building when there is no python available
+             # as it's not possible anyway, and to cause dependents to
diff --git a/dev-libs/boost/files/boost-1.48.0-respect_python-buildid.patch b/dev-libs/boost/files/boost-1.48.0-respect_python-buildid.patch
new file mode 100644
index 000000000000..51003db29791
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.48.0-respect_python-buildid.patch
@@ -0,0 +1,69 @@
+https://svn.boost.org/trac/boost/ticket/6286
+
+--- boostcpp.jam
++++ boostcpp.jam
+@@ -99,13 +99,6 @@
+     BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" "_" ] ;
+ }
+ 
+-# Python build id (only for Python libraries)
+-python-id = [ option.get "python-buildid" ] ;
+-if $(python-id)
+-{
+-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
+-}
+-
+ ##############################################################################
+ #
+ # 1. The 'tag' function that adds decoration suitable to the properties if
+--- libs/mpi/build/Jamfile.v2
++++ libs/mpi/build/Jamfile.v2
+@@ -8,6 +8,8 @@
+ #  Authors: Douglas Gregor
+ #           Andrew Lumsdaine
+ 
++import option ;
++import regex ;
+ import mpi ;
+ import indirect ;
+ import python ;
+@@ -24,6 +26,13 @@
+     <tag>@$(__name__).tag
+   ;
+ 
++# Python build id (only for Python libraries)
++python-id = [ option.get "python-buildid" ] ;
++if $(python-id)
++{
++    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
++}
++
+ rule tag ( name : type ? : property-set )
+ {
+     local result = $(name) ;
+--- libs/python/build/Jamfile.v2
++++ libs/python/build/Jamfile.v2
+@@ -2,6 +2,8 @@
+ # Software License, Version 1.0. (See accompanying
+ # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ 
++import option ;
++import regex ;
+ import os ;
+ import indirect ;
+ import modules ;
+@@ -30,6 +32,14 @@
+         ;
+ }
+ 
++# Python build id (only for Python libraries)
++python-id = [ option.get "python-buildid" ] ;
++if $(python-id)
++{
++    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
++}
++
++
+ rule find-py3-version
+ {
+     local versions = [ feature.values python ] ;
diff --git a/dev-libs/boost/files/boost-1.48.0-support_dots_in_python-buildid.patch b/dev-libs/boost/files/boost-1.48.0-support_dots_in_python-buildid.patch
new file mode 100644
index 000000000000..af65f64992d2
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.48.0-support_dots_in_python-buildid.patch
@@ -0,0 +1,22 @@
+--- libs/mpi/build/Jamfile.v2
++++ libs/mpi/build/Jamfile.v2
+@@ -30,7 +30,7 @@
+ python-id = [ option.get "python-buildid" ] ;
+ if $(python-id)
+ {
+-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
++    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
+ }
+ 
+ rule tag ( name : type ? : property-set )
+--- libs/python/build/Jamfile.v2
++++ libs/python/build/Jamfile.v2
+@@ -36,7 +36,7 @@
+ python-id = [ option.get "python-buildid" ] ;
+ if $(python-id)
+ {
+-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
++    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
+ }
+ 
+ 
diff --git a/dev-libs/boost/files/remove-toolset-1.48.0.patch b/dev-libs/boost/files/remove-toolset-1.48.0.patch
index d74a88296681..df9152933788 100644
--- a/dev-libs/boost/files/remove-toolset-1.48.0.patch
+++ b/dev-libs/boost/files/remove-toolset-1.48.0.patch
@@ -1,5 +1,5 @@
---- boostcpp.jam	2010-11-17 11:51:56.000000000 +0200
-+++ boostcpp.jam.gentoo	2011-01-06 15:07:17.893270002 +0200
+--- boostcpp.jam
++++ boostcpp.jam
 @@ -377,7 +377,7 @@
          if $(layout) = versioned
          {