Disable the context library, which is currently not used by anything in tree and only works on a subset of architectures (bug #443012) and has problem with multilib builds (bug #441588). Make sure to remove the headers as well, for both context and locale.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

3 files changed, 31 insertions, 10 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 49a88cb80434..7882320666c3 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/boost
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.281 2012/11/13 19:36:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.282 2012/11/18 16:10:49 flameeyes Exp $
+
+*boost-1.52.0-r3 (18 Nov 2012)
+
+  18 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> +boost-1.52.0-r3.ebuild,
+  -boost-1.52.0-r2.ebuild:
+  Disable the context library, which is currently not used by anything in tree
+  and only works on a subset of architectures (bug #443012) and has problem with
+  multilib builds (bug #441588). Make sure to remove the headers as well, for
+  both context and locale.
 
   13 Nov 2012; Jeroen Roovers <jer@gentoo.org> boost-1.52.0-r2.ebuild:
   Marked -hppa (bug #443012).
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 7a1659d33eec..ae6529727508 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -14,13 +14,17 @@ AUX remove-toolset-1.48.0.patch 396 SHA256 59af4c05d71def0b14e22a7a5f756a054ca82
 DIST boost_1_49_0.tar.bz2 48499961 SHA256 dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c SHA512 9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d WHIRLPOOL c049b4212307b0208d0b37ac870a7cfb8562d2b685ce505e1971af7bc68ae9746b06ea80ddc52599ed4cbd6dc3305b5f8051cd771387412aaa1d2f8e939a48ba
 DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
 EBUILD boost-1.49.0-r2.ebuild 14405 SHA256 7160b23c28b2f5041e7597cf447855f7834c6da64012e96ed388854c2c50f937 SHA512 31416ddc5e8ac340b1202c4a499914a177dab8dc46c2d47e24595bcbd813907b19e7df343fd386f8330d30d4a6fffcf6e7ffa9b591df5af12c168259bd419eb4 WHIRLPOOL d3b066f863ca5ad95fa6d82e5f7f12657ba935b7fa229e848aedfaa24d772e102899a253b7bfb2a1d3510bc77cf14cbf4b1fee26813fa85d67432bb2f33a162b
-EBUILD boost-1.52.0-r2.ebuild 9270 SHA256 86717ed4edac0a247b9eb532cf8e203b148638cdbdcf787f0111783aaa661311 SHA512 ad2bf801902b56aa2444f417bc66743cf83fe459c3380b077a9f0c528e240fe7facccf269b868f12f824022fd4164c1c0fa9478eda73600e6ba1d45ed0c6a8da WHIRLPOOL e9b309b34d14dd78ddd73fc217573fb39b92dc757daae8588d362925c61e95a7131ce4f6afc53306d7109e45164e6cb3ef84f4464794714dcd51d8a67976b1e9
-MISC ChangeLog 47652 SHA256 181db2f4971244d737d5aedfb04e261414f64798fa98c5cce63205205d2da982 SHA512 a9ee757e3b9df6defb404d8582453003da53d75e21af622a22a03ef1a5572b8fc19de794a8e86bea3c78aceee07cd0691619881961c92697b9200567a2f00551 WHIRLPOOL 8dbf30644559f9c11f9258aa9689422fc2f38af7bb1f896b46f37f7751d859add0dc0d1ef0190726660817e84a49dae5853b700e8deb6debe3059d4e2c8990cc
+EBUILD boost-1.52.0-r3.ebuild 9428 SHA256 6d5ed7e6aee2b7da246118bbdf636d04a13a1996c946a8b75e25f2ae9f8e0550 SHA512 a4a3895d06b4003aa8b70b428ebe7a202cb0dface29dbca2390c3782f10f8853a3c8c448b45c4a0123e142a92b30d8344e80be5673998515f8cf408035dbb592 WHIRLPOOL 5db11a620b9de70b07145ea171ff58e8b3317aa0e601241bd3f34d404698e2b3473baff99b8b37c4fbb515fc0e033ed178ca4ccc48545b6c2440ad2274ca6b51
+MISC ChangeLog 48064 SHA256 0ea28927975f676f528d2304395b04b4540980ff9ce0900dd83c5bbadab4272a SHA512 24f4f12faaff3223da9a15b98b4eb37d111bfc7a5cc1d5cd9ced0531e447e460499fc2e22cb0b2bf8ddaaae888407f3548c9643387c8a27a66f42b18d5919820 WHIRLPOOL 1e8e1f038a7e58252606585b7ad90742ff82771bdb4cca7c24156a76bd9b098fc0026be58cc5f69aa5fdc3a64a93857f2c083e3e8b95f5d8090081ab568895a0
 MISC metadata.xml 1367 SHA256 da06c3791932e01be8294a352a8d4ea6f7c5218ae3d4636fa405329ca9bfee0e SHA512 39ba0f66bf4b97d3d623f43d3f68ef8b7dfa6f2ddb6f11748f646e189bd6e7ab030069f34eccaecb74306fc79a6d955271d3e133f1761cf14015fa792304f1df WHIRLPOOL b62a61213d39a23b40b80fa749edf44823af51e17392794e21b47d64dab6f91a4c0e9775bf3fa6eefa623ad3efec7696c7915ea7edf95cfbfb087476e6478576
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCioTUACgkQVWmRsqeSphOcqgCbBhOgX9O0GGOLib4p8tkoQObc
-QzEAn2oK2j3mKrIuxmgSJy/b54eNNQ3K
-=oc0Z
+iQEcBAEBCAAGBQJQqQiPAAoJEBzRPIrUMBNCmdAH/RJnCrS/PnK0w2cbvlqMOyIn
+MaSXXhJRZaZAQG6Sq7oapE3QVLnKtun19rHgNqU/GVhlhZrgZ8tyx9px5+Db4EiN
+A8W1NwOU5h1Lxp02AMy8Ma13mkyOWON+ClGtLpIpeA5hH5dfFMIMnjXADV+JG4vw
+EwpbF7SYnTsMBQJrcE5s+jygl46feA2A42hbQ4i4XDFTfpww8ZQwunE3t1bbo0W+
+NHPp+ufibqbVhOcxQJiGq5W7uy49EsWIDWh8KqZnFVPYggm53n1dWtjbjNnRbq1Y
+QFnwgTg9ccrgt5F39K1OByHk8RNr/OAA1NH+rHtPP9bdexXF4TlgpfC4Y+Wzseg=
+=OlUr
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.52.0-r2.ebuild b/dev-libs/boost/boost-1.52.0-r3.ebuild
index e761db4b44d0..b5b78910379a 100644
--- a/dev-libs/boost/boost-1.52.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.52.0-r3.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-libs/boost/boost-1.52.0-r2.ebuild,v 1.3 2012/11/13 19:36:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r3.ebuild,v 1.1 2012/11/18 16:10:49 flameeyes Exp $
 
 EAPI="5"
 PYTHON_DEPEND="python? *"
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
 LICENSE="Boost-1.0"
 SLOT=0
 MAJOR_V="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc icu +nls mpi python static-libs +threads tools"
 
 RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
@@ -116,7 +116,7 @@ src_configure() {
 	use python || OPTIONS+=" --without-python"
 	use nls || OPTIONS+=" --without-locale"
 
-	OPTIONS+=" pch=off --boost-build=/usr/share/boost-build --prefix=\"${D}usr\" --layout=system threading=$(usex threads multi single) link=$(usex static-libs shared,static shared)"
+	OPTIONS+=" pch=off --boost-build=/usr/share/boost-build --prefix=\"${D}usr\" --layout=system threading=$(usex threads multi single) link=$(usex static-libs shared,static shared) --without-context"
 }
 
 src_compile() {
@@ -228,7 +228,15 @@ EOF
 		installation
 	fi
 
-	use python || rm -rf "${D}usr/include/boost/python"* || die
+	if ! use python; then
+		rm -r "${D}"/usr/include/boost/python* || die
+	fi
+
+	if ! use nls; then
+		rm -r "${D}"/usr/include/boost/locale || die
+	fi
+
+	rm -r "${D}"/usr/include/boost/context || die
 
 	if use doc; then
 		find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf