Changed mpi dependency to openmpi only (bug #267818, thanks to Łukasz Michalik for the analysis). Dropped old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

8 files changed, 18 insertions, 891 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index afd4cc5d3b92..44e75f32e244 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/boost
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.155 2009/04/14 20:01:17 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.156 2009/05/11 04:48:52 dev-zero Exp $
+
+  11 May 2009; Tiziano Müller <dev-zero@gentoo.org>
+  -boost-1.35.0-r4.ebuild, boost-1.35.0-r5.ebuild, -boost-1.36.0.ebuild,
+  boost-1.36.0-r1.ebuild, -boost-1.37.0.ebuild, boost-1.37.0-r1.ebuild:
+  Changed mpi dependency to openmpi only (bug #267818, thanks to Łukasz
+  Michalik for the analysis). Dropped old revisions.
 
   14 Apr 2009; Brent Baude <ranger@gentoo.org> boost-1.35.0-r2.ebuild:
   Marking boost-1.35.0-r2 ppc64 for bug 245192
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index b82d8be73339..b4ac4ab08558 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -21,11 +21,8 @@ EBUILD boost-1.34.1-r2.ebuild 6934 RMD160 844596da0fb1f4178c296344b7f10598c4c7c3
 EBUILD boost-1.35.0-r1.ebuild 7022 RMD160 d81ddab27b1962e2f432e1f8268bf24205b11b13 SHA1 85ceecf41826e1f570680430c80d4769c9bf37f5 SHA256 7321e22569df9ba80e081b2addbf4aeced85f6466243cbe865a1bb27972f3a65
 EBUILD boost-1.35.0-r2.ebuild 7132 RMD160 8eb75b66e40612b0cad9056192a7af4193eeae21 SHA1 f102b0323b26e9d91506a5823a4014586baeea15 SHA256 8516cfc69172dcf77ce6f0d1ffb98630877df23b45c583efcb42e99458c3184d
 EBUILD boost-1.35.0-r3.ebuild 7828 RMD160 452a0f1942d579cb7b2240c03be65d30f89fc997 SHA1 95d152d7ef93f50dd1ba07af88064c4dd0bd7940 SHA256 0cd0de4ab2a6c7d54704eaaf1ffc34a0d6804ce8a1cf7fccf1180397476df08c
-EBUILD boost-1.35.0-r4.ebuild 7828 RMD160 b980fdd714516405c20bd7f9b5408ed090932f7a SHA1 546f2a581d48fcc0a84682f9d867d5c66ddd5153 SHA256 822015540ae3bd6620da196b1a3946492e0b9399205a8547d6a0c0d4a026f790
-EBUILD boost-1.35.0-r5.ebuild 9507 RMD160 feec6c301a65706124dd3c3a4d0a401858e6b131 SHA1 2fd089e641fed11f92daa40a19c5cfeb474cfee3 SHA256 410e977179dc6b00388e48e889b8adb58915b6843b4541eec18c180fc0d8b0ea
-EBUILD boost-1.36.0-r1.ebuild 9497 RMD160 9447560ca062448d9b70a7b5d8b1e134e601e18f SHA1 115af1b77c1fed0c4a0e70c10f7ef6979f69fe24 SHA256 efd39e0e9af57090c9c6a3e92a5bae06ff1c22b018edfe1436d175314c5d4d5a
-EBUILD boost-1.36.0.ebuild 8038 RMD160 ba9ece93374223722e2e31391a80dc52eafd871a SHA1 1938df70a6ca5039d3e92eb82ac2c02acdd737a3 SHA256 942fe86454a27781f6b7eb6e0576a2bf6957e64dd7ac7c3d8d33af37c760482b
-EBUILD boost-1.37.0-r1.ebuild 11539 RMD160 7265dfa9bef4c6414ed53ea9908d0e0e7480434c SHA1 80ba99df97f646b46504c211eae428e9b11b2263 SHA256 931a6acae00886f0de22e8aec969e36051a95e41c524f6cd9d9c78ff8e77c1aa
-EBUILD boost-1.37.0.ebuild 8038 RMD160 302e7f4a6d26c4315be4673efaef061aafa6cb6c SHA1 4207bfdb16adc45a9a3e7106c89eb9f4e4cf4914 SHA256 4b3149f432db3442e35bc535a85f9dd9740ff82b121ef6496b6d064b9b049f7e
-MISC ChangeLog 22227 RMD160 0a069d1b4728faadcbc2f480bc760ba7f168116e SHA1 ba1b064ab138a66af6be824aba55f01a9a161c48 SHA256 7173bc67f36b99819d26b14617bc0a68a52099b67f6ddebd4df64846002af160
+EBUILD boost-1.35.0-r5.ebuild 9481 RMD160 aba9c2420028d0aca313022f5c34a9b59514412b SHA1 759052ceb965f9a15dab95e82fdc1e29f36f4d7a SHA256 b3f8cf9d9f526c31a563c3417f3e6bf1ad0a00f63d4769cbce478a507a5d47db
+EBUILD boost-1.36.0-r1.ebuild 9471 RMD160 6226fbc66ee4c1cf3b52f1742c5e45af3a1d314b SHA1 2b4b30271fd7bc2598e611fe676dc10a834c30e3 SHA256 b1db90bf016ddc70d5d208ed41cfea3bcad24652d139d40271c1d592192ec269
+EBUILD boost-1.37.0-r1.ebuild 11513 RMD160 6f7b22fa4f25c35685307702b0a405e783d2859e SHA1 9cbb64dc7e6a7ac603d90a223aa88e7a2f67c65d SHA256 ca4f267450b7f5ec28a6fb312e5b8e4ab00d970acbd090c81b615c09ab8203b8
+MISC ChangeLog 22554 RMD160 4bc303456a1b28762282831ebccb715ac250bf8d SHA1 9a8d04be07c0e4dd77fb3ac23abcfac81563e9b5 SHA256 53245f61ebb68ed1a1ce5f750dd98c07600e9dc4bc5d6d2b0e989fa6d54c9d44
 MISC metadata.xml 884 RMD160 56b11a49f37835a25ecdf45d292c0a625cfcd364 SHA1 7353ce0ebc2bb237b2c2ab872ecfbb69ee69e214 SHA256 2db9a39a09ad510b68ed69278426d7a5a96253b7c5d6106ddbea8228677b5d25
diff --git a/dev-libs/boost/boost-1.35.0-r4.ebuild b/dev-libs/boost/boost-1.35.0-r4.ebuild
deleted file mode 100644
index 9f9b3b457fce..000000000000
--- a/dev-libs/boost/boost-1.35.0-r4.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# 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.35.0-r4.ebuild,v 1.2 2009/03/24 04:51:20 dirtyepic Exp $
-
-EAPI="2"
-
-inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-MY_P=${PN}_$(replace_all_version_separators _)
-PATCHSET_VERSION="${PV}-5"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2
-	mirror://gentoo/boost-patches-${PATCHSET_VERSION}.tbz2
-	http://www.gentoo.org/~dev-zero/distfiles/boost-patches-${PATCHSET_VERSION}.tbz2"
-LICENSE="freedist Boost-1.0"
-SLOT="0"
-IUSE="debug doc expat icu mpi tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.3 )
-	expat? ( dev-libs/expat )
-	mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2 ) )
-	sys-libs/zlib
-	virtual/python"
-DEPEND="${RDEPEND}
-	=dev-util/boost-build-1.35.0-r2"
-PDEPEND="app-admin/eselect-boost"
-
-S=${WORKDIR}/${MY_P}
-
-# Maintainer Information
-# ToDo:
-# - write a patch to support /dev/urandom on FreeBSD and OSX (see below)
-
-# manually setting it for this major version
-MAJOR_PV=1_35
-BJAM="bjam-${MAJOR_PV}"
-
-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
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patches"
-	EPATCH_SUFFIX="patch"
-	epatch
-
-	epatch "${FILESDIR}/remove_toolset_from_targetname.patch"
-
-	# This enables building the boost.random library with /dev/urandom support
-	if ! use userland_Darwin ; then
-		mkdir -p libs/random/build
-		cp "${FILESDIR}/random-Jamfile" libs/random/build/Jamfile.v2
-	fi
-}
-
-generate_options() {
-	# 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.
-
-	BUILDNAME="gentoorelease"
-	use debug && BUILDNAME="gentoodebug"
-
-	OPTIONS="${BUILDNAME}"
-
-	use icu && OPTIONS="${OPTIONS} -sICU_PATH=/usr"
-	if use expat ; then
-		OPTIONS="${OPTIONS} -sEXPAT_INCLUDE=/usr/include -sEXPAT_LIBPATH=/usr/$(get_libdir)"
-	fi
-
-	if ! use mpi ; then
-		OPTIONS="${OPTIONS} --without-mpi"
-	fi
-
-	OPTIONS="${OPTIONS} --user-config=${S}/user-config.jam --boost-build=/usr/share/boost-build-${MAJOR_PV}"
-}
-
-src_configure() {
-	einfo "Writing new user-config.jam"
-	python_version
-
-	local compiler compilerVersion compilerExecutable mpi
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		compiler=darwin
-		compilerVersion=$(gcc-version)
-		compilerExecutable=$(tc-getCXX)
-		append-ldflags -ldl
-	else
-		compiler=gcc
-		compilerVersion=$(gcc-version)
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	use mpi && mpi="using mpi ;"
-
-	cat > "${S}/user-config.jam" << __EOF__
-
-variant gentoorelease : release : <optimization>none <debug-symbols>none ;
-variant gentoodebug : debug : <optimization>none <debug-symbols>none ;
-
-using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;
-
-${mpi}
-
-__EOF__
-
-}
-
-src_compile() {
-
-	NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
-
-	generate_options
-
-	elog "Using the following options to build: "
-	elog "  ${OPTIONS}"
-
-	export BOOST_ROOT="${S}"
-
-	${BJAM} ${NUMJOBS} -q \
-		${OPTIONS} \
-		threading=single,multi link=shared,static runtime-link=shared,static \
-		--prefix="${D}/usr" \
-		--layout=versioned \
-		|| die "building boost failed"
-
-	if use tools; then
-		cd "${S}/tools/"
-		${BJAM} ${NUMJOBS} -q \
-			${OPTIONS} \
-			--prefix="${D}/usr" \
-			--layout=versioned \
-			|| die "building tools failed"
-	fi
-
-}
-
-src_install () {
-
-	generate_options
-
-	export BOOST_ROOT="${S}"
-
-	${BJAM} -q \
-		${OPTIONS} \
-		threading=single,multi link=shared,static runtime-link=shared,static \
-		--prefix="${D}/usr" \
-		--includedir="${D}/usr/include" \
-		--libdir="${D}/usr/$(get_libdir)" \
-		--layout=versioned \
-		install || die "install failed for options '${OPTIONS}'"
-
-	# Move the mpi.so to the right place and make sure it's slotted
-	if use mpi; then
-		mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}"
-		mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}/"
-		touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}/__init__.py"
-	fi
-
-	if use doc ; then
-		find libs -iname "test" -or -iname "src" | xargs rm -rf
-		dohtml \
-			-A pdf,txt,cpp \
-			*.{htm,html,png,css} \
-			-r doc more people wiki
-		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
-	rm libboost_*[!$(get_version_component_range 2)].{a,so}
-
-	# If built with debug enabled, all libraries get a 'd' postfix,
-	# this breaks linking other apps against boost (bug #181972)
-	if use debug ; then
-		for lib in libboost_* ; do
-			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-d\././' -e 's/d\././' <<< ${lib})"
-		done
-	fi
-
-	for lib in libboost_thread-mt-{s-${MAJOR_PV}.a,${MAJOR_PV}.a,${MAJOR_PV}.so} ; do
-		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
-	done
-
-	if use tools; then
-		cd "${S}/dist/bin"
-		# Append version postfix to binaries for slotting
-		for b in * ; do
-			newbin "${b}" "${b}-${MAJOR_PV}"
-		done
-
-		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}"
-	fi
-
-	cd "${S}/status"
-	if [ -f regress.log ] ; then
-		docinto status
-		dohtml *.{html,gif} ../boost.png
-		dodoc regress.log
-	fi
-
-	python_need_rebuild
-}
-
-src_test() {
-	generate_options
-
-	export BOOST_ROOT=${S}
-
-	cd "${S}/tools/regression/build"
-	${BJAM} -q \
-		${OPTIONS} \
-		--prefix="${D}/usr" \
-		--layout=versioned \
-		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)/${BUILDNAME}/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)/${BUILDNAME}/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|../boost.png|boost.png|' *.html
-}
diff --git a/dev-libs/boost/boost-1.35.0-r5.ebuild b/dev-libs/boost/boost-1.35.0-r5.ebuild
index c3c0072a55e8..086aaa135b8e 100644
--- a/dev-libs/boost/boost-1.35.0-r5.ebuild
+++ b/dev-libs/boost/boost-1.35.0-r5.ebuild
@@ -1,6 +1,6 @@
 # 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.35.0-r5.ebuild,v 1.1 2009/04/07 09:43:13 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r5.ebuild,v 1.2 2009/05/11 04:48:52 dev-zero Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ IUSE="doc eselect expat icu mpi python tools"
 
 RDEPEND="icu? ( >=dev-libs/icu-3.3 )
 	expat? ( dev-libs/expat )
-	mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2 ) )
+	mpi? ( sys-cluster/openmpi )
 	sys-libs/zlib
 	python? ( virtual/python )
 	>=app-admin/eselect-boost-0.3"
diff --git a/dev-libs/boost/boost-1.36.0-r1.ebuild b/dev-libs/boost/boost-1.36.0-r1.ebuild
index 013fa119adce..714d7f1c604b 100644
--- a/dev-libs/boost/boost-1.36.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.36.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.36.0-r1.ebuild,v 1.1 2009/04/07 09:43:13 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.36.0-r1.ebuild,v 1.2 2009/05/11 04:48:52 dev-zero Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ IUSE="doc eselect expat icu mpi python tools"
 
 RDEPEND="icu? ( >=dev-libs/icu-3.3 )
 	expat? ( dev-libs/expat )
-	mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2 ) )
+	mpi? ( sys-cluster/openmpi )
 	sys-libs/zlib
 	python? ( virtual/python )
 	!<=dev-libs/boost-1.35.0-r2
diff --git a/dev-libs/boost/boost-1.36.0.ebuild b/dev-libs/boost/boost-1.36.0.ebuild
deleted file mode 100644
index 43d10c61ede8..000000000000
--- a/dev-libs/boost/boost-1.36.0.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.36.0.ebuild,v 1.1 2008/12/16 16:37:27 dev-zero Exp $
-
-EAPI="2"
-
-inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-MY_P=${PN}_$(replace_all_version_separators _)
-PATCHSET_VERSION="${PV}-1"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2
-	mirror://gentoo/boost-patches-${PATCHSET_VERSION}.tbz2
-	http://www.gentoo.org/~dev-zero/distfiles/boost-patches-${PATCHSET_VERSION}.tbz2"
-LICENSE="freedist Boost-1.0"
-SLOT="1.36"
-IUSE="debug doc expat icu mpi tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.3 )
-	expat? ( dev-libs/expat )
-	mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2 ) )
-	sys-libs/zlib
-	virtual/python
-	!<=dev-libs/boost-1.35.0-r2"
-DEPEND="${RDEPEND}
-	dev-util/boost-build:${SLOT}"
-PDEPEND="app-admin/eselect-boost"
-
-S=${WORKDIR}/${MY_P}
-
-# Maintainer Information
-# ToDo:
-# - write a patch to support /dev/urandom on FreeBSD and OSX (see below)
-
-MAJOR_PV=$(replace_all_version_separators _ ${SLOT})
-BJAM="bjam-${MAJOR_PV}"
-
-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
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patches"
-	EPATCH_SUFFIX="patch"
-	epatch
-
-	epatch "${FILESDIR}/remove_toolset_from_targetname.patch"
-
-	# This enables building the boost.random library with /dev/urandom support
-	if ! use userland_Darwin ; then
-		mkdir -p libs/random/build
-		cp "${FILESDIR}/random-Jamfile" libs/random/build/Jamfile.v2
-	fi
-}
-
-generate_options() {
-	# 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.
-
-	BUILDNAME="gentoorelease"
-	use debug && BUILDNAME="gentoodebug"
-
-	OPTIONS="${BUILDNAME}"
-
-	use icu && OPTIONS="${OPTIONS} -sICU_PATH=/usr"
-	if use expat ; then
-		OPTIONS="${OPTIONS} -sEXPAT_INCLUDE=/usr/include -sEXPAT_LIBPATH=/usr/$(get_libdir)"
-	fi
-
-	if ! use mpi ; then
-		OPTIONS="${OPTIONS} --without-mpi"
-	fi
-
-	OPTIONS="${OPTIONS} --user-config=${S}/user-config.jam --boost-build=/usr/share/boost-build-${MAJOR_PV}"
-}
-
-src_configure() {
-	einfo "Writing new user-config.jam"
-	python_version
-
-	local compiler compilerVersion compilerExecutable mpi
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		compiler=darwin
-		compilerVersion=$(gcc-version)
-		compilerExecutable=$(tc-getCXX)
-		append-ldflags -ldl
-	else
-		compiler=gcc
-		compilerVersion=$(gcc-version)
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	use mpi && mpi="using mpi ;"
-
-	cat > "${S}/user-config.jam" << __EOF__
-
-variant gentoorelease : release : <optimization>none <debug-symbols>none ;
-variant gentoodebug : debug : <optimization>none <debug-symbols>none ;
-
-using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;
-
-${mpi}
-
-__EOF__
-
-}
-
-src_compile() {
-
-	NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
-
-	generate_options
-
-	elog "Using the following options to build: "
-	elog "  ${OPTIONS}"
-
-	export BOOST_ROOT="${S}"
-
-	${BJAM} ${NUMJOBS} -q \
-		${OPTIONS} \
-		threading=single,multi link=shared,static runtime-link=shared,static \
-		--prefix="${D}/usr" \
-		--layout=versioned \
-		|| die "building boost failed"
-
-	if use tools; then
-		cd "${S}/tools/"
-		${BJAM} ${NUMJOBS} -q \
-			${OPTIONS} \
-			--prefix="${D}/usr" \
-			--layout=versioned \
-			|| die "building tools failed"
-	fi
-
-}
-
-src_install () {
-
-	generate_options
-
-	export BOOST_ROOT="${S}"
-
-	${BJAM} -q \
-		${OPTIONS} \
-		threading=single,multi link=shared,static runtime-link=shared,static \
-		--prefix="${D}/usr" \
-		--includedir="${D}/usr/include" \
-		--libdir="${D}/usr/$(get_libdir)" \
-		--layout=versioned \
-		install || die "install failed for options '${OPTIONS}'"
-
-	# Move the mpi.so to the right place and make sure it's slotted
-	if use mpi; then
-		mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}"
-		mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}/"
-		touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}/__init__.py"
-	fi
-
-	if use doc ; then
-		find libs -iname "test" -or -iname "src" | xargs rm -rf
-		dohtml \
-			-A pdf,txt,cpp \
-			*.{htm,html,png,css} \
-			-r doc more people wiki
-		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
-	for f in libboost_*[!$(get_version_component_range 2)].{a,so} ; do
-		if [ ! -h "${f}" ] ; then
-			eerror "Ups, tried to remove a real file instead of a symlink"
-			die "slotting/naming of the libs broken!"
-		fi
-		rm "${f}"
-	done
-
-	# If built with debug enabled, all libraries get a 'd' postfix,
-	# this breaks linking other apps against boost (bug #181972)
-	if use debug ; then
-		for lib in libboost_* ; do
-			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-d\././' -e 's/d\././' <<< ${lib})"
-		done
-	fi
-
-	for lib in libboost_thread-mt-{s-${MAJOR_PV}.a,${MAJOR_PV}.a,${MAJOR_PV}.so} ; do
-		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
-	done
-
-	if use tools; then
-		cd "${S}/dist/bin"
-		# Append version postfix to binaries for slotting
-		for b in * ; do
-			newbin "${b}" "${b}-${MAJOR_PV}"
-		done
-
-		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}"
-	fi
-
-	cd "${S}/status"
-	if [ -f regress.log ] ; then
-		docinto status
-		dohtml *.{html,gif} ../boost.png
-		dodoc regress.log
-	fi
-
-	python_need_rebuild
-}
-
-src_test() {
-	generate_options
-
-	export BOOST_ROOT=${S}
-
-	cd "${S}/tools/regression/build"
-	${BJAM} -q \
-		${OPTIONS} \
-		--prefix="${D}/usr" \
-		--layout=versioned \
-		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)/${BUILDNAME}/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)/${BUILDNAME}/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
-}
diff --git a/dev-libs/boost/boost-1.37.0-r1.ebuild b/dev-libs/boost/boost-1.37.0-r1.ebuild
index 8d4085afc59a..8fc5f07810c5 100644
--- a/dev-libs/boost/boost-1.37.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.37.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.37.0-r1.ebuild,v 1.2 2009/04/14 11:44:10 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.3 2009/05/11 04:48:52 dev-zero Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ IUSE="debug doc eselect expat icu mpi python tools"
 
 RDEPEND="icu? ( >=dev-libs/icu-3.3 )
 	expat? ( dev-libs/expat )
-	mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2 ) )
+	mpi? ( sys-cluster/openmpi )
 	sys-libs/zlib
 	python? ( virtual/python )
 	!<=dev-libs/boost-1.35.0-r2
diff --git a/dev-libs/boost/boost-1.37.0.ebuild b/dev-libs/boost/boost-1.37.0.ebuild
deleted file mode 100644
index 14662bdf7170..000000000000
--- a/dev-libs/boost/boost-1.37.0.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0.ebuild,v 1.1 2008/12/16 16:37:27 dev-zero Exp $
-
-EAPI="2"
-
-inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-MY_P=${PN}_$(replace_all_version_separators _)
-PATCHSET_VERSION="${PV}-1"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2
-	mirror://gentoo/boost-patches-${PATCHSET_VERSION}.tbz2
-	http://www.gentoo.org/~dev-zero/distfiles/boost-patches-${PATCHSET_VERSION}.tbz2"
-LICENSE="freedist Boost-1.0"
-SLOT="1.37"
-IUSE="debug doc expat icu mpi tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.3 )
-	expat? ( dev-libs/expat )
-	mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2 ) )
-	sys-libs/zlib
-	virtual/python
-	!<=dev-libs/boost-1.35.0-r2"
-DEPEND="${RDEPEND}
-	dev-util/boost-build:${SLOT}"
-PDEPEND="app-admin/eselect-boost"
-
-S=${WORKDIR}/${MY_P}
-
-# Maintainer Information
-# ToDo:
-# - write a patch to support /dev/urandom on FreeBSD and OSX (see below)
-
-MAJOR_PV=$(replace_all_version_separators _ ${SLOT})
-BJAM="bjam-${MAJOR_PV}"
-
-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
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patches"
-	EPATCH_SUFFIX="patch"
-	epatch
-
-	epatch "${FILESDIR}/remove_toolset_from_targetname.patch"
-
-	# This enables building the boost.random library with /dev/urandom support
-	if ! use userland_Darwin ; then
-		mkdir -p libs/random/build
-		cp "${FILESDIR}/random-Jamfile" libs/random/build/Jamfile.v2
-	fi
-}
-
-generate_options() {
-	# 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.
-
-	BUILDNAME="gentoorelease"
-	use debug && BUILDNAME="gentoodebug"
-
-	OPTIONS="${BUILDNAME}"
-
-	use icu && OPTIONS="${OPTIONS} -sICU_PATH=/usr"
-	if use expat ; then
-		OPTIONS="${OPTIONS} -sEXPAT_INCLUDE=/usr/include -sEXPAT_LIBPATH=/usr/$(get_libdir)"
-	fi
-
-	if ! use mpi ; then
-		OPTIONS="${OPTIONS} --without-mpi"
-	fi
-
-	OPTIONS="${OPTIONS} --user-config=${S}/user-config.jam --boost-build=/usr/share/boost-build-${MAJOR_PV}"
-}
-
-src_configure() {
-	einfo "Writing new user-config.jam"
-	python_version
-
-	local compiler compilerVersion compilerExecutable mpi
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		compiler=darwin
-		compilerVersion=$(gcc-version)
-		compilerExecutable=$(tc-getCXX)
-		append-ldflags -ldl
-	else
-		compiler=gcc
-		compilerVersion=$(gcc-version)
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	use mpi && mpi="using mpi ;"
-
-	cat > "${S}/user-config.jam" << __EOF__
-
-variant gentoorelease : release : <optimization>none <debug-symbols>none ;
-variant gentoodebug : debug : <optimization>none <debug-symbols>none ;
-
-using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;
-
-${mpi}
-
-__EOF__
-
-}
-
-src_compile() {
-
-	NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
-
-	generate_options
-
-	elog "Using the following options to build: "
-	elog "  ${OPTIONS}"
-
-	export BOOST_ROOT="${S}"
-
-	${BJAM} ${NUMJOBS} -q \
-		${OPTIONS} \
-		threading=single,multi link=shared,static runtime-link=shared,static \
-		--prefix="${D}/usr" \
-		--layout=versioned \
-		|| die "building boost failed"
-
-	if use tools; then
-		cd "${S}/tools/"
-		${BJAM} ${NUMJOBS} -q \
-			${OPTIONS} \
-			--prefix="${D}/usr" \
-			--layout=versioned \
-			|| die "building tools failed"
-	fi
-
-}
-
-src_install () {
-
-	generate_options
-
-	export BOOST_ROOT="${S}"
-
-	${BJAM} -q \
-		${OPTIONS} \
-		threading=single,multi link=shared,static runtime-link=shared,static \
-		--prefix="${D}/usr" \
-		--includedir="${D}/usr/include" \
-		--libdir="${D}/usr/$(get_libdir)" \
-		--layout=versioned \
-		install || die "install failed for options '${OPTIONS}'"
-
-	# Move the mpi.so to the right place and make sure it's slotted
-	if use mpi; then
-		mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}"
-		mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}/"
-		touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mpi_${MAJOR_PV}/__init__.py"
-	fi
-
-	if use doc ; then
-		find libs -iname "test" -or -iname "src" | xargs rm -rf
-		dohtml \
-			-A pdf,txt,cpp \
-			*.{htm,html,png,css} \
-			-r doc more people wiki
-		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
-	for f in libboost_*[!$(get_version_component_range 2)].{a,so} ; do
-		if [ ! -h "${f}" ] ; then
-			eerror "Ups, tried to remove a real file instead of a symlink"
-			die "slotting/naming of the libs broken!"
-		fi
-		rm "${f}"
-	done
-
-	# If built with debug enabled, all libraries get a 'd' postfix,
-	# this breaks linking other apps against boost (bug #181972)
-	if use debug ; then
-		for lib in libboost_* ; do
-			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-d\././' -e 's/d\././' <<< ${lib})"
-		done
-	fi
-
-	for lib in libboost_thread-mt-{s-${MAJOR_PV}.a,${MAJOR_PV}.a,${MAJOR_PV}.so} ; do
-		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
-	done
-
-	if use tools; then
-		cd "${S}/dist/bin"
-		# Append version postfix to binaries for slotting
-		for b in * ; do
-			newbin "${b}" "${b}-${MAJOR_PV}"
-		done
-
-		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}"
-	fi
-
-	cd "${S}/status"
-	if [ -f regress.log ] ; then
-		docinto status
-		dohtml *.{html,gif} ../boost.png
-		dodoc regress.log
-	fi
-
-	python_need_rebuild
-}
-
-src_test() {
-	generate_options
-
-	export BOOST_ROOT=${S}
-
-	cd "${S}/tools/regression/build"
-	${BJAM} -q \
-		${OPTIONS} \
-		--prefix="${D}/usr" \
-		--layout=versioned \
-		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)/${BUILDNAME}/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)/${BUILDNAME}/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
-}