diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.45 2009/12/02 15:26:48 djc Exp $
 
+  06 Dec 2009; Nathan Phillip Brink (ohnobinki)
+  <ohnobinki@ohnopublishing.net> boost-build-1.39.0.ebuild,
+  boost-build-1.40.0.ebuild, boost-build-1.41.0.ebuild,
+  +files/boost-build-flags-unescape.patch:
+  Patch to allow compilation when *FLAGS contain whitespace.
+
   02 Dec 2009; Dirkjan Ochtman <djc@gentoo.org> metadata.xml:
   Add maintainer-by-proxy.
 
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,5 +1,6 @@
 AUX 1.35.0-fix_broken_icu_build.patch 1752 RMD160 0e7ee05c17d76e29abff915e84181361e4095b89 SHA1 273de1fa957091bf3c0d041f54aec9797810f3cf SHA256 71d858236c47b835947d996d3caf0a1de96ace267140d52dd09594db3a96729d
 AUX boost-1.41-fix-mpich2-detection.patch 1378 RMD160 fd81c6a03dd8bf2d6afdaf3fa4957ee0ff1f6e10 SHA1 bbe5ba6fb554ab89e5fa4649f8a44ad7cd1dfa80 SHA256 8e1adadb1345ff045930bbd1c6d9d6e4b06462de2939021bf9e3a3fe1c9d6100
+AUX boost-build-flags-unescape.patch 1623 RMD160 e5c1f47feeaec54279ce2adc261a842aaf05d47f SHA1 fac327ee9a4d0ad39069be0f933d976704d67700 SHA256 712325f51559ace61f78f3094a6b105ca08edd62fd5ced3de59b34432a54beca
 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_36_0.tar.bz2 28839275 RMD160 0ac38ee3c355c22fd5534bc806bf516890e5182d SHA1 b8f0f5d90b260aff995ef38fad4eee5e73d00810 SHA256 9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
@@ -12,8 +13,8 @@ EBUILD boost-build-1.35.0-r1.ebuild 2739
 EBUILD boost-build-1.35.0-r2.ebuild 3098 RMD160 8631871399c9d458d0a8ec1022b5c527b88bfdd9 SHA1 e9cab38a2cb6fe488e8be8bca5cb4441bc5601e6 SHA256 f73affff86e7c8419d00c783865d3e142357fa0f746816de0ba1dec8bea2c3cd
 EBUILD boost-build-1.36.0.ebuild 3074 RMD160 8d1842fef67b1d548e17c83f71b5e87dc816d203 SHA1 c0559c90f553041e8385918ae9e3bf882ddade6f SHA256 a5905e5e8b3bae14348d1dae2aff3ad9fe806c2803a4eb8767fbffa12ad4b8d9
 EBUILD boost-build-1.37.0.ebuild 3074 RMD160 b820f5d6fb4900415d4b2b9a0d0210259ca4ce43 SHA1 549cc53a910e3a136f4b89cbe160ef2a22b5d12c SHA256 897dada82140ab90f2e070e47eda9218212a6a42bec647f6dd79804dfeeeb1af
-EBUILD boost-build-1.39.0.ebuild 3088 RMD160 1c975b1dfc2c74d2a8fb062b3ea7acd38cc0c47e SHA1 31241c77120276c0b1165f406969956f5f92ed1d SHA256 ddb92e4024ad643380e69b8955faffa2a7717eaf3ca708c7b3525bd7dfd6c9ce
-EBUILD boost-build-1.40.0.ebuild 3088 RMD160 0d56aa2c43dacf5b651fe8c5c9200e7e333752e4 SHA1 136e05dbc06ec5577c9351203597724b53fe523d SHA256 27238ea11d03915c5cfe118cbcd14cae5081ebea2e2cede4d8c344e8dffc8ff0
-EBUILD boost-build-1.41.0.ebuild 3280 RMD160 c1c851b85150f9d308069ff934062c54f4586cc4 SHA1 4b00d041fffed5b3a739e1f018a3ebfb871a13e3 SHA256 645b0d4a02575b6bdd219d17e4f8b6b3318edb766ca0e743854859889d16e08d
-MISC ChangeLog 6162 RMD160 7ec63c039e66c22c4314fa2e79c59c33e822aba8 SHA1 0f6297b323fc5d970f2a790a08f3f3fdbfdb711f SHA256 6882edef976f25789575f09d65e4010dfe92a559063b8961e0d27ae275a81b7d
+EBUILD boost-build-1.39.0.ebuild 3172 RMD160 d807bacc9ad6364b6ae11b12b6a64dc435e98c39 SHA1 80b478e2767ad6b074fc3ea2ca8771dc1ead484f SHA256 b4c8f9ad079da23b5f51e24fc58c7347bbe15e3c53efe66006cb56e5b979ee45
+EBUILD boost-build-1.40.0.ebuild 3172 RMD160 5ca38906f201d660e0d7a334ef7f7396d9b1c30a SHA1 9bbe04e0941b87d3e0a8ff3f03ae48f50fde00f6 SHA256 09e35bf207d7c71c72871470e66ed88d211cab24014c9134e33719714b8ea474
+EBUILD boost-build-1.41.0.ebuild 3364 RMD160 761eeb62783e8c6a6d68ae9fed4b665a3f1e847b SHA1 92c403e53a841b649fb24ef0e9e9d7e481a4cb1d SHA256 52b62b4467b8a02600ebcdec48217f4d1bcfeabb7dbc16216e81bb213bebb0fd
+MISC ChangeLog 6431 RMD160 567e85b648991059e58999f3aa74cfc02cd355f8 SHA1 49b9e582dd0b313a458163f540346e1767442aa5 SHA256 d31cb735c446342bd60245f97ed9637f0e9f3cf6e280de9f00aecf4c03120b33
 MISC metadata.xml 463 RMD160 34d5c35b8b90d95c575275d7c70b9de878a0f041 SHA1 e0a4a54df29c5c50dc32f0c98388d7d24001b522 SHA256 8c386e08bcf70f91461693c7a38cb08fed8232dd0775886be0b801bf6bdb4191
diff --git a/dev-util/boost-build/boost-build-1.39.0.ebuild b/dev-util/boost-build/boost-build-1.39.0.ebuild
--- a/dev-util/boost-build/boost-build-1.39.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.39.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit flag-o-matic toolchain-funcs versionator
+inherit eutils flag-o-matic toolchain-funcs versionator
 
 MY_PV=$(replace_all_version_separators _)
 MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
@@ -29,6 +29,9 @@ src_unpack() {
 }
 
 src_prepare() {
+	# bug 293652
+	epatch "${FILESDIR}"/boost-build-flags-unescape.patch || die
+
 	# Remove stripping option
 	cd "${S}/jam/src"
 	sed -i -e 's|-s\b||' \
diff --git a/dev-util/boost-build/boost-build-1.40.0.ebuild b/dev-util/boost-build/boost-build-1.40.0.ebuild
--- a/dev-util/boost-build/boost-build-1.40.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.40.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit flag-o-matic toolchain-funcs versionator
+inherit eutils flag-o-matic toolchain-funcs versionator
 
 MY_PV=$(replace_all_version_separators _)
 MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
@@ -29,6 +29,9 @@ src_unpack() {
 }
 
 src_prepare() {
+	# bug 293652
+	epatch "${FILESDIR}"/boost-build-flags-unescape.patch || die
+
 	# Remove stripping option
 	cd "${S}/jam/src"
 	sed -i -e 's|-s\b||' \
diff --git a/dev-util/boost-build/boost-build-1.41.0.ebuild b/dev-util/boost-build/boost-build-1.41.0.ebuild
--- a/dev-util/boost-build/boost-build-1.41.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.41.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit flag-o-matic toolchain-funcs versionator
+inherit eutils flag-o-matic toolchain-funcs versionator
 
 MY_PV=$(replace_all_version_separators _)
 MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
@@ -34,6 +34,9 @@ src_unpack() {
 }
 
 src_prepare() {
+	# bug 293652
+	epatch "${FILESDIR}"/boost-build-flags-unescape.patch || die
+
 	epatch "${FILESDIR}/boost-1.41-fix-mpich2-detection.patch"
 
 	# Remove stripping option
diff --git a/dev-util/boost-build/files/boost-build-flags-unescape.patch b/dev-util/boost-build/files/boost-build-flags-unescape.patch
new file mode 100644
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-flags-unescape.patch
@@ -0,0 +1,26 @@
+gentoo bug 293652 : https://bugs.gentoo.org/293652
+boost bug 3630    : https://svn.boost.org/trac/boost/ticket/3630
+by ohnobinki
+--- tools/jam/src/build.jam~	2009-12-06 01:13:01.000000000 -0500
++++ tools/jam/src/build.jam	2009-12-06 01:14:00.000000000 -0500
+@@ -629,16 +629,16 @@
+     return $(exe) ;
+ }
+ if ! $(--def[2]) { actions [COMPILE] {
+-    "$(--cc)" "$(--bin)$(<:D=)" "$(--dir)$(<:D)$(./)" $(--out)$(<) "$(--def)$(--defs)" "$(--flags)" "$(--libs)" "$(>)"
++    "$(--cc)" "$(--bin)$(<:D=)" "$(--dir)$(<:D)$(./)" $(--out)$(<) "$(--def)$(--defs)" $(--flags) $(--libs) "$(>)"
+ } }
+ else { actions [COMPILE] {
+-    "$(--cc)" "$(--bin)$(<:D=)" "$(--dir)$(<:D)$(./)" $(--out)$(<) "$(--def[1])$(--defs:J=$(--def[2]))$(--def[3])" "$(--flags)" "$(--libs)" "$(>)"
++    "$(--cc)" "$(--bin)$(<:D=)" "$(--dir)$(<:D)$(./)" $(--out)$(<) "$(--def[1])$(--defs:J=$(--def[2]))$(--def[3])" $(--flags) $(--libs) "$(>)"
+ } }
+ if $(VMS) { actions [COMPILE.LINK] {
+-    "$(--link)" $(--link-bin)$(<:D=) $(--link-dir)$(<:D)$(./) $(--link-out)$(<) $(--link-def)$(--link-defs) $(--link-flags) "$(--link-libs)" $(>J=", ")
++    "$(--link)" $(--link-bin)$(<:D=) $(--link-dir)$(<:D)$(./) $(--link-out)$(<) $(--link-def)$(--link-defs) $(--link-flags) $(--link-libs) $(>J=", ")
+ } }
+ else { actions [COMPILE.LINK] {
+-    "$(--link)" "$(--link-bin)$(<:D=)" "$(--link-dir)$(<:D)$(./)" "$(--link-out)$(<)" "$(--link-def)$(--link-defs)" "$(--link-flags)" "$(--link-libs)" "$(>)"
++    "$(--link)" "$(--link-bin)$(<:D=)" "$(--link-dir)$(<:D)$(./)" "$(--link-out)$(<)" "$(--link-def)$(--link-defs)" $(--link-flags) $(--link-libs) "$(>)"
+ } }
+ 
+ rule .link