Removed pyste and added expat, mpi USE-flags. Reworked the way we call the build system. Updated patchset to work around expat and mpi build problems.

Package-Manager: portage-2.1.5.4

3 files changed, 72 insertions, 69 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 8432a5b388b1..1238ecf5965a 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/boost
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.134 2008/04/24 15:01:21 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.135 2008/06/05 20:33:53 dev-zero Exp $
+
+*boost-1.35.0-r1 (05 Jun 2008)
+
+  05 Jun 2008; Tiziano Müller <dev-zero@gentoo.org> -boost-1.35.0.ebuild,
+  +boost-1.35.0-r1.ebuild:
+  Removed pyste and added expat, mpi USE-flags. Reworked the way we call the
+  build system. Updated patchset to work around expat and mpi build
+  problems.
 
 *boost-1.35.0 (24 Apr 2008)
 
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 89f2d5fd203c..950e7af19877 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -3,7 +3,7 @@ AUX boost-alpha-threads.patch 1111 RMD160 49fe6128f6dd9277389d25a83706b401705cdb
 AUX random-Jamfile 355 RMD160 478b592e9d33d371b07e5364e63512c8208263bf SHA1 8ca047df78758f62a6c131bd27441173e9079fa6 SHA256 7dc71ab8b862ccd5ea9c21c42557adfe0c711ea7fbe7faa47328a37aa84bc096
 DIST boost-patches-1.34.1-1.tbz2 5031 RMD160 ff18c94c9fdf6f1c6fe7636bc8c532945ad95a3b SHA1 886387591a931c68187f2280e3b202a299bb57db SHA256 d0753078daab13e47bdf72f249d8fef821688fc93decaccaf7f49e5cae476e01
 DIST boost-patches-1.34.1-3.tbz2 5681 RMD160 b7a3cece3602d6cab91118ef03bf0fd7a89db58e SHA1 ac22f748c1c31b874552a72cb62b4ee143432357 SHA256 d77f9c7d76694e3f443b8381f1506e2d586f2e3ff07b8835f512878cc8249a82
-DIST boost-patches-1.35.0-1.tbz2 3869 RMD160 0fd1c582991e8ca83944322f934f48adc2961855 SHA1 3b92d6d6ea64c79b249dae1b49ab13a2c7b97c5b SHA256 b7a1061e9cc7ed2688bdd414dc06f41204bc839e24cdfba4f3fbd823315bd272
+DIST boost-patches-1.35.0-2.tbz2 4327 RMD160 ef72f3b59b4b0d6bbe4e99813f5d1d63dffc7a58 SHA1 a534b8d0e9c104e35093b2f5580a15fa764feb79 SHA256 8eae1416f1ee1885ff42a01ab6dcabb7bd454405d0ca1ab2d51172d1e20d516f
 DIST boost_1_33_1.tar.bz2 11507161 RMD160 3d5999d321b558f74d786bec52ee1b1fcd7e7152 SHA1 22682f75ff0d1ea548688e78c8cca83d599ca576 SHA256 6232e93205acbc8c705f44f15977aae158550c99a384f41606cff26c16393be0
 DIST boost_1_34_1.tar.bz2 12986931 RMD160 303327ff852bc19dd7a94657fdef3c56f5882e06 SHA1 b771271d5cbd3bdb0f119dd66dfd36bad7a66866 SHA256 0f866c75b025a4f1340117a106595cc0675f48ba1e5a9b5c221ec7f19e96ec4c
 DIST boost_1_35_0.tar.bz2 23416747 RMD160 89dc46b7841cd288b5fb6f4b9a1ac7309786dc14 SHA1 80d1fe7b0c45541e2af7628295b18f2af996de16 SHA256 f8bf7368a22ccf2e2cf77048ab2129744be4c03f8488c76ad31c0aa229b280da
@@ -11,6 +11,6 @@ EBUILD boost-1.33.1-r1.ebuild 6932 RMD160 c691b8884b08981841808ece5406d13ae183e6
 EBUILD boost-1.33.1.ebuild 5591 RMD160 2a383971eb137c256579478c78137ed538b72409 SHA1 7c1011e8a571b1ec6f24b6df0cd2314988c03878 SHA256 0aeb2b988e7d97d7165347bdcac62b26f72e9e9830f4ad0fd62e77f6d06240ec
 EBUILD boost-1.34.1-r1.ebuild 6919 RMD160 415b8e070104da6ac219f17957729b1831fb5ae8 SHA1 577388bec5f9c3c969b05de10a8b3bf2d45196df SHA256 0c4bd1a829e7749d417382e9485dc693aecead5aa7c58008860ef1a1980504f2
 EBUILD boost-1.34.1-r2.ebuild 6935 RMD160 f6d8fad5615d4c2074788d4f52a9b1dd8789bda2 SHA1 6009fab7c51be18581f159c251f154dad0b3dd20 SHA256 61c782e23b48b523e6ab3df0287e3666a1660e2ddf350f85aa15484951904a6b
-EBUILD boost-1.35.0.ebuild 6929 RMD160 290d07acbe696d5b61773ec824f5ba6be401bed1 SHA1 ccaf061487e6a20d2e00505e5c8786677947b53e SHA256 2b456aa3cd880cbb7a53a212a0c0f5ae141a83acad3d4945ba7d9a002d0c1e48
-MISC ChangeLog 18593 RMD160 d261c9db49493482aa3e97eed0bffa00b339eab3 SHA1 d1f8383384a4a9728dbc90951684361f0c6ce67a SHA256 c4b0eaad5f9f40e55a6b943d123d01d053f41c78497d3b3c73e3dc5b7b2b76c0
+EBUILD boost-1.35.0-r1.ebuild 6977 RMD160 a5cb9c45a3f0bd9f6d88c5461aba54bf3338cd6d SHA1 2d2a8629736fb18c364b8ef9d7c51d67c638911b SHA256 5c6bb0166deb3b8865e4f8491a7d2a956dd9a83ed933aa860f0b7f205221aed5
+MISC ChangeLog 18885 RMD160 04059a7933ccec532f71bd7ef7c792109621ee94 SHA1 c86bb52d4af72803c6750d488b37819946782875 SHA256 d3d88ccf45a7d9f34190fad93f95069809d3648a747556a2d2e07518e7ba3a9c
 MISC metadata.xml 349 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd SHA1 042144f72d878c355a55ad72a5212b2c2db88b9a SHA256 17524a0d3400af3c713289c5cf1f713cf63619264b9c6b535be3e2d543512cf6
diff --git a/dev-libs/boost/boost-1.35.0.ebuild b/dev-libs/boost/boost-1.35.0-r1.ebuild
index 60f88b05f227..da9fb214c242 100644
--- a/dev-libs/boost/boost-1.35.0.ebuild
+++ b/dev-libs/boost/boost-1.35.0-r1.ebuild
@@ -1,13 +1,13 @@
 # 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.35.0.ebuild,v 1.1 2008/04/24 15:01:21 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r1.ebuild,v 1.1 2008/06/05 20:33:53 dev-zero Exp $
 
-inherit distutils flag-o-matic multilib toolchain-funcs versionator check-reqs
+inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 MY_P=${PN}_$(replace_all_version_separators _)
-PATCHSET_VERSION="${PV}-1"
+PATCHSET_VERSION="${PV}-2"
 
 DESCRIPTION="Boost Libraries for C++"
 HOMEPAGE="http://www.boost.org/"
@@ -15,13 +15,15 @@ SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2
 	mirror://gentoo/boost-patches-${PATCHSET_VERSION}.tbz2"
 LICENSE="freedist Boost-1.0"
 SLOT="0"
-IUSE="debug doc icu pyste tools"
+IUSE="debug doc expat icu mpi tools"
 
-DEPEND="icu? ( >=dev-libs/icu-3.2 )
-		sys-libs/zlib
-		~dev-util/boost-build-${PV}"
-RDEPEND="${DEPEND}
-		pyste? ( dev-cpp/gccxml dev-python/elementtree )"
+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-${PV}-r1"
 
 S=${WORKDIR}/${MY_P}
 
@@ -55,8 +57,6 @@ src_unpack() {
 	EPATCH_SUFFIX="patch"
 	epatch
 
-	rm boost-build.jam
-
 	# This enables building the boost.random library with /dev/urandom support
 	if ! use userland_Darwin ; then
 		mkdir -p libs/random/build
@@ -65,8 +65,6 @@ src_unpack() {
 }
 
 generate_options() {
-	LINK_OPTIONS="static shared"
-
 	# Maintainer information:
 	# The debug-symbols=none and optimization=none
 	# are not official upstream flags but a Gentoo
@@ -76,22 +74,25 @@ generate_options() {
 	# "-O0" and override "-O2" set by the user.
 	# Please take a look at the boost-build ebuild
 	# for more infomration.
-	if ! use debug ; then
-		OPTIONS="release debug-symbols=none"
-	else
-		OPTIONS="debug"
-	fi
 
-	OPTIONS="${OPTIONS} optimization=none"
+	OPTIONS="gentoorelease"
+	use debug && OPTIONS="gentoodebug"
 
-	use icu && OPTIONS="${OPTIONS} -sHAVE_ICU=1 -sICU_PATH=/usr"
+	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"
+	OPTIONS="${OPTIONS} --user-config=${S}/user-config.jam --boost-build=/usr/share/boost-build"
 }
 
 generate_userconfig() {
 	einfo "Writing new user-config.jam"
-	distutils_python_version
+	python_version
 
 	local compiler compilerVersion compilerExecutable
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -106,12 +107,18 @@ generate_userconfig() {
 	fi
 
 	cat > "${S}/user-config.jam" << __EOF__
-import toolset : using ;
-import toolset : flags ;
+
+variant gentoorelease : release : <optimization>none ;
+variant gentoodebug : debug : <optimization>none ;
+
 using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
 using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;
+
 __EOF__
 
+	if use mpi ; then
+		echo "using mpi ;" >> "${S}/user-config.jam"
+	fi
 }
 
 src_compile() {
@@ -125,34 +132,22 @@ src_compile() {
 	elog "  ${OPTIONS}"
 
 	export BOOST_ROOT=${S}
-	export BOOST_BUILD_PATH=/usr/share/boost-build
-
-	for linkoption in ${LINK_OPTIONS} ; do
-		einfo "Building ${linkoption} libraries"
-		bjam ${NUMJOBS} -q \
-			${OPTIONS} \
-			threading=single,multi \
-			runtime-link=${linkoption} link=${linkoption} \
-			--prefix="${D}/usr" \
-			--layout=system \
-			|| die "building boost failed"
-	done
 
-	if use pyste; then
-		cd "${S}/libs/python/pyste/install"
-		distutils_src_compile
-	fi
+	bjam ${NUMJOBS} -q \
+		${OPTIONS} \
+		threading=single,multi link=shared,static runtime-link=shared,static \
+		--prefix="${D}/usr" \
+		--layout=system \
+		|| die "building boost failed"
 
 	if use tools; then
 		cd "${S}/tools/"
 		# We have to set optimization to -O0 or -O1 to work around a gcc-bug
 		# optimization=off adds -O0 to the compiler call and overwrites our settings.
 		bjam ${NUMJOBS} -q \
-			release debug-symbols=none \
-			optimization=off \
+			${OPTIONS} \
 			--prefix="${D}/usr" \
 			--layout=system \
-			--user-config="${S}/user-config.jam" \
 			|| die "building tools failed"
 	fi
 
@@ -172,24 +167,30 @@ src_install () {
 	generate_options
 
 	export BOOST_ROOT=${S}
-	export BOOST_BUILD_PATH=/usr/share/boost-build
 
-	for linkoption in ${LINK_OPTIONS} ; do
-		bjam -q \
-			${OPTIONS} \
-			threading=single,multi \
-			runtime-link=${linkoption} link=${linkoption} \
-			--prefix="${D}/usr" \
-			--includedir="${D}/usr/include" \
-			--libdir="${D}/usr/$(get_libdir)" \
-			--layout=system \
-			install || die "install failed"
-	done
+	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=system \
+		install || die "install failed for options '${OPTIONS}'"
+
+	# Move the mpi.so to the right place
+	if use mpi; then
+		mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages"
+		mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages"
+	fi
 
 	if use doc ; then
-		dohtml -A pdf,txt \
-			*.htm *.png *.css \
-			-r doc libs more people wiki
+		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
@@ -212,11 +213,6 @@ src_install () {
 		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
 	done
 
-	if use pyste; then
-		cd "${S}/libs/python/pyste/install"
-		distutils_src_install
-	fi
-
 	if use tools; then
 		cd "${S}/dist"
 		dobin bin/*
@@ -236,7 +232,6 @@ src_test() {
 	generate_options
 
 	export BOOST_ROOT=${S}
-	export BOOST_BUILD_PATH=/usr/share/boost-build
 
 	cd "${S}/status"