A testing version of dev-libs/boost-1.40.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 451 insertions, 8 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index c416af725dd3..b0800f796f4c 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/boost
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.166 2009/08/07 05:47:41 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.167 2009/10/21 13:00:18 djc Exp $
+
+*boost-1.40.0 (21 Oct 2009)
+
+  21 Oct 2009; Dirkjan Ochtman <djc@gentoo.org> +boost-1.40.0.ebuild,
+  +files/remove-toolset-1.40.0.patch, metadata.xml:
+  Add pmasked boost-1.40 for some testing (add myself to maintainers).
 
   07 Aug 2009; Tiziano Müller <dev-zero@gentoo.org> boost-1.35.0-r5.ebuild,
   boost-1.39.0.ebuild:
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 676ac782f285..ec29d065f4fd 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -4,6 +4,7 @@ AUX boost-1.37.0-darwin-long-double.patch 556 RMD160 54b1111e9dbc51131f01f50071f
 AUX boost-alpha-threads.patch 1111 RMD160 49fe6128f6dd9277389d25a83706b401705cdb40 SHA1 846f8a187dca02a998fb60bd298d2312e16620f0 SHA256 e7d1cb78cc73763023edb80cdb66e2a9389d9ef40f448be60cf8cd4f827e7623
 AUX buildid-fix.patch 1045 RMD160 ce9dbea25e21ed1ac177b16982ef1850957474f2 SHA1 af1069055e6f8d8fa143fb2ddeccb2fc36ddce9a SHA256 42a2aa4c0f4d8579a501d6133f55852acbd1d7b497598983c50bdebaa17df17f
 AUX random-Jamfile 355 RMD160 478b592e9d33d371b07e5364e63512c8208263bf SHA1 8ca047df78758f62a6c131bd27441173e9079fa6 SHA256 7dc71ab8b862ccd5ea9c21c42557adfe0c711ea7fbe7faa47328a37aa84bc096
+AUX remove-toolset-1.40.0.patch 465 RMD160 5d93141f9cf98fc558e15c273d4ede298a96d535 SHA1 0533de67dd64cf96c992a05161fc8dc6cff3453e SHA256 e1b3c77d5116722df5c5a48973f95307fd46fea675d53d268d60548b7ac4bd2b
 AUX remove_toolset_from_targetname.patch 490 RMD160 e050992fd79005af73410a2ea4037a82177ddf33 SHA1 80d96cca8cb0acb752c428ffcada3ef2964642b1 SHA256 5c5c6fea3c1e20e290d15a68f91b6c084cc5b34daae338e3aa0879a3fd5b9fb5
 DIST boost-patches-1.34.1-3.tbz2 5681 RMD160 b7a3cece3602d6cab91118ef03bf0fd7a89db58e SHA1 ac22f748c1c31b874552a72cb62b4ee143432357 SHA256 d77f9c7d76694e3f443b8381f1506e2d586f2e3ff07b8835f512878cc8249a82
 DIST boost-patches-1.35.0-2.tbz2 4327 RMD160 ef72f3b59b4b0d6bbe4e99813f5d1d63dffc7a58 SHA1 a534b8d0e9c104e35093b2f5580a15fa764feb79 SHA256 8eae1416f1ee1885ff42a01ab6dcabb7bd454405d0ca1ab2d51172d1e20d516f
@@ -19,6 +20,7 @@ DIST boost_1_35_0.tar.bz2 23416747 RMD160 89dc46b7841cd288b5fb6f4b9a1ac7309786dc
 DIST boost_1_36_0.tar.bz2 28839275 RMD160 0ac38ee3c355c22fd5534bc806bf516890e5182d SHA1 b8f0f5d90b260aff995ef38fad4eee5e73d00810 SHA256 9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
 DIST boost_1_37_0.tar.bz2 29435646 RMD160 3c4cf7eb97a8fb126e564ba529ed9edec8765185 SHA1 c0d0cf9ad8d954507824aed51a3e93e6a9da1d99 SHA256 d52ef49f70b1b9addc4e0d1a3a2a1966227f0d173c3301bac3e6d399eeac5472
 DIST boost_1_39_0.tar.bz2 29408537 RMD160 4962256b48fa8563bf373b8bed97cc8655206a51 SHA1 6af42f74ab24ccc51589a025593bad298c8adde8 SHA256 44785eae8c6cce61a29a8a51f9b737e57b34d66baa7c0bcd4af188832b8018fd
+DIST boost_1_40_0.tar.bz2 32068759 RMD160 dabcc7442b73048095aa3037917ea0713782781f SHA1 9dbaa06ce1d99ce310011c2eaf816ecb003b3096 SHA256 36cf4a239b587067a4923fdf6e290525a14c3af29829524fa73f3dec6841530c
 EBUILD boost-1.33.1-r1.ebuild 6873 RMD160 a79f68af9208897db0dc4a40a37bb1e73cbbf8b0 SHA1 4bf88f18764e59ada9cb8d2d172c544499e8f7f8 SHA256 c3b927039a53429dcbc4f4df7153b02a2bb387672f5bec1d1e915f598214b270
 EBUILD boost-1.34.1-r2.ebuild 6934 RMD160 844596da0fb1f4178c296344b7f10598c4c7c3f5 SHA1 f73a26cd6fd3f004a76ca57cf0ebdb9ca62e91fd SHA256 80e76b2b6ed7204287813316726b5e207171ecb3408229bcef1f9490622c2d85
 EBUILD boost-1.35.0-r1.ebuild 7022 RMD160 d81ddab27b1962e2f432e1f8268bf24205b11b13 SHA1 85ceecf41826e1f570680430c80d4769c9bf37f5 SHA256 7321e22569df9ba80e081b2addbf4aeced85f6466243cbe865a1bb27972f3a65
@@ -28,5 +30,6 @@ EBUILD boost-1.35.0-r5.ebuild 9707 RMD160 a0ebe596cd29fda9e30226e1a468e0a65a1791
 EBUILD boost-1.36.0-r1.ebuild 9686 RMD160 734a3e403ebdfbf4de5fb4c84fc1e37048a13f5d SHA1 7de5edb6d2d630be3f4e913387d50193637d5cca SHA256 ef75722943d3f1226a54acc285eac8381815a696773b2c701f97d9dddfe4b6ed
 EBUILD boost-1.37.0-r1.ebuild 13202 RMD160 d1fff78b53fe922262c60e9224f5ffe56b5c7df3 SHA1 abc6ce4e84b73e6f3f4967ead69fa614f3380dbc SHA256 bff7fd1a29a866c536ef0d5eb94ed1f39f27d7e99cb894355573a95aa5a25fb1
 EBUILD boost-1.39.0.ebuild 13009 RMD160 29bdeddfa2ece249b8f53778e5d670cbf1ec9d77 SHA1 0c396d42a0c4113044d3b3bf39baa34f603c4e87 SHA256 1509426daf27761bb83b94434cc2fb5c7b7dde2a8848d555072d3ca10ae47270
-MISC ChangeLog 24871 RMD160 ff1c59d062d50aff3edecee5b2bad68d4ecaeec0 SHA1 a4aec8fae318c850a80f20583dd92fb8d06fe2aa SHA256 b622621c53f8464229e94e22e75ed9b7a38b3df4e123589b59138b6dae8e9e4d
-MISC metadata.xml 884 RMD160 56b11a49f37835a25ecdf45d292c0a625cfcd364 SHA1 7353ce0ebc2bb237b2c2ab872ecfbb69ee69e214 SHA256 2db9a39a09ad510b68ed69278426d7a5a96253b7c5d6106ddbea8228677b5d25
+EBUILD boost-1.40.0.ebuild 12788 RMD160 c01a37885e9b59ed6ce575a4c2072383555f85d0 SHA1 0eb8cc7adb6ff3b1959f74ee7f7ec9f50253931f SHA256 9c4656bbfa2a085d71d7588608e727449ff384fe704bd83b14c30f0781c9b202
+MISC ChangeLog 25089 RMD160 358d89a62efa7a1ab822769bea1fdbf5fdd79396 SHA1 6bb2193ef7ebd0f25372903e167dbab36c79888d SHA256 7d2713dd895135d49f579f8dc869c2b20d2e53365c672fa6d17ca904c0d9ff2b
+MISC metadata.xml 992 RMD160 d3fa493d96a99d96b22b8dca63b8eca2bd03a815 SHA1 11266ba2c4208b5ddbb4ec1cafa30914a5cf6621 SHA256 87a0451b8d490946beb1c303e10cbd63d945a9d8a2c6b27be9410895aec2e78b
diff --git a/dev-libs/boost/boost-1.40.0.ebuild b/dev-libs/boost/boost-1.40.0.ebuild
new file mode 100644
index 000000000000..f72a2a30930e
--- /dev/null
+++ b/dev-libs/boost/boost-1.40.0.ebuild
@@ -0,0 +1,419 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.40.0.ebuild,v 1.1 2009/10/21 13:00:18 djc 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="freedist Boost-1.0"
+SLOT="$(get_version_component_range 1-2)"
+IUSE="debug doc +eselect expat icu mpi python tools"
+
+KEYWORDS="~amd64"
+
+RDEPEND="icu? ( >=dev-libs/icu-3.3 )
+	expat? ( dev-libs/expat )
+	mpi? ( || ( >=sys-cluster/openmpi-1.3[cxx] =sys-cluster/openmpi-1.2*[-nocxx] ) )
+	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() {
+	if has test ${FEATURES} ; then
+		CHECKREQS_DISK_BUILD="1024"
+		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
+		cp "${FILESDIR}/random-Jamfile" libs/random/build/Jamfile.v2
+		# yeah, we WANT it to work on non-Linux too
+		sed -i -e 's/#ifdef __linux__/#if 1/' libs/random/random_device.cpp || 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
+
+	# Huge number of strict-aliasing warnings cause a build failure w/ >= GCC 4.4 bug #252287
+	[[ $(gcc-version) > 4.3 ]] && append-flags -Wno-strict-aliasing
+
+	use mpi && mpi="using mpi ;"
+
+	if use python ; then
+		python_version
+		pystring="using python : ${PYVER} : /usr :	/usr/include/python${PYVER} : /usr/lib/python${PYVER} ;"
+	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 expat && OPTIONS="${OPTIONS} -sEXPAT_INCLUDE=/usr/include -sEXPAT_LIBPATH=/usr/$(get_libdir)"
+	use mpi || OPTIONS="${OPTIONS} --without-mpi"
+	use python || OPTIONS="${OPTIONS} --without-python"
+
+	if use sparc || use mips || use hppa ; then
+		OPTIONS="${OPTIONS} --disable-long-double"
+	fi
+
+	OPTIONS="${OPTIONS} --user-config=\"${S}/user-config.jam\" --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}/usr\" --layout=versioned"
+
+}
+
+src_compile() {
+
+	NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
+
+	einfo "Using the following options to build: "
+	einfo "  ${OPTIONS}"
+
+	export BOOST_ROOT="${S}"
+
+	${BJAM} ${NUMJOBS} -q \
+		gentoorelease \
+		${OPTIONS} \
+		threading=single,multi link=shared,static runtime-link=shared \
+		|| die "building boost failed"
+
+	# ... and do the whole thing one more time to get the debug libs
+	if use debug ; then
+		${BJAM} ${NUMJOBS} -q \
+			gentoodebug \
+			${OPTIONS} \
+			threading=single,multi link=shared,static runtime-link=shared \
+			--buildid=debug \
+			|| die "building boost failed"
+	fi
+
+	if use tools; then
+		cd "${S}/tools/"
+		${BJAM} ${NUMJOBS} -q \
+			gentoorelease \
+			${OPTIONS} \
+			|| die "building tools failed"
+	fi
+
+}
+
+src_install () {
+	einfo "Using the following options to install: "
+	einfo "  ${OPTIONS}"
+
+	export BOOST_ROOT="${S}"
+
+	${BJAM} -q \
+		gentoorelease \
+		${OPTIONS} \
+		threading=single,multi link=shared,static runtime-link=shared \
+		--includedir="${D}/usr/include" \
+		--libdir="${D}/usr/$(get_libdir)" \
+		install || die "install failed for options '${OPTIONS}'"
+
+	if use debug ; then
+		${BJAM} -q \
+			gentoodebug \
+			${OPTIONS} \
+			threading=single,multi link=shared,static 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*
+
+	dodir /usr/share/boost-eselect/profiles/${SLOT}
+	touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/default"
+	use debug && touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug"
+
+	# Move the mpi.so to the right place and make sure it's slotted
+	if use mpi && use python; then
+		mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}"
+		mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/"
+		touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py"
+		_add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/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 more people wiki
+		dohtml \
+			-A pdf,txt \
+			-r tools
+		insinto /usr/share/doc/${PF}/html
+		doins -r libs
+
+		# 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
+
+	cd "${D}/usr/$(get_libdir)"
+
+	# 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 *{.a,$(get_libname)} | 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}"
+	done
+
+	# The threading libs obviously always gets the "-mt" (multithreading) tag
+	# some packages seem to have a problem with it. Creating symlinks...
+	for lib in libboost_thread-mt-${MAJOR_PV}{.a,$(get_libname)} ; do
+		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+	done
+
+	# The same goes for the mpi libs
+	if use mpi ; then
+		for lib in libboost_mpi-mt-${MAJOR_PV}{.a,$(get_libname)} ; do
+			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+		done
+	fi
+
+	if use debug ; then
+		for lib in libboost_thread-mt-${MAJOR_PV}-debug{.a,$(get_libname)} ; do
+			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+		done
+
+		if use mpi ; then
+			for lib in libboost_mpi-mt-${MAJOR_PV}-debug{.a,$(get_libname)} ; 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
+	for f in $(ls -1 *{.a,$(get_libname)} | 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
+		for f in $(ls -1 *{.a,$(get_libname)} | 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
+
+	if use tools; then
+		cd "${S}/dist/bin"
+		# Append version postfix to binaries for slotting
+		_add_line "bins=\""
+		for b in * ; do
+			newbin "${b}" "${b}-${MAJOR_PV}"
+			_add_line "/usr/bin/${b}-${MAJOR_PV}"
+		done
+		_add_line "\""
+
+		cd "${S}/dist"
+		insinto /usr/share
+		doins -r share/boostbook
+		# Append version postfix for slotting
+		mv "${D}/usr/share/boostbook" "${D}/usr/share/boostbook-${MAJOR_PV}"
+		_add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\""
+	fi
+
+	cd "${S}/status"
+	if [ -f regress.log ] ; then
+		docinto status
+		dohtml *.{html,gif} ../boost.png
+		dodoc regress.log
+	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"
+	${BJAM} -q \
+		gentoorelease \
+		${OPTIONS} \
+		process_jam_log compiler_status \
+		|| die "building regression test helpers failed"
+
+	cd "${S}/status"
+
+	# 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
+	${BJAM} \
+		${OPTIONS} \
+		--dump-tests 2>&1 | tee regress.log
+
+	# Postprocessing
+	cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/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/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
+}
+
+pkg_postinst() {
+	use eselect && eselect boost update
+	if [ ! -h "${ROOT}/etc/eselect/boost/active" ] ; then
+		elog "No active boost version found. Calling eselect to select one..."
+		eselect boost update
+	fi
+}
diff --git a/dev-libs/boost/files/remove-toolset-1.40.0.patch b/dev-libs/boost/files/remove-toolset-1.40.0.patch
new file mode 100644
index 000000000000..b7d797c37376
--- /dev/null
+++ b/dev-libs/boost/files/remove-toolset-1.40.0.patch
@@ -0,0 +1,11 @@
+--- Jamroot	2009-08-23 18:17:37.000000000 +0200
++++ Jamroot.gentoo	2009-10-21 13:31:46.000000000 +0200
+@@ -352,7 +352,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) ] ;
+         }        
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
index cfaa5d88300d..09016cd72c97 100644
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
-<maintainer>
-  <email>dev-zero@gentoo.org</email>
-  <name>Tiziano Müller</name>
-</maintainer>
+  <herd>cpp</herd>
+  <maintainer>
+    <email>dev-zero@gentoo.org</email>
+    <name>Tiziano Müller</name>
+  </maintainer>
+  <maintainer>
+    <email>djc@gentoo.org</email>
+    <name>Dirkjan Ochtman</name>
+  </maintainer>
 <longdescription>
 Boost is a free peer-reviewed portable C++ source libraries.
 </longdescription>