Remove directory from rpath, initial support for dots in --python-buildid option. Patch by Arfrever

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 170 insertions, 15 deletions

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index 6467dd4f338f..b1b2f8bd78e1 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,16 @@
 # 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.80 2012/01/08 10:43:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.81 2012/01/19 22:40:07 hwoarang Exp $
+
+*boost-build-1.48.0-r1 (19 Jan 2012)
+
+  19 Jan 2012; Markos Chandras <hwoarang@gentoo.org>
+  +boost-build-1.48.0-r1.ebuild,
+  +files/boost-build-1.48.0-disable_python_rpath.patch,
+  +files/boost-build-1.48.0-support_dots_in_python-buildid.patch:
+  Remove directory used for searching of libpythonX.Y.so from rpath of all
+  libraries, which would occur in some situations. Initial support for dots in
+  argument of --python-buildid option. Patch by Arfrever
 
 *boost-build-1.48.0 (08 Jan 2012)
 
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index bf90c23ab2d0..4fde90a5a2d9 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -5,6 +5,8 @@ AUX 1.35.0-fix_broken_icu_build.patch 1752 RMD160 0e7ee05c17d76e29abff915e841813
 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
 AUX boost-build-1.42-env-whitespace.patch 683 RMD160 a96ff55a09a889c5fba0c898cc7d4c2a6d2ef1a5 SHA1 9fd231fc699813df1d3ba78ae95f5f322166ade7 SHA256 52714f45a54cad8c126d5fca8bd5eacc4d746b29df24aaa9d2c55e3694a6f4aa
+AUX boost-build-1.48.0-disable_python_rpath.patch 337 RMD160 33acc4edab1d6cb4f50f88f0c6f68c69bfbe34d9 SHA1 8fd5e5b014d153534eec89da1c2908e1706d984f SHA256 979727bd1aabf6df05d8b06e3ac525bb6d44c2b18c3e4e1331528c4633b7e9df
+AUX boost-build-1.48.0-support_dots_in_python-buildid.patch 627 RMD160 9658ae404de38f225e892024bbf0224ed7de9eee SHA1 6be6221afbc54fac2a4371f0e19fa8acd14e4f71 SHA256 e544b0c81a09ad3e56800bef4e7a3e78b5b27ee7377e7f4fc66d1aecd955ae0a
 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_37_0.tar.bz2 29435646 RMD160 3c4cf7eb97a8fb126e564ba529ed9edec8765185 SHA1 c0d0cf9ad8d954507824aed51a3e93e6a9da1d99 SHA256 d52ef49f70b1b9addc4e0d1a3a2a1966227f0d173c3301bac3e6d399eeac5472
@@ -27,23 +29,24 @@ EBUILD boost-build-1.42.0.ebuild 3248 RMD160 8ec1c03eb28bf4b550aec7e6a013a1facb3
 EBUILD boost-build-1.45.0.ebuild 3309 RMD160 70f308ca0f6322d6cdd2f95746be7ce0abc610f9 SHA1 511990fc07e64b1941227747c43feedf68d53712 SHA256 889fc96586966fd52db2bfa1cfcf296dda766bf0fc996f0a643f69da07874c06
 EBUILD boost-build-1.46.1.ebuild 3307 RMD160 33e17b065a02770234ef521f74ff7e4bd02414b7 SHA1 0846856a149658610c2cbfccd4ea3887bdd750ce SHA256 86ada1e18fbf568d0479374f53fc0dd2d257066dc85651154a515b402aa38a49
 EBUILD boost-build-1.47.0.ebuild 3455 RMD160 bbcd8be5e3f5494ce19351fd49aac44f14b9b005 SHA1 6b7dc37a2ee68c5c68c26aed4d1fc4b4fb91c998 SHA256 201bcd7ba558e4e24a437eb83c881b0ca802706b7bb2699bc083b87d2b02ec49
+EBUILD boost-build-1.48.0-r1.ebuild 3430 RMD160 900546b9ee7641d4f5c791b7467f8a2dae92788b SHA1 6aafdbcdf4cc7dd73855d34d283fea81cdd052c8 SHA256 324663a6c08652d6cb5f9d936d83e8a58adb6f74a153477ca5c1044bf151cb1e
 EBUILD boost-build-1.48.0.ebuild 3455 RMD160 f02c976c3f239e178ebb131775641d125ce5f70e SHA1 7ab3f6677b7ce15c2cd32b63418c05daafadd85d SHA256 6fc579787369c9373fef9767d89dfd187ddcc0d3bda95757ed7d10e19b8a78c6
-MISC ChangeLog 10694 RMD160 0441e29c05f44f1728d5a2518ecf657cb47e9268 SHA1 bd16ea119aa808fc89039b86a06ac716b4357c5d SHA256 448bc0e4090b940fd591f4736fd334dc79a104b2dc16d08ecc4428c961d97772
+MISC ChangeLog 11152 RMD160 eba598d9318a3628fd33c837db543f420696fc74 SHA1 9bf4d6747c629208ed6eb8955d6b8fd4b981621e SHA256 4fed00fb5863b865de0d8128f47c577ad0a0bfcb83141a6d597b636fb0ec31ca
 MISC metadata.xml 467 RMD160 46a5b92ef812d514cce62b4a7d6644597c137bf9 SHA1 c47d4a412061b3fe75a2ac875542bc6f1ea4d269 SHA256 45d1630f3fe0286a9ea6cb8cb04ec73ae7f4b7fd52f413e423fce4c436c23f6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPCYEPAAoJEPqDWhW0r/LClbYP/1Zv39wUr4D87fYbSkQDMnMM
-xVXN45+LeaqGpDAVYcAPp92ke/QSkhCp67wfV9aO1Lo2ru/bBD7/oEiRwCoKwrjS
-l9q6DueV9UoT1gXhH5mnFKgi6+VjGS5AFYgDCSqcNCqbwM3oTdGo6EFjuunrvJXE
-7HeAANUqjEX9CkuqYX09TqJ3cdafL3bLpKqlujyLZWIUIKyBgndulkV4jYoDygWo
-kcT1CA1Ltx30WXKy9kRcC2VJoQv3ViyVxthqEIml2A1JUk/de6jQxJIx+EwFETZb
-DFKkkvY/meyX7l2+DU+k8umkTzG/TyH7zjE83UJBqPIog9uJ+KgeZ3iRmyoGRS0/
-VP+m2HbrF1frno+3/xIuFz4Ik7J4H/eBz7VXu8w0Lt9yDmVmdzt55fXwhOV19NvZ
-jTji5MPaKjrkEivagsUAyhPRaHaxwFwskPkRU7/Z8yrvly15ZmAgXVj8lfH4GnJq
-rQj1IuRRbR17YIARSrKEvTnSXwseGFKeECyPg/5qREol8uXYV9SemtH5vKcsaCw3
-TER8U0PaGjWqnHSDNFNxGLkMCYtVi+De7LTnT4UI3FCT7V3kpvWFxOHRDFEDsGjQ
-NscT6iW/MOPBhPr8woK55qIS0z/JkwgQpE/OVmz5/UYOb4drhkSqCgJhKaX0gj1q
-ReFy1mAKriFsUBTWwuU4
-=y9CP
+iQIcBAEBCgAGBQJPGJvLAAoJEPqDWhW0r/LC+xQP/2N6G5rLfl1lCo05hbkLIOlJ
+TPxXcZUnvoLfiDil3PtTZCajRLe1gPOpSNxbP/LTZQ8nzhqwaJL58NcujbLK+xex
+F/cV4Z3xJLrfxUv96FE2wYzKDY6dGdfjUgYjHfexhPqxigj8s6DSudfBEkbaJAF2
+IPOxRy1F/NqnqTtn8UmAraMoQZL0YtZGLu9yprUePrPB0kD5WI6cIdjG3FH6CJHV
+uf8RVvG8tVEfszbeSP1CDxyaCOzSLBlF3UslaH0q6O+x9VgOYzLhQBtJiDB70lIJ
+AMkTAP2903nY3QXVWADoOV4Xpr/QpKFkjvLNYNLthD196xBQRu8bxrQqRXVbvnyM
+qEF8I9g89ZE577XJhJlkObqOPprl4swUua5tmCi16qeUYDr6eUKIym1JIfoyce0n
+d6mbbBEXY8gYAuYpl7AC6OMTek34aXVJOMKE7G3JuDxKGtDttccCxFcfgg1JMxyk
+gyFs+jFlJc3gMQwswbPtYQ+xDS+5/L1Y/xB55RxBQia3uByQzGU4iXLqR6abLm25
+nLGPQfK8Od12tWS1YfK9vAoPPop+xnIDknYiUpOJ1qBV98JjkdIkMtNkb5QxRgk7
+tOdEtbTB8AVfbr/7pPCCZKi0wKFh+zcIbR2X1XLt8crNfVEMNlsP4DkxBM7wm+hV
+syWyQAIsffpRBNpKinnk
+=C/cn
 -----END PGP SIGNATURE-----
diff --git a/dev-util/boost-build/boost-build-1.48.0-r1.ebuild b/dev-util/boost-build/boost-build-1.48.0-r1.ebuild
new file mode 100644
index 000000000000..8815aa3ad295
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.48.0-r1.ebuild
@@ -0,0 +1,112 @@
+# 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.48.0-r1.ebuild,v 1.1 2012/01/19 22:40:07 hwoarang Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? *"
+
+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 ~x86-fbsd"
+IUSE="examples python"
+
+DEPEND="!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-support_dots_in_python-buildid.patch"
+	epatch "${FILESDIR}/${P}-disable_python_rpath.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_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
+
+	# 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
+		LDFLAGS=$(echo ${LDFLAGS}) # 293652
+		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
+			$(use_with python) || die "building bjam failed"
+	fi
+}
+
+src_install() {
+	newbin engine/bin.*/bjam bjam-${MAJOR_PV}
+	newbin engine/bin.*/b2 b2-${MAJOR_PV}
+
+	cd "${S}"
+	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 test/engine
+
+	# FIXME: Replace the ls call with the proper way of doing this.
+
+	BJAM_BIN=$(ls ../../engine/bin.*/b2)
+	${BJAM_BIN} -f test.jam "-sBJAM=${BJAM_BIN}" || die "tests failed"
+}
diff --git a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch b/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch
new file mode 100644
index 000000000000..8b88b43f3d2f
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch
@@ -0,0 +1,11 @@
+--- tools/python.jam
++++ tools/python.jam
+@@ -961,7 +961,7 @@
+             # linux).
+           : $(usage-requirements)
+             <testing.launcher>$(set-PYTHONPATH)
+-              <library-path>$(libraries) <dll-path>$(dll-path) <library>python.lib
++              <library-path>$(libraries) <library>python.lib
+           ;
+     }
+ 
diff --git a/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch
new file mode 100644
index 000000000000..b3bee03b56f3
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch
@@ -0,0 +1,19 @@
+--- tools/common.jam
++++ tools/common.jam
+@@ -759,7 +759,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) :