Version bump. Bug #356479

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

6 files changed, 558 insertions, 6 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 08d299fb8a1b..e705deb8069d 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/boost
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.215 2011/03/13 00:55:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.216 2011/03/22 09:51:47 hwoarang Exp $
+
+*boost-1.46.1 (22 Mar 2011)
+
+  22 Mar 2011; Markos Chandras <hwoarang@gentoo.org>
+  +files/random-Jamfile-1.46.1, +boost-1.46.1.ebuild,
+  +files/remove-toolset-1.46.1.patch, +files/point_release_naming_fix.patch:
+  Version bump. Bug #356479
 
   13 Mar 2011; Markus Meier <maekke@gentoo.org> boost-1.42.0-r2.ebuild:
   arm stable, bug #344677
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index ed48333958f6..81f29f002b5f 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 1.35-remove-hardlink-creation.patch 547 RMD160 0c0bae87977869efcd2e25144b910025ab3e6924 SHA1 c3833411ab8e7c84efddc5cfb4ab99abcba1eed5 SHA256 9b0515f343f0c8f7f0ce51e2c6f243edae0f3d5ce5df5b9f77a46b00041a134e
 AUX boost-1.37.0-darwin-long-double.patch 556 RMD160 54b1111e9dbc51131f01f50071f1c4f337b35d2f SHA1 827dcef39cf884948c3720ae1d94d1b5b5279578 SHA256 0beb2bf9ae43ad86c307873ab19b049152ef7798ba17523638cdb78017642c31
@@ -13,11 +13,14 @@ AUX boost-1.42.0-parameter-needs-python.patch 3037 RMD160 901d7bdda6c9f604d5487b
 AUX boost-1.42.0-template_arity-gcc45.patch 970 RMD160 0edcdbcaf0165e4e285b041f6406b1f71e798753 SHA1 f0cccc3ba7c2496f092cbc623473d21585bdd304 SHA256 e289a56bed08914704fad58bc4779ce9f327b4acac8ebd6a93bc6dd09f9a6e98
 AUX boost-1.45.0-lambda_bind.patch 1607 RMD160 ea61aaac83cfebfcb10c0e20de72022d4d4c1b27 SHA1 39856bef27d2a55f1ae2e0d7a7005264a8613289 SHA256 0ff6a7bf481d5311ec57be1eeaafdd0c0e9e0c09b896700d40295f67bf77be0b
 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
 AUX random-Jamfile-1.45.0 358 RMD160 dd8a847d5104923006795c9a19fa9154e49a8894 SHA1 a3d8cc42b95a09a451c2a1c429e019288f3b76aa SHA256 412c26f915db9d2664305d596406f6a75132d8cfe1827b42f17dc083dc632f00
+AUX random-Jamfile-1.46.1 358 RMD160 dd8a847d5104923006795c9a19fa9154e49a8894 SHA1 a3d8cc42b95a09a451c2a1c429e019288f3b76aa SHA256 412c26f915db9d2664305d596406f6a75132d8cfe1827b42f17dc083dc632f00
 AUX remove-toolset-1.41.0.patch 465 RMD160 5d93141f9cf98fc558e15c273d4ede298a96d535 SHA1 0533de67dd64cf96c992a05161fc8dc6cff3453e SHA256 e1b3c77d5116722df5c5a48973f95307fd46fea675d53d268d60548b7ac4bd2b
 AUX remove-toolset-1.42.0.patch 465 RMD160 5d93141f9cf98fc558e15c273d4ede298a96d535 SHA1 0533de67dd64cf96c992a05161fc8dc6cff3453e SHA256 e1b3c77d5116722df5c5a48973f95307fd46fea675d53d268d60548b7ac4bd2b
 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_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
@@ -29,6 +32,7 @@ DIST boost_1_39_0.tar.bz2 29408537 RMD160 4962256b48fa8563bf373b8bed97cc8655206a
 DIST boost_1_41_0.tar.bz2 33348161 RMD160 a604ef5a6f6f5bf50be59206c8534258ab431aea SHA1 31134e28866b90c39ca4a903c263e036bb25550c SHA256 1ef94e6749eaf13318284b4f629be063544c7015b45e38113b975ac1945cc726
 DIST boost_1_42_0.tar.bz2 33426755 RMD160 90cea6aaa35f22b97e6eb3f5879ca9fe21098349 SHA1 3ce3bb1a1bed504635287017f9e628597b409e7b SHA256 4b1eb95bd250ce15ac66435d6167f225b072b0d3a7eb72477a31847a9ca9e609
 DIST boost_1_45_0.tar.bz2 39330184 RMD160 1402cb49e0d680268109ef1bf16aea9bc4a127b0 SHA1 eb7424ef99df4e38af7431e38ff9849651b8aaf5 SHA256 55ed3ec51d5687e8224c988e22bef215dacce04e037d9f689569a80c4377a6d5
+DIST boost_1_46_1.tar.bz2 42001335 RMD160 bb43b39f7c4b683b80bafa3042b95e65a242d9c3 SHA1 3ca6e173ec805e5126868d8a03618e587aa26aef SHA256 e1dfbf42b16e5015c46b98e9899c423ca4d04469cbeee05e43ea19236416d883
 EBUILD boost-1.35.0-r2.ebuild 7054 RMD160 5d5cc8203f0cda430ad28896bf88f74319583a23 SHA1 b779518a223871c1b049575dbe5f4b80a9f90146 SHA256 0fe9f32e4413c142453cf95e1bfb340ad6f5fd545a232f403ee9d4bfe2e5fc05
 EBUILD boost-1.35.0-r5.ebuild 9552 RMD160 c7f2c5e2431c9b4bd0069b79ed7f87890127db91 SHA1 97283043113ba5f1715dc9ab4bfbf48a3804220e SHA256 a9a64d15470bab620718fcdb65dfbe8bbb46bb24c699c49e5578b8ec5f417905
 EBUILD boost-1.37.0-r1.ebuild 13020 RMD160 daa0794cded37501a8715ec2a2b22fbbe0e775fe SHA1 4c253b5c50ba710e14c411fcb9a024a08025ef7f SHA256 5cf20b69dda8e30890f5afc90b4fd1aeae0910a8775be52bd62f297b35687ac3
@@ -38,12 +42,23 @@ EBUILD boost-1.42.0-r1.ebuild 16032 RMD160 9f0487dcec2dbd8c9b87dd6970b7bacc397ca
 EBUILD boost-1.42.0-r2.ebuild 16067 RMD160 a88ff02d555602fed702fc44b530bda96e68fc3b SHA1 fa419ca7c10d0a21ad36c76d5d307e36673518a5 SHA256 0e09b6cf3b95f93c92e6f73c3e2140a6d1ad5a9ae3c425380b5e8ca588e3713e
 EBUILD boost-1.42.0.ebuild 15975 RMD160 73a11ca4cd5dbecaee498e581100c40d42bc1fd0 SHA1 b619229be71f178be8a4e9585677587ec59d5ee5 SHA256 7bc1d8fec6460207160d3f1631a9a6cbbc3c388556b2a04cb573c5431bfc47f3
 EBUILD boost-1.45.0.ebuild 15807 RMD160 5e55a89482a39da2d7ff1ef0dc6a0a2fb1a4de31 SHA1 955ed711ad9715f97ec2c132aa546e222285cc5b SHA256 34c6ecd333684448141824ae0b59cd32d34b775b1e4d3a4de310d694e1939b49
-MISC ChangeLog 33353 RMD160 fda5d27a2a867cad3326943f3c0ba7b88a77290a SHA1 75641e8584b36b499e837d479bbb57b1dce48003 SHA256 e1a6a4cb185494446c6b43de77cc91cb393d1c6c74e4fb02030c9829e9d943c3
+EBUILD boost-1.46.1.ebuild 16071 RMD160 d2d9390fc50f5a2615c781f27866d3669654dc09 SHA1 10665a85d460a6ba18f52040793829a5ba3860b3 SHA256 65dc0b04941558a2fde4c7fd4880ef2d4ef70fafcb0a31656f95d8baa279bd8e
+MISC ChangeLog 33597 RMD160 ac51309aaff9199a9ec39531a0c47fdef31c1281 SHA1 edaca9a81c155796057cb460f9dacbe451367998 SHA256 bc14df11e995719dff5f1aa8c44851651ee0d2cb12251c4d2747e86144fc8d98
 MISC metadata.xml 773 RMD160 3f4c57fa2861bb416fc5d92d839c41acb2b9861a SHA1 6c90f699901853658c41fbfdb3661eb617682040 SHA256 6563b78be463b4ae931f3dc07d5cd280281bf168c07ecea59fe5dc946f2d0ecf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk18FjcACgkQkKaRLQcq0GJS4ACfXuaVPZHYCkgVmDfJHJhRpP8v
-E4QAoLNKbAra8zqYCARiPP8RPz9mtVNc
-=9aZ2
+iQIcBAEBCgAGBQJNiHE3AAoJEPqDWhW0r/LC9ogP/3VQry/EL4dSPsSGHlOoGObv
+z6yltRjQLM9WgQFhmM6uezZySKsWwqE4ReAirvlPal1LvReNM1Nh8vSaJacoKiuS
+FclA7fIctrItL8JEeJIoeUBzpioLTBBjYi0+WNsXcYs/0ZVDDkSLRSOJGERVTWwy
+mF3h5x0qNv6BCkPWzHdxzfpZ+RIxby+xK0x9iqTbQ+Nowq6/CbhNWVqwOBic/JrN
+/1hYatD0VR7ml1l01I+TQaJSnUp7SsNAIk/S3GHw5yESuyr4g76ePHtEddYYnktm
+L99Rp+W+ivWDONtRt7C+CQJsumlms3BgVicC9IRwc7/ljPsnVV0vw32geM5QWsvk
+QLyZw5hM6lV2e0Wd4tGQN8lTzLo5S+E7HnZKMJi2Dc3T/kF268OVT+W7AU8nmZyI
+bpfe63slp8wTvZGTQiqDl0C0IVLfm00kFnZCm1+HYyAY2RPoDq3hJq+w8STIyxMG
+eIurfEHA7w1k/NLkRx+j+DoOACjIuWBHzCXRc+aFJE2ZbbCwZGJgl5dyzT7bvgnJ
+KHjcbA+U5FyubuqUwZB9c5tFQ3nTvdPQNO5TpuiFLoNeU2/UBqnPgB4DfsqnZvS/
+yPa3Z+va1A2LZ2WfrteUWGUzIzBDwCQTdJnxpbJiNMphy7GwTFv6CfMxpBHAvftQ
+TtEnaGKexRYkTGcKVcCd
+=yjU4
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.46.1.ebuild b/dev-libs/boost/boost-1.46.1.ebuild
new file mode 100644
index 000000000000..42a27f0a59de
--- /dev/null
+++ b/dev-libs/boost/boost-1.46.1.ebuild
@@ -0,0 +1,490 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.46.1.ebuild,v 1.1 2011/03/22 09:51:47 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? ( virtual/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="bjam-${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="15360"
+		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
+
+	# Ensure that the include dir and the libraries always have X_Y in their name if the boost version is X.Y.Z.
+	# By default the build system changes this to X_Y_Z if Z > 0, which breaks eselect-boost and some ebuilds.
+	epatch "${FILESDIR}/point_release_naming_fix.patch"
+}
+
+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 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 || 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
+		LIBRARY_TARGETS="libboost_test_exec_monitor*.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/point_release_naming_fix.patch b/dev-libs/boost/files/point_release_naming_fix.patch
new file mode 100644
index 000000000000..8da5efa3833b
--- /dev/null
+++ b/dev-libs/boost/files/point_release_naming_fix.patch
@@ -0,0 +1,14 @@
+--- Jamroot.orig	2011-03-15 12:49:05.000000000 +0000
++++ Jamroot	2011-03-15 12:49:20.000000000 +0000
+@@ -150,10 +150,7 @@
+ 
+ local version-tag = [ MATCH "^([^.]+)[.]([^.]+)[.]([^.]+)" : $(BOOST_VERSION) ]
+     ;
+-if $(version-tag[3]) = 0
+-{
+-    version-tag = $(version-tag[1-2]) ;
+-}
++version-tag = $(version-tag[1-2]) ;
+ 
+ constant BOOST_VERSION_TAG : $(version-tag:J="_") ;
+ 
diff --git a/dev-libs/boost/files/random-Jamfile-1.46.1 b/dev-libs/boost/files/random-Jamfile-1.46.1
new file mode 100644
index 000000000000..81fb136be2b0
--- /dev/null
+++ b/dev-libs/boost/files/random-Jamfile-1.46.1
@@ -0,0 +1,15 @@
+# Copyright (c) 2006 Tiziano Mueller
+#
+# Use, modification and distribution of the file is subject to the
+# Boost Software License, Version 1.0.
+# (See at http://www.boost.org/LICENSE_1_0.txt)
+
+
+project boost/random
+	: source-location ../src ;
+
+SOURCES = random_device ;
+
+lib boost_random
+	: $(SOURCES).cpp 
+	: <link>shared:<define>BOOST_RANDOM_DYN_LINK=1 ;
diff --git a/dev-libs/boost/files/remove-toolset-1.46.1.patch b/dev-libs/boost/files/remove-toolset-1.46.1.patch
new file mode 100644
index 000000000000..c80191ce43d6
--- /dev/null
+++ b/dev-libs/boost/files/remove-toolset-1.46.1.patch
@@ -0,0 +1,11 @@
+--- Jamroot	2010-11-17 11:51:56.000000000 +0200
++++ Jamroot.gentoo	2011-01-06 15:07:17.893270002 +0200
+@@ -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) ] ;
+         }