Version bump dev-util/boost-build to 1.41.0.

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

4 files changed, 157 insertions, 12 deletions

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index a951151fa96e..0a44a077a5f0 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/boost-build
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.43 2009/10/25 11:57:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.44 2009/12/02 15:25:01 djc Exp $
+
+*boost-build-1.41.0 (02 Dec 2009)
+
+  02 Dec 2009; Dirkjan Ochtman <djc@gentoo.org>
+  +files/boost-1.41-fix-mpich2-detection.patch, +boost-build-1.41.0.ebuild:
+  Version bump to boost-build-1.41.0.
 
   25 Oct 2009; Markus Meier <maekke@gentoo.org>
   boost-build-1.35.0-r2.ebuild:
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 8a5453c30d7b..9c26b635423b 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,13 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.35.0-fix_broken_icu_build.patch 1752 RMD160 0e7ee05c17d76e29abff915e84181361e4095b89 SHA1 273de1fa957091bf3c0d041f54aec9797810f3cf SHA256 71d858236c47b835947d996d3caf0a1de96ace267140d52dd09594db3a96729d
+AUX boost-1.41-fix-mpich2-detection.patch 1378 RMD160 fd81c6a03dd8bf2d6afdaf3fa4957ee0ff1f6e10 SHA1 bbe5ba6fb554ab89e5fa4649f8a44ad7cd1dfa80 SHA256 8e1adadb1345ff045930bbd1c6d9d6e4b06462de2939021bf9e3a3fe1c9d6100
 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
 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
+DIST boost_1_41_0.tar.bz2 33348161 RMD160 a604ef5a6f6f5bf50be59206c8534258ab431aea SHA1 31134e28866b90c39ca4a903c263e036bb25550c SHA256 1ef94e6749eaf13318284b4f629be063544c7015b45e38113b975ac1945cc726
 EBUILD boost-build-1.34.1.ebuild 2411 RMD160 7be71b552599041c34edf127d3f5dcb1b9095704 SHA1 bbc8007bcdd882b373ce72e8f4aa79c51c6d588d SHA256 5b80a98674bf5e7a192910b49e2c24429a56021b5b0e7d210ad936849724a491
 EBUILD boost-build-1.35.0-r1.ebuild 2739 RMD160 94abd6846df6125a847a5e179be257df8f5a7828 SHA1 d58da24de89cd40f31ab7d7d6874e1e96a7bc221 SHA256 1b83e4c6744f3e9c2d1c90aa71b64c2c31a86f78e8b6bfdac6c1b7d34931e6ba
 EBUILD boost-build-1.35.0-r2.ebuild 3098 RMD160 8631871399c9d458d0a8ec1022b5c527b88bfdd9 SHA1 e9cab38a2cb6fe488e8be8bca5cb4441bc5601e6 SHA256 f73affff86e7c8419d00c783865d3e142357fa0f746816de0ba1dec8bea2c3cd
@@ -15,12 +14,6 @@ EBUILD boost-build-1.36.0.ebuild 3074 RMD160 8d1842fef67b1d548e17c83f71b5e87dc81
 EBUILD boost-build-1.37.0.ebuild 3074 RMD160 b820f5d6fb4900415d4b2b9a0d0210259ca4ce43 SHA1 549cc53a910e3a136f4b89cbe160ef2a22b5d12c SHA256 897dada82140ab90f2e070e47eda9218212a6a42bec647f6dd79804dfeeeb1af
 EBUILD boost-build-1.39.0.ebuild 3088 RMD160 1c975b1dfc2c74d2a8fb062b3ea7acd38cc0c47e SHA1 31241c77120276c0b1165f406969956f5f92ed1d SHA256 ddb92e4024ad643380e69b8955faffa2a7717eaf3ca708c7b3525bd7dfd6c9ce
 EBUILD boost-build-1.40.0.ebuild 3088 RMD160 0d56aa2c43dacf5b651fe8c5c9200e7e333752e4 SHA1 136e05dbc06ec5577c9351203597724b53fe523d SHA256 27238ea11d03915c5cfe118cbcd14cae5081ebea2e2cede4d8c344e8dffc8ff0
-MISC ChangeLog 5877 RMD160 0c1d98861ffd9badee64d6d2e248a84a87a2f75c SHA1 1c779fe41b1fe82f82c6d3835c4a55fbcbb33fa7 SHA256 7ecad7ab0a8963aa921b3e743aea441a00b1951e2a18efd269a47cd31be7dc8f
+EBUILD boost-build-1.41.0.ebuild 3280 RMD160 c1c851b85150f9d308069ff934062c54f4586cc4 SHA1 4b00d041fffed5b3a739e1f018a3ebfb871a13e3 SHA256 645b0d4a02575b6bdd219d17e4f8b6b3318edb766ca0e743854859889d16e08d
+MISC ChangeLog 6072 RMD160 5f07dafdb240ddb26dd66f238368f60a71d66db8 SHA1 cd163b8fbb6483ab8d65c1755981628c21771986 SHA256 fa0fb885447f57cffc68359de462877d5fd09d7517f55f058f567dc817c1892e
 MISC metadata.xml 359 RMD160 4fa77cbdf5c226846628fdf00f88643e1a1527c7 SHA1 6e67fe577a9b024551514c8896b23e58f56cc30e SHA256 f0b7e5a3e4c7ff11a812e150a4a972051741c722e440d9572195bf1d25a3def3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrkPSwACgkQkKaRLQcq0GIImgCgi+QdwwiuM93diJNXFGQKDdD+
-JZsAoLVOB0K17MC+KXpYcj6uvdhPBD+R
-=rp/0
------END PGP SIGNATURE-----
diff --git a/dev-util/boost-build/boost-build-1.41.0.ebuild b/dev-util/boost-build/boost-build-1.41.0.ebuild
new file mode 100644
index 000000000000..5d3922972601
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.41.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2009 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.41.0.ebuild,v 1.1 2009/12/02 15:25:01 djc Exp $
+
+EAPI="2"
+
+inherit 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() {
+	epatch "${FILESDIR}/boost-1.41-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"
+}
diff --git a/dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch b/dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch
new file mode 100644
index 000000000000..d3bd646a8ebb
--- /dev/null
+++ b/dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch
@@ -0,0 +1,35 @@
+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 ;
+                }
+