Finish Prefix support, add Patches for Darwin and Solaris, add Prefix keywords

(Portage version: 2.2.01.21418-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)

5 files changed, 67 insertions, 6 deletions

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index 6e2b2f09a043..9e3bff50e099 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.110 2012/12/06 22:32:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.111 2012/12/08 12:11:22 grobian Exp $
+
+  08 Dec 2012; Fabian Groffen <grobian@gentoo.org>
+  +files/boost-build-1.49.0-darwin-gentoo-toolchain.patch,
+  +files/boost-build-1.52.0-darwin-no-python-framework.patch,
+  boost-build-1.52.0-r1.ebuild,
+  files/boost-build-1.50.0-respect-c_ld-flags.patch:
+  Finish Prefix support, add Patches for Darwin and Solaris, add Prefix keywords
 
   06 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org>
   boost-build-1.52.0-r1.ebuild:
diff --git a/dev-util/boost-build/boost-build-1.52.0-r1.ebuild b/dev-util/boost-build/boost-build-1.52.0-r1.ebuild
index d4c898e99921..2738e445ab85 100644
--- a/dev-util/boost-build/boost-build-1.52.0-r1.ebuild
+++ b/dev-util/boost-build/boost-build-1.52.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.52.0-r1.ebuild,v 1.2 2012/12/06 22:32:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.52.0-r1.ebuild,v 1.3 2012/12/08 12:11:22 grobian Exp $
 
 EAPI="5"
 PYTHON_DEPEND="python? 2"
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-fbsd ~x86-linux"
+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 )"
@@ -43,7 +43,9 @@ src_prepare() {
 		"${FILESDIR}/${PN}-1.48.0-support_dots_in_python-buildid.patch" \
 		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
 		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
-		"${FILESDIR}/${PN}-1.50.0-fix-test.patch"
+		"${FILESDIR}/${PN}-1.50.0-fix-test.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
 
 	# Remove stripping option
 	cd "${S}/engine"
@@ -97,9 +99,9 @@ src_install() {
 		boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
 		build kernel options tools util
 
-	rm "${D}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+	rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
 	if ! use python; then
-		find "${D}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
 	fi
 
 	dodoc changes.txt hacking.txt release_procedure.txt \
diff --git a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch b/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch
new file mode 100644
index 000000000000..f5d6188f1954
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch
@@ -0,0 +1,26 @@
+Avoid adding all kinds of things to the toolchain's flags that within
+Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target,
+arch, etc.
+
+--- tools/darwin.jam
++++ tools/darwin.jam
+@@ -227,6 +227,9 @@
+         }
+     }
+     
++    # leave compiler flags etc. up to the toolchain
++    return $(version-feature) ;
++
+     if $(version-feature)
+     {
+         if $(.debug-configuration)
+@@ -387,7 +390,8 @@
+             support-ppc64 = ;
+         }
+     }
+-    switch $(arch)
++    # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either
++    switch $(donotaddarchpleaseXXXarch)
+     {
+         case combined : 
+         {
diff --git a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch b/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch
index 6c60777f71ba..f0a1561d718f 100644
--- a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch
+++ b/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch
@@ -1,5 +1,14 @@
 --- engine/build.jam.orig	2012-08-19 09:47:23.916383518 +0200
 +++ engine/build.jam	2012-08-19 09:53:38.011554690 +0200
+@@ -3,7 +3,7 @@
+ #~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+ 
+ # Clean env vars of any "extra" empty values.
+-for local v in ARGV CC CFLAGS LIBS
++for local v in ARGV CC CFLAGS LDFLAGS LIBS
+ {
+ 	local values ;
+ 	for local x in $($(v))
 @@ -179,10 +179,10 @@
  if ! $(CC) { CC = cc ; }
  toolset cc $(CC) : "-o " : -D
diff --git a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch b/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch
new file mode 100644
index 000000000000..08b40f31455a
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch
@@ -0,0 +1,17 @@
+Don't look for the framework path, we build Python the UNIX way for
+Gentoo Prefix
+
+--- engine/build.jam
++++ engine/build.jam
+@@ -82,11 +82,6 @@
+         }
+         --python-lib = $(--python-lib[1]) ;
+     }
+-    else if $(OS) = MACOSX
+-    {
+-        --python-include = [ .path $(python-location) Headers ] ;
+-        --python-lib = $(python-location) Python ;
+-    }
+     else
+     {
+         --python-include = ;