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}.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 160 insertions, 1 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/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 ;
+