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

Package-Manager: portage-2.1.7.16/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 760f38cffdb5..1e71198256b5 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.48 2010/03/03 10:54:48 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.49 2010/03/03 12:32:08 djc Exp $
+
+*boost-build-1.42.0 (03 Mar 2010)
+
+  03 Mar 2010; Dirkjan Ochtman <djc@gentoo.org>
+  +files/boost-1.42-fix-mpich2-detection.patch, +boost-build-1.42.0.ebuild:
+  Version bump to dev-util/boost-build-1.42.0.
 
   03 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
   boost-build-1.41.0.ebuild:
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 42fb4d055026..7fe72a13fbd3 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,8 +1,6 @@
------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
+AUX boost-1.42-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
@@ -10,6 +8,7 @@ DIST boost_1_37_0.tar.bz2 29435646 RMD160 3c4cf7eb97a8fb126e564ba529ed9edec87651
 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
+DIST boost_1_42_0.tar.bz2 33426755 RMD160 90cea6aaa35f22b97e6eb3f5879ca9fe21098349 SHA1 3ce3bb1a1bed504635287017f9e628597b409e7b SHA256 4b1eb95bd250ce15ac66435d6167f225b072b0d3a7eb72477a31847a9ca9e609
 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 3093 RMD160 a7452cf0715424c9e3ca5ddc434139ce02c311fe SHA1 c72fa6d243504ddbf405d03fc164df5a4cb9a6f8 SHA256 a691fcd636640fb6edd1d34106405ea2f81398dbe3d601cb818fd49f09c50e82
@@ -18,12 +17,6 @@ EBUILD boost-build-1.37.0.ebuild 3074 RMD160 b820f5d6fb4900415d4b2b9a0d0210259ca
 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
 EBUILD boost-build-1.41.0.ebuild 3291 RMD160 ff620997f512bd7b54e9e6cb11c2f0749c9ebcf9 SHA1 373dc16a523d24fd324a0e11d2ccf75fae3ca1ba SHA256 d9f8b81f95a90dfe0ee107ce395118f60ab3c0684789d064955a4aa8e8ad429c
-MISC ChangeLog 6505 RMD160 2b1d8f534001c663dae6a575b5be7c8befe9e63b SHA1 f5d56da6d968cee562e7e342deac5d8939ada9b7 SHA256 8bc10947bdad17d25d69d979f4f105ee2e2973d0a18d0757e59b0ee10f60dce9
+EBUILD boost-build-1.42.0.ebuild 3280 RMD160 cf35ff2f8aa0faf0907413c104e0d37538e1e618 SHA1 ec4690ca82b542ec45aaebf6d195214e4c9e270d SHA256 78e146e37bdf456fb6eaa3587d3c19aee12338c2c0818456f886a060fe8b1f93
+MISC ChangeLog 6710 RMD160 5249ee91ca266bce770cbcea99b539d367b1ed02 SHA1 d458d994eb2142a21423e0aae7b60c396a4b9fd5 SHA256 d04b138506b98534e2a81baa59fb229dafe9ea7e6d452b570fae22ff620a8f51
 MISC metadata.xml 463 RMD160 34d5c35b8b90d95c575275d7c70b9de878a0f041 SHA1 e0a4a54df29c5c50dc32f0c98388d7d24001b522 SHA256 8c386e08bcf70f91461693c7a38cb08fed8232dd0775886be0b801bf6bdb4191
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuOP/0ACgkQNQqtfCuFneM6kACgnaKpjWfxwynMLCN4RzTg0uLF
-8+MAniSOCEhXW6VviJyhYt3xQ+rS8PYr
-=lIgP
------END PGP SIGNATURE-----
diff --git a/dev-util/boost-build/boost-build-1.42.0.ebuild b/dev-util/boost-build/boost-build-1.42.0.ebuild
new file mode 100644
index 000000000000..9524734a2318
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.42.0.ebuild
@@ -0,0 +1,111 @@
+# 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 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.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"
+}
diff --git a/dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch b/dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch
new file mode 100644
index 000000000000..d3bd646a8ebb
--- /dev/null
+++ b/dev-util/boost-build/files/boost-1.42-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 ;
+                }
+