Version bump, wrt bug #475712

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 185 insertions, 5 deletions

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index 32b657781933..806280f48400 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/boost-build
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.114 2013/08/25 12:19:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.115 2013/08/27 08:46:00 pinkbyte Exp $
+
+*boost-build-1.54.0 (27 Aug 2013)
+
+  27 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> +boost-build-1.54.0.ebuild,
+  +files/boost-build-1.54.0-fix-test.patch,
+  +files/boost-build-1.54.0-support_dots_in_python-buildid.patch:
+  Version bump, wrt bug #475712
 
   25 Aug 2013; Jeroen Roovers <jer@gentoo.org> boost-build-1.52.0-r1.ebuild:
   Stable for HPPA (bug #455464).
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index dce5c015e675..02767779ad29 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -8,19 +8,27 @@ AUX boost-build-1.49.0-darwin-gentoo-toolchain.patch 647 SHA256 f729f8e7cd9046cb
 AUX boost-build-1.50.0-fix-test.patch 428 SHA256 649d36035315caad20807a6b6931155c94c04cd3a0d4ff0e4987e247798d39b6 SHA512 8ceb373209eef19a7bce932b004eb4ec3655110840f5af10198883f25657ef048cf6ab6b6e962ab4ceeb2327af117b8c8b788f23c84549324f36adf5f0dfd4cf WHIRLPOOL be8c7567c61cfeafd36df92356a59738a421b1db95a62f1694e23a9a5d803060b9bb734fe78ef12252aa98e7c47d5527d720b89f62ada9b1d8352cba98d242f7
 AUX boost-build-1.50.0-respect-c_ld-flags.patch 2014 SHA256 15db5440bee28ff3109f0a9a45a4426026b1ded36da88fa8f8a828bff961cd74 SHA512 cd9454009a09795f9b6ad7da187046e43ad624cb56ac79d53596771b69793666247bac540e580060a20694ea7c42f0bb13b266b98cee43a04397bc8931016508 WHIRLPOOL 9267db366be1dff9ead6b846c88a78312600fd2b3a0b9864fa3c7c767a3bd41a4b10b2508f44eb39bb0748163bacda4423eafe2872b2b6482bdcc269c25a1bdd
 AUX boost-build-1.52.0-darwin-no-python-framework.patch 415 SHA256 1a85311e133f3cdb3d17bfd10fe64c244c2efa23722def1334f89dad9274dace SHA512 68a43d610f5d92f5733b9fbf08348e06e190ec7e30f8d5e63ff95c3123539bc582b4d4fe960de586c0df243c5c49e36e9bccf49ca2017884aaa6a2a2b5759d56 WHIRLPOOL 82458d31670568b583f5c067c3224560d50c97f830e67138c31054371267012a29f9a1e902f885c576b2b39af4d92a387028183223d626a3e45a8cfbc9ef366d
+AUX boost-build-1.54.0-fix-test.patch 436 SHA256 244d923dda51f68f2b8535342727307a4e4e2c0b99c11c4b0806e7ca524982d5 SHA512 9a7cb66b6cd82f7e27074f4a3edad20817fcaa0d9b54d14e87311a57bb59498e9b880c37342d2afccbc8146422702f6a908dacf7a7aae0d24354b0709c2d4891 WHIRLPOOL 151a186c0ef18dca513f29114b877959e71976ed15d7aae9d81f6015db16e9efc0d6d712712d73bc79168d23ba6ee6eedb0df096e614db2b1232ff1ac110396c
+AUX boost-build-1.54.0-support_dots_in_python-buildid.patch 560 SHA256 a986984f85908e19577908376c02f258b8a224cbdf7b4b0e9d57a2bb364c5b4f SHA512 06edc9d25a2fb9cf9b9124e67a9c7d9afccf50d41bf2a65814b6b0a0e6b43a3ec1950bf2919a08908b6f5f5ff7ad13e41352c2328b9bca2ddf1e5a5cc60ff59b WHIRLPOOL ba22249002c0d1169dd463b0c8df3db81bc35f0e161eb0d8168a75c8b8c2e7b96f2658a2bba0018d6178e0dccac4045d5a2fa7a53849271002018f6a4f322081
 AUX site-config.jam 688 SHA256 795b0719536a934a1c65cfd4abf09ad4f30ad7d90ad4d55b00c858ee35e8890f SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df WHIRLPOOL be4e6a1a308dc41e522be919d765b85cb67909ed74d022ca4bf8264ec86ade1caffe8d69a630b21d4abfed1d0c1e8ef079f874046a713fcdf4f0d72f3f0b6386
 DIST boost_1_49_0.tar.bz2 48499961 SHA256 dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c SHA512 9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d WHIRLPOOL c049b4212307b0208d0b37ac870a7cfb8562d2b685ce505e1971af7bc68ae9746b06ea80ddc52599ed4cbd6dc3305b5f8051cd771387412aaa1d2f8e939a48ba
 DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
 DIST boost_1_53_0.tar.bz2 55765258 SHA256 f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 SHA512 8cd7806653cb6ea4a1c6862796ef698de5ae0bdbda96954fedbe090c59e3e6cb8f8d385df35183e9063ac4e2c2fccf10744516c47a994cde5f1d1cba1b07e522 WHIRLPOOL e8c5ed6b34dd5f68dc7e102a9e22b302616a65077d3f4af370ece6352b02a866e04294a4fc76bbd5555b6a4131f590e6455e6a74b5f12c4ffc2dd15af0bc8746
+DIST boost_1_54_0.tar.bz2 57873778 SHA256 047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d SHA512 3467a2bb9b4797cadfc52150cb036939ef35263f421870897dbe9492d1504a714805668a193b0811fdaf39a3527ee693ff70da5b942d7ab11b307e2e693e1760 WHIRLPOOL dbe3cbecaccf86ca184cf73cff75c17d6307b680bab098e38a9efd24d17776481e597017fc9f8fc8f488495f315c6d2b14b9212c51cf98529c302482bf67e92a
 EBUILD boost-build-1.49.0.ebuild 3409 SHA256 255344ee046ebdb39073ec68058629fc1c13f6b396f7e8b38b7d56f10de5cd21 SHA512 8b0cad7b8af43843d0a004494cdfb396cfafe26fd78095fcc8dabccb89cca0250868c7f1e76955fab1829869eae5741739cf848128c304c57251ba35d4dd1ac3 WHIRLPOOL df250e18c580f16decae85b73d6121a2e28042b34eebfd6b8589fdb568ce55a3a62b3c23a1ffaca83b2f1a5576128678f476449087a46216504f6c025273f3e9
 EBUILD boost-build-1.52.0-r1.ebuild 3820 SHA256 ef4879591bfcef089fce6a49584dc2b1b6bab40e803fb4c3dc1cdd47a2a618a1 SHA512 27e8a16fed51be6e1dd6a1cb0c263002ce455332a2dfbf725044630dad53f132d9a367d96a72aabaeca464ecafb6768e249d5e495f1da0a88e0808512e8ffea5 WHIRLPOOL c835946feaab5ad292135d514398dacdc44da8cc8bb54d2946de29793c4872ef0504044a8fb5736d1500db2dafa9f406971bec2fdec9e2358197e06057fe2913
 EBUILD boost-build-1.53.0.ebuild 3824 SHA256 72ed7a9a8dec4fed8ded49c44a5bf0e14eebd0cdbaeb8003db169bc08f692268 SHA512 cc43503e0d90c9c8c14a6d67ef77dc89ef533b4ea0debc7e9b13abf898b7af7db44871a32b11bc020d33b509017837bc556538f55ddeb73947b239c093979bda WHIRLPOOL 3a21d8cc56d5a42e3ec63ee29328569e21e66a6352e613dd92036780fcd3a16e3e21f7ba33fa1e8b4a2b7fbc0a38be549c331a5e47f7b0fbd89342da210b42fc
-MISC ChangeLog 16935 SHA256 2855e867afcd1ac29aa997f97eda013b72c8d96da48b7029fb65b5b7a81b22c0 SHA512 6e2998c3882f5433fb12d68137fcb5360dcbeeb0f1b90d0858485ae2e09a7731f9ecc33228f79e6ac87b2875255cddd3985975ed29dbb32b7e95205e4c0346a4 WHIRLPOOL 34e06f39709746355f1f3d066e2865d40dea0ae6af11375750bb33a05bcce07ac59b7e6ed72d82ef31ea2559938189cca720204c3b05db28e0f9c4c53932fa72
+EBUILD boost-build-1.54.0.ebuild 3823 SHA256 1129f7071e914bcb35f25f2bb361c0fc0392f11b1eebe164a210679e1e1c989a SHA512 0e74d08b93eed42fc5ef20351942a28a1a4d58bd6d263be9e261ff99458c6d55a495898454c8c994c570e85b00ae1171c2a323eab162c1a6080c2f659b51ac51 WHIRLPOOL 802ec03f90ed2475a2ed7ae77a0626b149d255dcee85770eaff68fcb46bba9ee66a5cac5b196c4c546ec0d363e9e4527ccd13daa6f5fdde9e1a3755a2a8fd28b
+MISC ChangeLog 17196 SHA256 2196d4a4be3ac30a8affba6283f8029cea023b03a631ad7d9b23fe0c98098304 SHA512 1a15c6ea56d37bbd7236938d66514255d604775a0990c59e4d9197964dc86f8da642529524f5e84928c9d51beedeaf753dcc5c0a8d879fa35c12ec3c3ac07b43 WHIRLPOOL 38c3a5c032124fd43e1c130c99720017f751def1be86e2d9bb591cf305d8d934ff132cc3cf257667ad2a9cd62c45cffbcda7690cee8f1c3311e9a14950153120
 MISC metadata.xml 158 SHA256 b52dff4a9d9f4eab0428972c9ee5a96df08f39325e4b491c39493da499fedf51 SHA512 5300260c2c2bad38b7a27b5c1d609b48b105034c63807958425e8f8fbcccc02a408bb5565480bb3ee3c87d368ed16859c48b447241adf15896e7508c6c442e65 WHIRLPOOL 17880f728fdb3dbd6ca582547c3c546ffe798d89d37ac717bc0be4e4764b60b867979c996ca89f4fdeedee021c419b964405b5fb674a220e582a436f653b8f30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIZ9joACgkQVWmRsqeSphPkOQCeNFyTeTw80c4ERFu8qwvkIEa2
-Y3YAn3HByxIiKPDMoVmM+dbPBxN2elNR
-=f0rE
+iQEcBAEBCAAGBQJSHGbmAAoJECo/aRed9267DvEH/0bJ4JC+St2LUipe+cy6O4qw
+FvcABgq1iz/agfq7Ci7XhspltWEGz/INYTpILGVzGDFf7vlHsHbR9qIVXjSLFXQL
+8OFxdMgvXwL4q//7LD+U3kS7rTZ9fqfTCy6MmWVpkFzwd3lLW2nQxSURMFtJ993B
+vnvrbHegNoUAjcd8bxJyFk10uUFXuovYqYz6Rethm0azfOGq5GB6umpO5r+nsXHN
++Qn7UUpeuQFMk1KjdNzUxcJ2KNuMaiBIUPIC3c28GR2+4k9jB4NSZM3StjZmFmja
+CqMDQ5zravAF76B2jhCPrYLKI1dSU9rcHSOPs8YHv+WNH3urKTR2Ic2Rm010YjA=
+=RzXZ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/boost-build/boost-build-1.54.0.ebuild b/dev-util/boost-build/boost-build-1.54.0.ebuild
new file mode 100644
index 000000000000..68b376c66f4f
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.54.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2013 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.54.0.ebuild,v 1.1 2013/08/27 08:46:00 pinkbyte Exp $
+
+EAPI="5"
+PYTHON_DEPEND="python? 2"
+
+inherit eutils flag-o-matic python toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators _)
+
+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=0
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+REQUIRED_USE="test? ( python )"
+
+RDEPEND="!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/diffutils )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" \
+		"${FILESDIR}/${PN}-1.54.0-fix-test.patch" \
+		"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
+
+	# Remove stripping option
+	cd "${S}/engine"
+	sed -i -e 's|-s\b||' \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# 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}"
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+}
+
+src_configure() {
+	if use python; then
+		# replace versions by user-selected one (TODO: fix this when slot-op
+		# deps are available to always match the best version available)
+		sed -i \
+			-e "s|2.7 2.6 2.5 2.4 2.3 2.2|${PYTHON_ABI}|" \
+			engine/build.jam || die "sed failed"
+	fi
+}
+
+src_compile() {
+	cd engine
+
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+	dobin engine/bin.*/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
+		build kernel options tools util
+
+	rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+	if ! use python; then
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	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 test
+
+	export TMP="${T}"
+
+	DO_DIFF="${PREFIX}/usr/bin/diff" $(PYTHON -2) test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize /usr/share/boost-build
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup /usr/share/boost-build
+}
diff --git a/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch
new file mode 100644
index 000000000000..a44afb95d14e
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch
@@ -0,0 +1,11 @@
+--- test/startup_v2.py.orig	2013-08-27 12:23:10.520185408 +0400
++++ test/startup_v2.py	2013-08-27 12:23:27.155186209 +0400
+@@ -50,7 +50,7 @@
+     return re.match(expected, actual, re.DOTALL) != None
+ 
+ 
+-t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0)
++t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0)
+ t.set_tree("startup")
+ check_for_existing_boost_build_jam(t)
+ 
diff --git a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch
new file mode 100644
index 000000000000..bddcdac9cc15
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch
@@ -0,0 +1,19 @@
+--- tools/common.jam.orig	2013-08-27 12:13:56.865158748 +0400
++++ tools/common.jam	2013-08-27 12:15:08.760162210 +0400
+@@ -763,7 +763,15 @@
+         switch $(f:G)
+         {
+             case <base> :
+-                result += $(name:B) ;
++		local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ;
++		if $(matched) = boost_python || $(matched) = boost_mpi_python
++		{
++			result += $(name) ;
++		}
++		else
++		{
++			result += $(name:B) ;
++		}
+ 
+             case <toolset> :
+                 result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :