# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2

  04 Mar 2010; Nathan Phillip Brink (ohnobinki)

  <ohnobinki@ohnopublishing.net> -boost-build-1.34.1.ebuild,

  -boost-build-1.35.0-r1.ebuild, boost-build-1.39.0.ebuild,

  boost-build-1.40.0.ebuild, boost-build-1.41.0.ebuild,

  +files/boost-1.42-fix-mpich2-detection.patch, +boost-build-1.42.0.ebuild:

  Sync up with portage. Remove pointless old ebuilds. Remove extraneous die

  after epatch invocations.

AUX boost-1.42-fix-mpich2-detection.patch 1378 RMD160 fd81c6a03dd8bf2d6afdaf3fa4957ee0ff1f6e10 SHA1 bbe5ba6fb554ab89e5fa4649f8a44ad7cd1dfa80 SHA256 8e1adadb1345ff045930bbd1c6d9d6e4b06462de2939021bf9e3a3fe1c9d6100

DIST boost_1_42_0.tar.bz2 33426755 RMD160 90cea6aaa35f22b97e6eb3f5879ca9fe21098349 SHA1 3ce3bb1a1bed504635287017f9e628597b409e7b SHA256 4b1eb95bd250ce15ac66435d6167f225b072b0d3a7eb72477a31847a9ca9e609

EBUILD boost-build-1.39.0.ebuild 3165 RMD160 a9891415dce5943e73cefbd34e4d2b3e33f15ae3 SHA1 1a0694ecdafd71f303be899b00b6bb5b1007c349 SHA256 31ba3dc2056a3a444b2f9dc18621be3dc00bc4efc182a82b4d38800890415e1d

EBUILD boost-build-1.40.0.ebuild 3165 RMD160 527f39268f53cb6ba5510031ae0d721525063088 SHA1 7e367f19d289c10e7d54ba626ca47df9ca92a83c SHA256 1dcc7a9a6febd347e0ad39dd8615cb61abf6e28ae29bf71c2a4166a3b61cb4aa

EBUILD boost-build-1.41.0.ebuild 3357 RMD160 5013196bac61ad47bcce79fa56b9c0f41a9c2eea SHA1 c7dd164b047ddf4cbc6492b28c66d7d89abd2fb5 SHA256 0be4aff2cb8497b65400730d9526cbdb84106b9b68976f72b9737c5e6d1177a2

EBUILD boost-build-1.42.0.ebuild 3357 RMD160 dee3c40c4235dede9ff945b8585231dab90a5edd SHA1 97e68f2842a5139fa7320904e4cef91b96b3d435 SHA256 d9bbe0e2e3914157a0b4e5012767ba2b1ade24945c16ac59f5f7d8e1191365c2

MISC ChangeLog 6837 RMD160 decb4987e6657356db2e31bf5f6ee34d01d33a7b SHA1 ddf4733fb26e8a8f902e215a650d2f87e3e82903 SHA256 4cfde03d89676212a54f40960a808f8addb8f0e931d7b801c4b393446da758da

MISC ChangeLog.orig 6791 RMD160 933ae24b1c2b68de4df8f5c55141016e93f02204 SHA1 625720839c9c33bae8f2b16cafac53d532a35e29 SHA256 8aa221646f14c017ed738b43771f5af6e82777218a93a27a2ddeb5b125a4c08f

# Copyright 1999-2010 Gentoo Foundation

	epatch "${FILESDIR}"/boost-build-flags-unescape.patch

# Copyright 1999-2010 Gentoo Foundation

	epatch "${FILESDIR}"/boost-build-flags-unescape.patch

# Copyright 1999-2010 Gentoo Foundation

	epatch "${FILESDIR}"/boost-build-flags-unescape.patch

# Copyright 1999-2010 Gentoo Foundation

# Distributed under the terms of the GNU General Public License v2

# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.42.0.ebuild,v 1.1 2010/03/03 12:32:08 djc Exp $

EAPI="2"

inherit eutils flag-o-matic toolchain-funcs versionator

MY_PV=$(replace_all_version_separators _)

MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"

DESCRIPTION="A system for large project software construction, which is simple to use and powerful."

HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"

SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.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"

IUSE="examples python"

DEPEND="!<dev-libs/boost-1.34.0

	!<=dev-util/boost-build-1.35.0-r1

	python? ( dev-lang/python )"

RDEPEND="${DEPEND}"

S="${WORKDIR}/boost_${MY_PV}/tools"

pkg_setup() {

	ewarn "Compilation of boost-build is known to break if {C,LD}FLAGS contain"

	ewarn "extra white space (bug 293652)"

}

src_unpack() {

	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/{jam,build/v2} || die

}

src_prepare() {

	# bug 293652

	epatch "${FILESDIR}"/boost-build-flags-unescape.patch

	epatch "${FILESDIR}/boost-1.42-fix-mpich2-detection.patch"

	# Remove stripping option

	cd "${S}/jam/src"

	sed -i -e 's|-s\b||' \

		build.jam || die "sed failed"

	# Force regeneration

	rm jambase.c

	# This patch allows us to fully control optimization

	# and stripping flags when bjam is used as build-system

	# We simply extend the optimization and debug-symbols feature

	# with empty dummies called 'none'

	cd "${S}/build/v2"

	sed -i \

		-e 's/\(off speed space\)/\1 none/' \

		-e 's/\(debug-symbols      : on off\)/\1 none/' \

		tools/builtin.jam || die "sed failed"

}

src_compile() {

	cd jam/src

	local toolset

	if [[ ${CHOST} == *-darwin* ]] ; then

		toolset=darwin

	else

		# Using boost's generic toolset here, which respects CC and CFLAGS

		toolset=cc

	fi

	append-flags -fno-strict-aliasing

	# For slotting

	sed -i \

		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \

		Jambase || die "sed failed"

	# The build.jam file for building bjam using a bootstrapped jam0 ignores

	# the LDFLAGS env var (bug #209794). We have now two options:

	# a) change the cc-target definition in build.jam to include separate compile

	#    and link targets to make it use the LDFLAGS var, or

	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var

	#    (which should not be set by us).

	if [[ -z "${LDFLAGS}" ]] ; then

		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \

			|| die "building bjam failed"

	else

		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \

			$(use_with python) || die "building bjam failed"

	fi

}

src_install() {

	newbin jam/src/bin.*/bjam bjam-${MAJOR_PV}

	cd "${S}/build/v2"

	insinto /usr/share/boost-build-${MAJOR_PV}

	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \

		build kernel options tools util || die

	dodoc changes.txt hacking.txt release_procedure.txt \

		notes/build_dir_option.txt notes/relative_source_paths.txt

	if use examples ; then

		insinto /usr/share/doc/${PF}

		doins -r example

	fi

}

src_test() {

	cd jam/test

	./test.sh || die "tests failed"

}

Index: tools/build/v2/tools/mpi.jam

===================================================================

--- tools/build/v2/tools/mpi.jam        (revision 57744)

+++ tools/build/v2/tools/mpi.jam        (working copy)

@@ -156,14 +156,27 @@

         # into a feature.

         local match = [ MATCH "^(-.)(.*)" : $(cmdline) ] ;

         local matched ;

-        if $(match) && $(match[2]) {

+        if $(match) && $(match[2]) {

            local prefix = $(match[1]) ;

            if $(feature_kinds$(prefix)) {

                local name = $(feature_kinds$(prefix)) ;

                local add = [ add_feature $(prefix) $(name) $(cmdline) ] ;

                if $(add) {

-                  result += $(add[1]) ;

+

+                  if $(add[1]) = <find-shared-library>pthread

+                  {

+                      # Uhm. It's not really nice that this MPI implementation

+                      # uses -lpthread as opposed to -pthread. We do want to

+                      # set <threading>multi, instead of -lpthread.

+                      result += "<threading>multi" ;

+                      MPI_EXTRA_REQUIREMENTS += "<threading>multi" ;

+                  }

+                  else

+                  {

+                      result += $(add[1]) ;

+                  }

+

                   cmdline = $(add[2]) ;

                   matched = yes ;

                }