Install site-config.jam with our variants (gentoorelease & -debug) to ease usage. Remove unneeded code. Fix python-code removal. Simplify call to python_mod_{cleanup,optimize}.

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

4 files changed, 166 insertions, 5 deletions

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index 3c389a198360..eeaad9877cfd 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/boost-build
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.97 2012/08/19 18:22:31 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.98 2012/08/20 21:52:36 dev-zero Exp $
+
+*boost-build-1.50.0-r2 (20 Aug 2012)
+
+  20 Aug 2012; Tiziano Müller <dev-zero@gentoo.org>
+  +boost-build-1.50.0-r2.ebuild, +files/site-config.jam:
+  Install site-config.jam with our variants (gentoorelease & -debug) to ease
+  usage. Remove unneeded code. Fix python-code removal. Simplify call to
+  python_mod_{cleanup,optimize}.
 
 *boost-build-1.50.0-r1 (19 Aug 2012)
 
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index fe31040dbc10..7825c8d07b55 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -9,6 +9,7 @@ AUX boost-build-1.48.0-disable_python_rpath.patch 337 SHA256 979727bd1aabf6df05d
 AUX boost-build-1.48.0-support_dots_in_python-buildid.patch 627 SHA256 e544b0c81a09ad3e56800bef4e7a3e78b5b27ee7377e7f4fc66d1aecd955ae0a SHA512 3f7be047fab021890870797b349122a6e71f51f4187ce430e9f325c7c25981bf5378fe41c32e8f3be87fec8e91ba9640cc87ccf75fd27cf9aa505e1a607afd71 WHIRLPOOL b7dab03a0d89e0131009dccfcf9945acfa35b222c07a7db4f880aef80140c9ff13d18f570763502a1e8bdc066b13b7320b82c3d9e8cfd0848c1b0aff7b168a43
 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 1740 SHA256 2a1e98ffc557249ad04f58587bcb3b08f8c38bcfdb2c9989035ec74e85c8c0db SHA512 d54eb57cb7d4ed57abd6425416c250313b9e377394d63497b0a59522e427c1eccb1255d955f69f7624a22dd97f9039b9d977791bc35abd005296c3fc31931360 WHIRLPOOL 87f28c7f22e2ad4f5dda48d8c7de1305a3e6787d26fb29fd3ae8c02f29dd6087f2037f6c6305b5229b5f15e5e4e9cf2db7b4665e519fb8808cdcfc902063cc61
+AUX site-config.jam 688 SHA256 795b0719536a934a1c65cfd4abf09ad4f30ad7d90ad4d55b00c858ee35e8890f SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df WHIRLPOOL be4e6a1a308dc41e522be919d765b85cb67909ed74d022ca4bf8264ec86ade1caffe8d69a630b21d4abfed1d0c1e8ef079f874046a713fcdf4f0d72f3f0b6386
 DIST boost_1_34_1.tar.bz2 12986931 SHA256 0f866c75b025a4f1340117a106595cc0675f48ba1e5a9b5c221ec7f19e96ec4c SHA512 d45df9ad61b4160b7e7bb4fceefd7a6d9f205642ecf77ee700d4644010d569a6f4545dc873a2916affb758776247ab842cce0daa2f53515d9090cfb2c9659ff7 WHIRLPOOL b6f3a5a8365ea732e4fb8a4b292712fb2c80dc108862d8c44f6e7195862fff6a77e7615b777c04c7bb6cde5aa630360857d765d0661a8c17a3386cc2b26920bd
 DIST boost_1_35_0.tar.bz2 23416747 SHA256 f8bf7368a22ccf2e2cf77048ab2129744be4c03f8488c76ad31c0aa229b280da SHA512 90ed283492550cae1b2ac1d0e6f0580a8a95c5dc039e8733e68ca9507b78ef5e2fddefd4b21773908fb088be923750a88b487396705c968e461dbda4e8c51de5 WHIRLPOOL 848886d74b9560a375976cc64fad920f6c531fe710bacefb24bc84575144201bfab7322bb9a44d8700cb09e0e5a80052bb2c6b9e03145ea32f161f6ff635f006
 DIST boost_1_37_0.tar.bz2 29435646 SHA256 d52ef49f70b1b9addc4e0d1a3a2a1966227f0d173c3301bac3e6d399eeac5472 SHA512 20d3394fea7025b359208712fad1454390c6cc6e29000de9f3ddd9fbf88684ffb917495bb034bf582df112040a02dabc1e019a8c7381a4c7839b3435d2ea1395 WHIRLPOOL 0d1b9af4ab3271980d8213d60bfcd1342da6136f3e37c168ec17c97b34da6400df9afda4ab3ac458feac24fa7acb914b8528b73e6aebcf656f4b305df9463571
@@ -36,13 +37,14 @@ EBUILD boost-build-1.47.0.ebuild 3455 SHA256 201bcd7ba558e4e24a437eb83c881b0ca80
 EBUILD boost-build-1.48.0-r1.ebuild 3435 SHA256 91582e119ca3574374f9c745c318713594a8f2cfc4c0b534bb487e004963531b SHA512 20a0b0403b4f93ab7f86f0b2f626be4997f51ff0961f9266c18a2c1af0750161bb15915bb6b50ebfe7766fc6fe62446d4e3b0c3dc515cb2a886e6f29eb8ca3f6 WHIRLPOOL 915a502e977807ef3efb411ce49a90fe47ad4f73f7cba0a930ecd85d2829f43fd70b25c29ed07ba80efb345e79a8a721d9b0252bc8d429608de8867c4e619174
 EBUILD boost-build-1.49.0.ebuild 3448 SHA256 6ff13e7909bd95af00eced88317356eca3135a4f35c4c290ff938ee772030a3e SHA512 6c20c10fca38f7da34d1ef3efb64c8ffcaae065beaaafb8b39c0f20045a72d9809e376d1a47e8dace7981b31f2eca78255f1debc3ae3a9ff3a80c1af5692d0da WHIRLPOOL e64342b81601f8898e85bc32d3dbc17ac87d47ce6a2ab42196518ea401320376232779077e4c9413d7f603203c6beb7d7aae1258e12276e4a37a7fadaa4de230
 EBUILD boost-build-1.50.0-r1.ebuild 4209 SHA256 56572a184547aff18eb00c06d56c56884a0334bf9ceab2afc5bb08741caa8207 SHA512 9588058fdd2112314b89896ca9f9de2f038db93392f7d3741ae7e6f30a1bca16f5db63ee4bcf976a2aaae71c1bf2214c33031a359c4ad46774ea6dd477e2a356 WHIRLPOOL afd6709885fd72c3d20223b2ea8b944b1d3c1f355cbc9d206e25cb3624811ddf929fddeeb6e2a3251802d83d4f0b9cc2e2c2aec762b92876ecaf5ed29404dfa2
+EBUILD boost-build-1.50.0-r2.ebuild 3884 SHA256 c0b199055c6223c7fd2b61ad989b92d9c3e2714e9b6160594006f336741cc923 SHA512 172d6a699d4d63a822b78deb2ea06c3de8b8a8d1d9929c41c661694251f5fbfb9a6a146a629b8431f9bf44bc4d9ee9e6400b3a140a374167b1ce413b3f58c94a WHIRLPOOL 18b1a0083597818241c91919fa53f815b8c2d99f5c626d3304ff8d5c03b5ea6e80651304f2c25eac0e41f919dde8b2149d8095abeecad0ac61b11fb35c95e8ac
 EBUILD boost-build-1.50.0.ebuild 3454 SHA256 2df90a34e3f76ccafddeb63682c0d19295c6a4ab458bc0ae5dd28baf62ab471d SHA512 3099c5c11a147db7e3cb9da8fcd7d154e5dd72457c0cccb1040e947ed6a42baa9830dc93d42aa2560549a215de7a8c95611b54f9ca6f4582f6e1528373faad0d WHIRLPOOL 09840e898b04b8c6f18f6960ebdca285b6df68c7a67ca93260e18282ff99c23403002b6fc06c4d7853c910fc5b1c7b1797ef3256757e0465c51164e9083f68bd
-MISC ChangeLog 13402 SHA256 38b0d34b925ee5743b36137b856aa93af4b68ba95ae95fc04b43bd56224078e4 SHA512 ea7df77d9ae2f7ac4800df2557aa76939140bdf5235113685499ff974201f7bdb85339f57faa16afb757896b3a0dd063a9e8941ba26c89c2e580671066b15a06 WHIRLPOOL ebe8f1a8c07d51f995a4d564cda82359f4383c3970fc3882d4410b9245ceea9fec2b9c9bcc55898843ba2a2bc91c143c71d3f05886e092f1bcfca2f9e7949896
+MISC ChangeLog 13734 SHA256 41421992a2bdf2f0694e7ba8edc53d0e09533c0985fdf1bfcb1093313c04008d SHA512 348c9ab88b0c1218ac7879ea9455e44d2e36c9beb989690db72a1564008717cabfaf935a5b34e1891ce0518b409c64e9e64a379dde674c1c6a69fb5f9f1a5753 WHIRLPOOL cf004e37a3f887a1e8e04102b11f762baf3a2698f304f4d4054b1af516154087e4e2964d775a1d4d2e74cc6cf9ad233f0f5a5460efb0d2b21e806455a46b81c2
 MISC metadata.xml 593 SHA256 baf2b55eeb97d733abc5d6d9f9e7a1c6ed777edcf690b506987f93919080ff3a SHA512 30252ea95d008b232401fd8d73d3ddee78dd5d930880b8902f5b8e296ebacb2c842cbb49a1a5ef242081e50d252774b77494db5e4f9eefb2cdfdf26823d0ce97 WHIRLPOOL 7427db931db5d10b4a083a8a1eef9e9d6ff4e6605b3e799669907ded8b7e6d253cefb1a216798cc8aae9d40de1225d8dcce72048f7d5ec4c270480b2fd863c28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAxL/cACgkQGwVqY66cHjD6eACff8kh3b18SQe14XLM97WGPhHr
-xbkAn3ttpo0e/XVTlAoABL/jG2T+9hY/
-=FZ/f
+iEYEAREIAAYFAlAysaoACgkQGwVqY66cHjB2OACfaoCufd9OS5PrNtvPsVLcZaXo
+Ex8An0zOpt1MbLowH/vb59FH4M3VajVZ
+=drUJ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/boost-build/boost-build-1.50.0-r2.ebuild b/dev-util/boost-build/boost-build-1.50.0-r2.ebuild
new file mode 100644
index 000000000000..3f768a5d3091
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.50.0-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 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.50.0-r2.ebuild,v 1.1 2012/08/20 21:52:36 dev-zero Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+inherit eutils flag-o-matic python 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 ~amd64-fbsd ~x86-fbsd"
+IUSE="examples python test"
+
+RDEPEND="!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( =dev-lang/python-2*
+		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-support_dots_in_python-buildid.patch" \
+		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+		"${FILESDIR}/${P}-respect-c_ld-flags.patch" \
+		"${FILESDIR}/${P}-fix-test.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() {
+	# For slotting
+	sed -i \
+		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
+		engine/Jambase || die "sed failed"
+
+	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 /usr) || die "building bjam failed"
+}
+
+src_install() {
+	newbin engine/bin.*/bjam bjam-${MAJOR_PV}
+	newbin engine/bin.*/b2 b2-${MAJOR_PV}
+
+	insinto /usr/share/boost-build-${MAJOR_PV}
+	doins -r \
+		boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
+		build kernel options tools util \
+		"${FILESDIR}/site-config.jam" 
+
+	rm "${D}/usr/share/boost-build-${MAJOR_PV}/build/project.ann.py" || die "removing faulty python file failed"
+	if use python ; then
+		find "${D}/usr/share/boost-build-${MAJOR_PV}" -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-${MAJOR_PV}
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup /usr/share/boost-build-${MAJOR_PV}
+}
diff --git a/dev-util/boost-build/files/site-config.jam b/dev-util/boost-build/files/site-config.jam
new file mode 100644
index 000000000000..6afe52684ccc
--- /dev/null
+++ b/dev-util/boost-build/files/site-config.jam
@@ -0,0 +1,11 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
+# Define two new variants to be used when building boost (or separate boost-libs)
+# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols
+# values "none" which are not part of the official boost distribution.
+# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS!
+variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ;
+variant gentoodebug   : debug   : <optimization>none <debug-symbols>on   <runtime-link>shared ;
+