Remove old and cleanup files. Bump version 1.52 so that only one set of libraries between debug and release is used; add a 'nls' USE flag to disable the locale library due to bug #436262 (and right now no package in the tree uses it anyway).

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

12 files changed, 54 insertions, 1128 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 50cfcee042d4..ff9df1907575 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,19 @@
 # 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.277 2012/11/08 06:17:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.278 2012/11/11 05:27:48 flameeyes Exp $
+
+*boost-1.52.0-r2 (11 Nov 2012)
+
+  11 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> +boost-1.52.0-r2.ebuild,
+  -boost-1.46.1-r1.ebuild, -boost-1.51.0-r1.ebuild, -boost-1.52.0-r1.ebuild,
+  -files/boost-1.37.0-darwin-long-double.patch,
+  -files/boost-1.45.0-lambda_bind.patch, -files/boost-1.46.1-python32.patch,
+  -files/point_release_naming_fix.patch, -files/random-Jamfile-1.46.1,
+  -files/remove-toolset-1.46.1.patch, metadata.xml:
+  Remove old and cleanup files. Bump version 1.52 so that only one set of
+  libraries between debug and release is used; add a 'nls' USE flag to disable
+  the locale library due to bug #436262 (and right now no package in the tree
+  uses it anyway).
 
   08 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> boost-1.52.0-r1.ebuild:
   Only create the -mt links for USE=threads.
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 4be3c827b1e4..4bcbb8d18c90 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,9 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX boost-1.37.0-darwin-long-double.patch 556 SHA256 0beb2bf9ae43ad86c307873ab19b049152ef7798ba17523638cdb78017642c31 SHA512 ffb492e4d309cec365a446bdf4f62e0f2f8d650035ca439e0b070ae2b6bfa06e7ef17a508f5af9d7a12db5d015500934ec25dec2b0ee57a6c34c3a14fc591fc8 WHIRLPOOL 96a89ad8a9471931eb1b106fe13aab126e774dc86ec68113f2112b5cc98537cb7446450e1fb407d436b9181c4af99d832388a051ee3ad72cb227a7b7fc262fc0
-AUX boost-1.45.0-lambda_bind.patch 1607 SHA256 0ff6a7bf481d5311ec57be1eeaafdd0c0e9e0c09b896700d40295f67bf77be0b SHA512 b42c37f9b4985a9de6a6f083d9eb362d0754b69ee3c14eb63b72b88782b3b101cd5bf7974bd96a185ce974a06f59e94ab72df83faffee474a54664b469340d1f WHIRLPOOL b2a6b46e9843498a5977672b069a21a335f87877b6eed17556e8f3e8e3405c71b39f762b07ff89e489e9aaccb17618a7dfda149e37acf76d5f8fed17c16229e0
-AUX boost-1.46.1-python32.patch 579 SHA256 6227eb2692777b70896fe63a6726b630239b07845f4ae1ae57d2e83a062dc57e SHA512 fc63b9b31977eb4d6bf8152b7160558e2d5a5f83731200119cf35a536c7035c649ae5e3ebc0bf7a34792ed5c992af447d2a9118e4a1981589bfcd8fdcc8d4006 WHIRLPOOL 51154e59673fc82fbbb9d94fd0978fd47c7a12dbb73cb6eca14e40295b6ca07b13d3b5068614eabcd78a9a5ac0162b6b1bf601b42cedaad7891987698b29de04
 AUX boost-1.48.0-disable_icu_rpath.patch 1073 SHA256 e1c947d20f0864e22f6dd2b091da6948bb51aec0d3323c37fe4264ddf57204b4 SHA512 efb62b65dbcb52258dcca074997a0380dfc52f48161777a8b6f9672179247e534e098784dcbb574826f495981fd2189290c7fe733d943bba2b668bb62ef50087 WHIRLPOOL 6f9a142e15bf3674114f2b07c8708055888e74cda4c3c775ca5470e8f54c921aa12660a1f905a370ec5f44f16b73f05025d3ff1ccad557d379ff55ad3ad0a8f0
 AUX boost-1.48.0-disable_libboost_python3.patch 1509 SHA256 0b229762863b72a5faa39ea57538f757548abc492325e6458d3801fd49e4804e SHA512 5aa0eb72365a0674d7d654b924c3189501495c22cc1eb50dc1ce7aaee941ba418c17857475ebbcc4d8f8102100d889aa1c059e3782dbff9eb03ff101bea2ffbb WHIRLPOOL 5710ac3ecf1f6d18db0307f07c720d12646666ec83adde2b2464cb87c901d57088e98801720efb176420f9728967c8752382b15ca69f632b00852d51be412795
 AUX boost-1.48.0-mpi_python3.patch 2549 SHA256 9120a660469fba15554e790150e03a665ea5497e94a79469053506147bd7dad1 SHA512 7c8aa497ceba42319194dd6400ea8af883656c79e4f697d87c5e825cfdef5733bce91c3e930b504b264cae80f582c85f2c2b29d5f8db11ebcabeb744c888096e WHIRLPOOL 1b740f102467c787bd45813ecf085297171892c1126675f1abd501c11dc9a56506d0cb32222239f4e4bb1e6913533b3884acd2a749633f781c53a6529106264c
@@ -13,28 +10,21 @@ AUX boost-1.48.0-respect_python-buildid.patch 1648 SHA256 996395941b5518dd2782cb
 AUX boost-1.48.0-support_dots_in_python-buildid.patch 625 SHA256 da1a6c1b501f6c3bd152b2d13ec690adc2566b159f0e489723ea84865d43b88d SHA512 3a8c3efd11eba1097312dd3141f8846e23578a0386701348ebc77279a02fecf4b715de2231c998bd426b0b63f3f1875f5f47833835a4b41b8e0723b9b5b35399 WHIRLPOOL cf9ad2c82ff1c68ce4ac6a685875e53b00d5f88aa0c562007c4dbe73610811eeaf9ce93a706d0fad46aea4322fe10e9b0bc4a73659d8b98540ebf96bb5288adb
 AUX boost-1.51.0-respect_python-buildid.patch 1565 SHA256 a783cd262cfda7c0046a9a9f34dd91cdc48bc2442c4c466873e85ead818326bb SHA512 65a7456c63db5eeab862fdb6245ba3a26536e26b56be9ed7a502a3d5be91bc278cd4a22cf1c5a1d8917bdeaa6575cbf37a11bfc3e982272f56308117fd2b230e WHIRLPOOL fb430e9c5368540493e13fdadff94df426203c9e6776891a3fc421488266b39f7e5720e5f5d289665d62d753c9bce7a33198cf6e911d94961714c22d1452ac92
 AUX boost-1.51.0-support_dots_in_python-buildid.patch 609 SHA256 189299e2ef3cde98584e60a5bdd8606894c19bceb0c4d40b38f04aae0aed0edd SHA512 0bf1e4cae598a098b8c252bab1938b29dd5d3ea19d9355156b14add27238e9359ad39a73d3afecb031efebd801215804ecebc11ca8fa6ac2b7b3c2f5ff9bc32f WHIRLPOOL ffc318bc06c33263906be6d0e565ef4c2e3fde9f6224cc5413c02cbe446d9f286c69153f4aee6f588472b058b9b4a37110b0be696bd22362989f1b6a8c8fc13e
-AUX point_release_naming_fix.patch 379 SHA256 9369cf6effe61948c3ec6536172c97474b37a84311171a23189189b6c03b86d8 SHA512 fcf4982a4b7dac019fddc790bf5d2129a71e7166173514ba01a92d456c1dcdfb99c03c07bf51377e253da8624ed928de4dd9d28826e05cdba6a0d83c20a7d13d WHIRLPOOL 019bb917476eaa4e9185da7abd5b1c1f5d0747000b090328ef51cdc68e39135698b28644769d0fcc01f1bfd0ada8371e7afec6929a65bfdcd203f9e6b9fed085
-AUX random-Jamfile-1.46.1 358 SHA256 412c26f915db9d2664305d596406f6a75132d8cfe1827b42f17dc083dc632f00 SHA512 61905d1c3d8fbc51a3775b768fb85ac45b94b27861d06298114494eca0b92983d024a09d0fd44ada064fa6ae2913f1139562c1389b9ff25502de9c1ae0ad1005 WHIRLPOOL 1cfd034cd07dcb6ec1d0ec5c39b21af8e6faef8fdcadb40ba834c6800da67ddebcbb20e36005ad31e41c2ce71fb5245ee3ed230e16b432fa5cbed9d74ec5e609
-AUX remove-toolset-1.46.1.patch 465 SHA256 c1cc35cd5e25160e481912dcdd1e45a86d518bb0ac009ad50bd3811b097226b7 SHA512 42c68ecfed8235a9b2d8f70849d57f4e34f6759a2709a50aca94dd9b997d82966556cda0d22abd0f19adf4818b3e6faae6e89cb23d53f456cddb86ed8b0173f6 WHIRLPOOL b785f9fa1db52d4bc947b4313ef34358e3f1f0335b1fe045451b1c4784e5c1166e11a852f72f2f38420a2706b2872119835abc0deac0cfc716b512a16a0d26e6
 AUX remove-toolset-1.48.0.patch 396 SHA256 59af4c05d71def0b14e22a7a5f756a054ca82e3f9686b7668335af7d9bed28fa SHA512 bbb01be2e4b4807eeb19faf13fc6c73e3cb8843953586312076a15c67ad5c5cac683fc3fb26f4e2902c60ab7930e83922f4d499756a85f78a20ac53399329f61 WHIRLPOOL 2490dac69a45b3f48e2513b4f21d75dc7cf5361411541dde96f027c66ca459df5390708902c86f11577d1129410f52d20de1ff275524fb51083a17eee6adc332
-DIST boost_1_46_1.tar.bz2 42001335 SHA256 e1dfbf42b16e5015c46b98e9899c423ca4d04469cbeee05e43ea19236416d883 SHA512 e7cc4383bb960cb59eecd29ef66e2c53466fe5f126bde58f50ba104ee8ab220771db5f7b35e4b9856e9f257d1def5a9b7ea48e1d2757976a89c5a2e3f1fdc327 WHIRLPOOL 4d8d94821c996475ec2bab962b92ec061b890a318897cab695e66daef3f9c8687990450fb26fd783fd0c5be35ccb71616994ef0c8e41c555312ae5383e3649cf
 DIST boost_1_49_0.tar.bz2 48499961 SHA256 dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c SHA512 9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d WHIRLPOOL c049b4212307b0208d0b37ac870a7cfb8562d2b685ce505e1971af7bc68ae9746b06ea80ddc52599ed4cbd6dc3305b5f8051cd771387412aaa1d2f8e939a48ba
-DIST boost_1_51_0.tar.bz2 50811407 SHA256 fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696 SHA512 43a45ff34879328c57e1694e199b895d7535df7cdf78b127ec2649841ac5973f2dddbc0b00a1ed71f2347def6d44f1d8cc5c0deea120f60f53714ebe28046478 WHIRLPOOL 2cfe8ff8b1b812f1a2d02cad25a06fe2a824ef319d95e113fc307d432ff54f2367ac86d922517ce63fce2335b14a9d86ec0c9858b10466b4bf76d28c1ceca828
 DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
-EBUILD boost-1.46.1-r1.ebuild 16252 SHA256 682588f5d588746437f4a09aacb6940574e8bf64bd796ef6b886ff0a26979243 SHA512 20a4ce407bf6e339334ad10ebb75ec0edf74748224bb3ce0eb3909954af40f5b483c2a2a3098c4e111dc13a187d64226af235306d7124b10f407e4411ec5c807 WHIRLPOOL 571855ea79e0d38b5e40000c692bc240d54fef65fa467ce4f8c75486ecd660f6af59085f3883bc07b80209140a9db9891e64eb49955308df698a0273484f3a57
 EBUILD boost-1.49.0-r2.ebuild 14405 SHA256 7160b23c28b2f5041e7597cf447855f7834c6da64012e96ed388854c2c50f937 SHA512 31416ddc5e8ac340b1202c4a499914a177dab8dc46c2d47e24595bcbd813907b19e7df343fd386f8330d30d4a6fffcf6e7ffa9b591df5af12c168259bd419eb4 WHIRLPOOL d3b066f863ca5ad95fa6d82e5f7f12657ba935b7fa229e848aedfaa24d772e102899a253b7bfb2a1d3510bc77cf14cbf4b1fee26813fa85d67432bb2f33a162b
-EBUILD boost-1.51.0-r1.ebuild 13462 SHA256 0995d0baaa9134eaac6355d0dadeb36b827cfd946148609dfad5456c7da549e2 SHA512 d239f628319599a37f390ad98a543cafeea6c02eac09db7620c43a4d5576c7f243dcd74dfed62a65e97e34b5a3d4018d5a40a2605361e0cf43d1ba90f111af0f WHIRLPOOL bae45b9aa324d80f651519a82536ab705cb78dc8faef6782580697cc8740d8be1857ae779ea782a6daa3357ba10b3685bfe6cf15897a982f95d45c29d75d6b36
-EBUILD boost-1.52.0-r1.ebuild 10489 SHA256 51ef6c9017cc90c5ba7600feebb942e8674a1fac9c443d6e871abd2ebb5c40e4 SHA512 9b2c9fd9f2f461d8426cc09da110b7e0981053a865216c87745479044866e33c26e6fca281b5a243a17695861a88a751a5a709cb0de6bdbb68481abefb755634 WHIRLPOOL c7ceae142c929d9b09e3c71feb0296e65d6d79ed4135f07de343d07ac89167a2a0f8a52550d881fe50cd7af68fe5fdbbf33a449010e934f28ec0d96868537005
-MISC ChangeLog 46622 SHA256 85ce8c384d65010c3500795afa174d6a26d827ac9c40e1afd57084b2de4f47bb SHA512 5057ff8b6d8a48d83723a066d7846e29ee0f3cc2692534b59250d1b6b898db6effb3d19b0c3b02473448b717194060bb715accd6783b6e80811b71cac087f15c WHIRLPOOL efc7ca83b8a8c8d1f40a8f85e7014683f854357e4c1ffbd283fb5d887ad6f4e310fbe7bba3a42a5b7c47fe0163cb32277e84d93eb1a72d5ea98d39bd7a38d4e0
-MISC metadata.xml 774 SHA256 e8a16af6e7ab08a3eb4c3514162b37169bf37f43992dd154f54dface2e841d26 SHA512 5f3c424b16056b14bb42bbb1b0777f9ffb52e665b190ff1a99f727d0da71cab79878155a5d153f041e22b292e8c1bbbb31101d17bd6d5216eff2a366ab5349ce WHIRLPOOL bc3cca0be93ded175f8d383c4fd6328a2492ccb2be09ef6f100f0db3cce4dddbc5bd5e65945f3bd68dbdefb6d0eee76b3cb2c11a3dbde1270a75bb3369adb192
+EBUILD boost-1.52.0-r2.ebuild 8947 SHA256 956b348345f420013637f5548424a431bad6c87c204e20d7abb810ec96ea0a3c SHA512 f25c642fbf8cf3ca77fa3c2477921c0d43bef07e708e7d1c6da3065c27cded1970c792dd38f26da629b9756868202e99536f03d39b8e0ea845d7cbbf81bef255 WHIRLPOOL e2a95ed18d3f6917e92b0e21cddc72071d63339faa2a3f924dae35ccf3d6059cef0e9386da9de5272df7e2f3285dbeec114ad78bdd91252f7cd61188cc930b43
+MISC ChangeLog 47311 SHA256 b456dccf320735e84777026bb9e4c4b9881a24f96721c5b836ceb4fb55532ec0 SHA512 b817413661d28577e0f8ddde2b51a0e91c7df46083f26364b539b5abe7a02f3f879adb131f2be35a1d16c679e8b61526508f428d36f1a25c573827bf793bfcc7 WHIRLPOOL 4cfdea7433ddbc509658e41e4d7f47d77a3a5b8cc31649167f33bae55f582588790aad44ab84c703df4fc7cc00ab091732d31c0024ad6ca2bb9666e3dfde9768
+MISC metadata.xml 1367 SHA256 fcf43d43bbf26de1a4656aaf0f09327e92635b0daece38fae1466c48827522a3 SHA512 62155828f854ea4538883ac5a9e05b1f1757d48d21060fed5d8c7460481f347883658160848177da14e8b279d6fe4c36170125b70014432e4ce9a76a7c3672ac WHIRLPOOL d401f159ede4c5c7340d7d08d15064464befb1a1702f0bc7a48d378cbe6334097a60ac494bbfea39d8e91a066ef8f8c4283e02b218369ab1421aea5732df5d17
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQm06MAAoJEBzRPIrUMBNClJMH+QFlX8Kf80ILXvbW/qe0XtVN
-w4RvwiSM5calxQiwhqrgyX3mjtxgXnv5+wT5t+FMKb5AcNV9rj8EiNQidczI6e4C
-ZJYKQNx/fvMdywmhNN2FzoOwygKj//lEstrDw7jg2S8M0rlvAmyDROzRjNxCLC91
-gkNSbvhDDVHoXYeYqi/7cV+i+AFi+2Ks/zYojMmMNiaDuXhkBnOBM/rhDRJjOFvI
-UnSvPcmlP5l2UYiLiQQdbravyWGfRAX2SRpimMGtb22PMq76Fi9VdYKniIUXBVuS
-VXNibC4AMos/nJ9LKh17qFLMBBevi9+Lltflhtu1M7yqdXP7+HclJSkiPLFxyT4=
-=SmUY
+iQEcBAEBCAAGBQJQnzdhAAoJEBzRPIrUMBNCih8H/0SuNRo8IPJPBRtMyEWlV1Rs
+mQKXUeyGfiZ8A2zmNyI5nlCtsfr6DCgnUyC/JTLdZ6e5ME7eK9z3lqfOO8r/iO9c
+/f70bLrPPMGOz4pTFIPT9qYIUk2T5XA5kDMohGFu2M3HP0fDlQtHe5xP/TV004c8
+AHg14WM2SqkijgzrXNnmAA4kObxjObkseZyIgLQBme/XDOOqed2YFgzK2QLSOagz
+MKB8jJJ7YE28cdkOtXr/btyJ0BQnY3HRZriiIEPdFAysOyP13Yt+sLaHt1R7efgZ
+xPWXOIb1qUrtdJ0wpkDZemK3gntRdXxEQ5mkB5t5p84PaL+9ijfzjCsf8Eaa53M=
+=MnmB
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.46.1-r1.ebuild b/dev-libs/boost/boost-1.46.1-r1.ebuild
deleted file mode 100644
index ca7fdb331825..000000000000
--- a/dev-libs/boost/boost-1.46.1-r1.ebuild
+++ /dev/null
@@ -1,496 +0,0 @@
-# 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.46.1-r1.ebuild,v 1.9 2012/11/01 15:17:23 flameeyes Exp $
-
-EAPI="2"
-
-inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
-
-MY_P=${PN}_$(replace_all_version_separators _)
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT=0
-MAJOR_V="$(get_version_component_range 1-2)"
-IUSE="debug doc +eselect icu mpi python static-libs test tools"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.3 )
-	mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
-	sys-libs/zlib
-	python? ( dev-lang/python )
-	>=app-admin/eselect-boost-0.3
-	elibc_glibc? ( <sys-libs/glibc-2.16 )"
-DEPEND="${RDEPEND}
-	=dev-util/boost-build-${MAJOR_V}*"
-
-S=${WORKDIR}/${MY_P}
-
-MAJOR_PV=$(replace_all_version_separators _ ${MAJOR_V})
-BJAM="bjam-${MAJOR_PV}"
-
-# Usage:
-# _add_line <line-to-add> <profile>
-# ... to add to specific profile
-# or
-# _add_line <line-to-add>
-# ... to add to all profiles for which the use flag set
-
-_add_line() {
-	if [ -z "$2" ] ; then
-		echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/default"
-		use debug && echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug"
-	else
-		echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/${2}"
-	fi
-}
-
-pkg_setup() {
-	# It doesn't compile with USE="python mpi" and python-3 (bug 295705)
-	if use python && use mpi ; then
-		if [[ "$(python_get_version --major)" != "2" ]]; then
-			eerror "The Boost.MPI python bindings do not support any other python version"
-			eerror "than 2.x. Please either use eselect to select a python 2.x version or"
-			eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}."
-			die "unsupported python version"
-		fi
-	fi
-
-	if use test ; then
-		CHECKREQS_DISK_BUILD="15G"
-		check_reqs
-
-		ewarn "The tests may take several hours on a recent machine"
-		ewarn "but they will not fail (unless something weird happens ;-)"
-		ewarn "This is because the tests depend on the used compiler/-version"
-		ewarn "and the platform and upstream says that this is normal."
-		ewarn "If you are interested in the results, please take a look at the"
-		ewarn "generated results page:"
-		ewarn "  ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
-		ebeep 5
-
-	fi
-
-	if use debug ; then
-		ewarn "The debug USE-flag means that a second set of the boost libraries"
-		ewarn "will be built containing debug-symbols. You'll be able to select them"
-		ewarn "using the boost-eselect module. But even though the optimization flags"
-		ewarn "you might have set are not stripped, there will be a performance"
-		ewarn "penalty and linking other packages against the debug version"
-		ewarn "of boost is _not_ recommended."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/remove-toolset-${PV}.patch"
-	epatch "${FILESDIR}/${PN}-1.45.0-lambda_bind.patch"
-
-	# Compile against python 3.2. Bug #367245
-	epatch "${FILESDIR}"/${P}-python32.patch
-
-	# This enables building the boost.random library with /dev/urandom support
-	if [[ -e /dev/urandom ]] ; then
-		mkdir -p libs/random/build || die
-		cp "${FILESDIR}/random-Jamfile-${PV}" libs/random/build/Jamfile.v2 || die
-	fi
-
-	# Ensure that the include dir and the libraries always have X_Y in their name if the boost version is X.Y.Z.
-	# By default the build system changes this to X_Y_Z if Z > 0, which breaks eselect-boost and some ebuilds.
-	epatch "${FILESDIR}/point_release_naming_fix.patch"
-}
-
-src_configure() {
-	einfo "Writing new user-config.jam"
-
-	local compiler compilerVersion compilerExecutable mpi
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		compiler=darwin
-		compilerVersion=$(gcc-fullversion)
-		compilerExecutable=$(tc-getCXX)
-		# we need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation
-		append-ldflags -Wl,-headerpad_max_install_names
-	else
-		compiler=gcc
-		compilerVersion=$(gcc-version)
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	# Using -fno-strict-aliasing to prevent possible creation of invalid code.
-	append-flags -fno-strict-aliasing
-
-	# bug 298489
-	if use ppc || use ppc64 ; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi;
-
-	use mpi && mpi="using mpi ;"
-
-	if use python ; then
-		pystring="using python : $(python_get_version) : /usr :	$(python_get_includedir) : $(python_get_libdir) ;"
-	fi
-
-	cat > "${S}/user-config.jam" << __EOF__
-
-variant gentoorelease : release : <optimization>none <debug-symbols>none ;
-variant gentoodebug : debug : <optimization>none ;
-
-using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-
-${pystring}
-
-${mpi}
-
-__EOF__
-
-	# Maintainer information:
-	# The debug-symbols=none and optimization=none
-	# are not official upstream flags but a Gentoo
-	# specific patch to make sure that all our
-	# CXXFLAGS/LDFLAGS are being respected.
-	# Using optimization=off would for example add
-	# "-O0" and override "-O2" set by the user.
-	# Please take a look at the boost-build ebuild
-	# for more infomration.
-
-	use icu && OPTIONS="-sICU_PATH=/usr"
-	use icu || OPTIONS="--disable-icu"
-	use mpi || OPTIONS="${OPTIONS} --without-mpi"
-	use python || OPTIONS="${OPTIONS} --without-python"
-
-	# https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch
-	if use sparc || { use mips && [[ ${ABI} = "o32" ]]; } || use hppa || use arm || use x86-fbsd || use sh; then
-		OPTIONS="${OPTIONS} --disable-long-double"
-	fi
-
-	OPTIONS="${OPTIONS} pch=off --user-config=\"${S}/user-config.jam\" --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}/usr\" --layout=versioned"
-
-	if use static-libs ; then
-		LINK_OPTS="link=shared,static"
-		LIBRARY_TARGETS="*.a *$(get_libname)"
-	else
-		LINK_OPTS="link=shared"
-		#there is no dynamicly linked version of libboost_test_exec_monitor
-		LIBRARY_TARGETS="libboost_test_exec_monitor*.a *$(get_libname)"
-	fi
-}
-
-src_compile() {
-	jobs=$( echo " ${MAKEOPTS} " | \
-		sed -e 's/ --jobs[= ]/ -j /g' \
-			-e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \
-			-e 's/ -j\>/ -j1/g' | \
-			( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; jobs="${j#-j}"; done; echo ${jobs} ) )
-	if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi;
-
-	export BOOST_ROOT="${S}"
-
-	einfo "Using the following command to build: "
-	einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared"
-
-	${BJAM} ${NUMJOBS} -q -d+2 \
-		gentoorelease \
-		${OPTIONS} \
-		threading=single,multi ${LINK_OPTS} runtime-link=shared \
-		|| die "building boost failed"
-
-	# ... and do the whole thing one more time to get the debug libs
-	if use debug ; then
-		einfo "Using the following command to build: "
-		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --buildid=debug"
-
-		${BJAM} ${NUMJOBS} -q -d+2 \
-			gentoodebug \
-			${OPTIONS} \
-			threading=single,multi ${LINK_OPTS} runtime-link=shared \
-			--buildid=debug \
-			|| die "building boost failed"
-	fi
-
-	if use tools; then
-		cd "${S}/tools/"
-		einfo "Using the following command to build the tools: "
-		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS}"
-
-		${BJAM} ${NUMJOBS} -q -d+2\
-			gentoorelease \
-			${OPTIONS} \
-			|| die "building tools failed"
-	fi
-
-}
-
-src_install () {
-	export BOOST_ROOT="${S}"
-
-	einfo "Using the following command to install: "
-	einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" install"
-
-	${BJAM} -q -d+2 \
-		gentoorelease \
-		${OPTIONS} \
-		threading=single,multi ${LINK_OPTS} runtime-link=shared \
-		--includedir="${D}/usr/include" \
-		--libdir="${D}/usr/$(get_libdir)" \
-		install || die "install failed for options '${OPTIONS}'"
-
-	if use debug ; then
-		einfo "Using the following command to install: "
-		einfo "${BJAM} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" --buildid=debug"
-
-		${BJAM} -q -d+2 \
-			gentoodebug \
-			${OPTIONS} \
-			threading=single,multi ${LINK_OPTS} runtime-link=shared \
-			--includedir="${D}/usr/include" \
-			--libdir="${D}/usr/$(get_libdir)" \
-			--buildid=debug \
-			install || die "install failed for options '${OPTIONS}'"
-	fi
-
-	use python || rm -rf "${D}/usr/include/boost-${MAJOR_PV}/boost"/python* || die
-
-	dodir /usr/share/boost-eselect/profiles/${SLOT} || die
-	touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/default" || die
-	if use debug ; then
-		 touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug" || die
-	fi
-
-	# Move the mpi.so to the right place and make sure it's slotted
-	if use mpi && use python; then
-		mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
-		mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/" || die
-		touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die
-		_add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\""
-	fi
-
-	if use doc ; then
-		find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
-		dohtml \
-			-A pdf,txt,cpp,hpp \
-			*.{htm,html,png,css} \
-			-r doc || die
-		dohtml \
-			-A pdf,txt \
-			-r tools || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r libs || die
-		doins -r more || die
-
-		# To avoid broken links
-		insinto /usr/share/doc/${PF}/html
-		doins LICENSE_1_0.txt || die
-
-		dosym /usr/include/boost-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost || die
-	fi
-
-	cd "${D}/usr/$(get_libdir)" || die
-
-	# Remove (unversioned) symlinks
-	# And check for what we remove to catch bugs
-	# got a better idea how to do it? tell me!
-	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v "${MAJOR_PV}") ; do
-		if [ ! -h "${f}" ] ; then
-			eerror "Ups, tried to remove '${f}' which is a a real file instead of a symlink"
-			die "slotting/naming of the libs broken!"
-		fi
-		rm "${f}" || die
-	done
-
-	# The threading libs obviously always gets the "-mt" (multithreading) tag
-	# some packages seem to have a problem with it. Creating symlinks...
-
-	if use static-libs ; then
-		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)"
-	else
-		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)"
-	fi
-	for lib in ${THREAD_LIBS} ; do
-		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-	done
-
-	# The same goes for the mpi libs
-	if use mpi ; then
-		if use static-libs ; then
-			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}.a libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
-		else
-			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
-		fi
-		for lib in ${MPI_LIBS} ; do
-			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-		done
-	fi
-
-	if use debug ; then
-		if use static-libs ; then
-			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname) libboost_thread-mt-${MAJOR_PV}-debug.a"
-		else
-			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname)"
-		fi
-
-		for lib in ${THREAD_DEBUG_LIBS} ; do
-			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-		done
-
-		if use mpi ; then
-			if use static-libs ; then
-				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug.a libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
-			else
-				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
-			fi
-
-			for lib in ${MPI_DEBUG_LIBS} ; do
-				dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-			done
-		fi
-	fi
-
-	# Create a subdirectory with completely unversioned symlinks
-	# and store the names in the profiles-file for eselect
-	dodir /usr/$(get_libdir)/boost-${MAJOR_PV} || die
-
-	_add_line "libs=\"" default
-	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug) ; do
-		dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}} || die
-		_add_line "/usr/$(get_libdir)/${f}" default
-	done
-	_add_line "\"" default
-
-	if use debug ; then
-		_add_line "libs=\"" debug
-		dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug || die
-		for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug) ; do
-			dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug} || die
-			_add_line "/usr/$(get_libdir)/${f}" debug
-		done
-		_add_line "\"" debug
-
-		_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" debug
-		_add_line "suffix=\"-debug\"" debug
-	fi
-
-	_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default
-
-	if use tools; then
-		cd "${S}/dist/bin" || die
-		# Append version postfix to binaries for slotting
-		_add_line "bins=\""
-		for b in * ; do
-			newbin "${b}" "${b}-${MAJOR_PV}" || die
-			_add_line "/usr/bin/${b}-${MAJOR_PV}"
-		done
-		_add_line "\""
-
-		cd "${S}/dist" || die
-		insinto /usr/share || die
-		doins -r share/boostbook || die
-		# Append version postfix for slotting
-		mv "${D}/usr/share/boostbook" "${D}/usr/share/boostbook-${MAJOR_PV}" || die
-		_add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\""
-	fi
-
-	cd "${S}/status" || die
-	if [ -f regress.log ] ; then
-		docinto status || die
-		dohtml *.html ../boost.png || die
-		dodoc regress.log || die
-	fi
-
-	use python && python_need_rebuild
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	[[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		einfo "Working around completely broken build-system(tm)"
-		for d in "${ED}"usr/lib/*.dylib ; do
-			if [[ -f ${d} ]] ; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				for r in ${refs} ; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-src_test() {
-	export BOOST_ROOT=${S}
-
-	cd "${S}/tools/regression/build" || die
-	einfo "Using the following command to build test helpers: "
-	einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} process_jam_log compiler_status"
-
-	${BJAM} -q -d+2 \
-		gentoorelease \
-		${OPTIONS} \
-		process_jam_log compiler_status \
-		|| die "building regression test helpers failed"
-
-	cd "${S}/status" || die
-
-	# Some of the test-checks seem to rely on regexps
-	export LC_ALL="C"
-
-	# The following is largely taken from tools/regression/run_tests.sh,
-	# but adapted to our needs.
-
-	# Run the tests & write them into a file for postprocessing
-	einfo "Using the following command to test: "
-	einfo "${BJAM} ${OPTIONS} --dump-tests"
-
-	${BJAM} \
-		${OPTIONS} \
-		--dump-tests 2>&1 | tee regress.log || die
-
-	# Postprocessing
-	cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/process_jam_log" --v2
-	if test $? != 0 ; then
-		die "Postprocessing the build log failed"
-	fi
-
-	cat > "${S}/status/comment.html" <<- __EOF__
-		<p>Tests are run on a <a href="http://www.gentoo.org">Gentoo</a> system.</p>
-__EOF__
-
-	# Generate the build log html summary page
-	"${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/compiler_status" --v2 \
-		--comment "${S}/status/comment.html" "${S}" \
-		cs-$(uname).html cs-$(uname)-links.html
-	if test $? != 0 ; then
-		die "Generating the build log html summary page failed"
-	fi
-
-	# And do some cosmetic fixes :)
-	sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html || die
-}
-
-pkg_postinst() {
-	if use eselect ; then
-		eselect boost update || ewarn "eselect boost update failed."
-	fi
-
-	if [ ! -h "${ROOT}/etc/eselect/boost/active" ] ; then
-		elog "No active boost version found. Calling eselect to select one..."
-		eselect boost update || ewarn "eselect boost update failed."
-	fi
-}
diff --git a/dev-libs/boost/boost-1.51.0-r1.ebuild b/dev-libs/boost/boost-1.51.0-r1.ebuild
deleted file mode 100644
index 1f4d8bcd8597..000000000000
--- a/dev-libs/boost/boost-1.51.0-r1.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# 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.51.0-r1.ebuild,v 1.2 2012/11/01 15:21:39 flameeyes Exp $
-
-EAPI="5"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit flag-o-matic multilib multiprocessing python toolchain-funcs versionator
-
-MY_P=${PN}_$(replace_all_version_separators _)
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-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"
-IUSE="debug doc icu mpi python static-libs tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
-	!icu? ( virtual/libiconv )
-	mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
-	sys-libs/zlib
-	!app-admin/eselect-boost"
-DEPEND="${RDEPEND}
-	=dev-util/boost-build-${MAJOR_V}*"
-
-S=${WORKDIR}/${MY_P}
-
-MAJOR_PV=$(replace_all_version_separators _ ${MAJOR_V})
-BJAM="b2-${MAJOR_PV}"
-
-create_user-config.jam() {
-	local compiler compiler_version compiler_executable
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-		compiler_executable="$(tc-getCXX)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-		compiler_executable="$(tc-getCXX)"
-	fi
-	local mpi_configuration python_configuration
-
-	if use mpi; then
-		mpi_configuration="using mpi ;"
-	fi
-
-	if use python; then
-		python_configuration="using python : $(python_get_version) : /usr : $(python_get_includedir) : /usr/$(get_libdir) ;"
-	fi
-
-	cat > user-config.jam << __EOF__
-using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \
-		"${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
-		"${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch" \
-		"${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
-		"${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
-		"${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
-		"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
-		"${FILESDIR}/remove-toolset-1.48.0.patch"
-}
-
-src_configure() {
-	OPTIONS=""
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	fi
-
-	# bug 298489
-	if use ppc || use ppc64; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi
-
-	use icu && OPTIONS+=" -sICU_PATH=/usr"
-	use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
-	use mpi || OPTIONS+=" --without-mpi"
-	use python || OPTIONS+=" --without-python"
-
-	# https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch
-	if use sparc || { use mips && [[ ${ABI} = "o32" ]]; } || use hppa || use arm || use x86-fbsd || use sh; then
-		OPTIONS+=" --disable-long-double"
-	fi
-
-	OPTIONS+=" pch=off --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}usr\" --layout=versioned"
-
-	if use static-libs; then
-		LINK_OPTS="link=shared,static"
-		LIBRARY_TARGETS="*.a *$(get_libname)"
-	else
-		LINK_OPTS="link=shared"
-		# There is no dynamically linked version of libboost_test_exec_monitor and libboost_exception.
-		LIBRARY_TARGETS="libboost_test_exec_monitor*.a libboost_exception*.a *$(get_libname)"
-	fi
-}
-
-src_compile() {
-	export BOOST_ROOT="${S}"
-	PYTHON_DIRS=""
-	MPI_PYTHON_MODULE=""
-	NUMJOBS="-j$(makeopts_jobs)"
-
-	building() {
-		create_user-config.jam
-
-		einfo "Using the following command to build:"
-		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} $(use python && echo --python-buildid=${PYTHON_ABI})"
-
-		${BJAM} ${NUMJOBS} -q -d+2 \
-			gentoorelease \
-			--user-config=user-config.jam \
-			${OPTIONS} threading=single,multi ${LINK_OPTS} \
-			$(use python && echo --python-buildid=${PYTHON_ABI}) \
-			|| die "Building of Boost libraries failed"
-
-		# ... and do the whole thing one more time to get the debug libs
-		if use debug; then
-			einfo "Using the following command to build:"
-			einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
-
-			${BJAM} ${NUMJOBS} -q -d+2 \
-				gentoodebug \
-				--user-config=user-config.jam \
-				${OPTIONS} threading=single,multi ${LINK_OPTS} \
-				--buildid=debug \
-				$(use python && echo --python-buildid=${PYTHON_ABI}) \
-				|| die "Building of Boost debug libraries failed"
-		fi
-
-		if use python; then
-			if [[ -z "${PYTHON_DIRS}" ]]; then
-				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
-			else
-				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
-					die "Inconsistent structure of build directories"
-				fi
-			fi
-
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				mv ${dir} ${dir}-${PYTHON_ABI} || die "Renaming of '${dir}' to '${dir}-${PYTHON_ABI}' failed"
-			done
-
-			if use mpi; then
-				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
-					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)"
-					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
-						die "Multiple mpi.so files found"
-					fi
-				else
-					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)" ]]; then
-						die "Inconsistent structure of build directories"
-					fi
-				fi
-
-				mv stage/lib/mpi.so stage/lib/mpi.so-${PYTHON_ABI} || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${PYTHON_ABI}' failed"
-			fi
-		fi
-	}
-	if use python; then
-		python_execute_function building
-	else
-		building
-	fi
-
-	if use tools; then
-		pushd tools > /dev/null || die
-		einfo "Using the following command to build the tools:"
-		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=../user-config.jam ${OPTIONS}"
-
-		${BJAM} ${NUMJOBS} -q -d+2\
-			gentoorelease \
-			--user-config=../user-config.jam \
-			${OPTIONS} \
-			|| die "Building of Boost tools failed"
-		popd > /dev/null || die
-	fi
-}
-
-src_install () {
-	installation() {
-		create_user-config.jam
-
-		if use python; then
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				cp -pr ${dir}-${PYTHON_ABI} ${dir} || die "Copying of '${dir}-${PYTHON_ABI}' to '${dir}' failed"
-			done
-
-			if use mpi; then
-				cp -p stage/lib/mpi.so-${PYTHON_ABI} "${MPI_PYTHON_MODULE}" || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to '${MPI_PYTHON_MODULE}' failed"
-				cp -p stage/lib/mpi.so-${PYTHON_ABI} stage/lib/mpi.so || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to 'stage/lib/mpi.so' failed"
-			fi
-		fi
-
-		einfo "Using the following command to install:"
-		einfo "${BJAM} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" $(use python && echo --python-buildid=${PYTHON_ABI}) install"
-
-		${BJAM} -q -d+2 \
-			gentoorelease \
-			--user-config=user-config.jam \
-			${OPTIONS} threading=single,multi ${LINK_OPTS} \
-			--includedir="${D}usr/include" \
-			--libdir="${D}usr/$(get_libdir)" \
-			$(use python && echo --python-buildid=${PYTHON_ABI}) \
-			install || die "Installation of Boost libraries failed"
-
-		if use debug; then
-			einfo "Using the following command to install:"
-			einfo "${BJAM} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
-
-			${BJAM} -q -d+2 \
-				gentoodebug \
-				--user-config=user-config.jam \
-				${OPTIONS} threading=single,multi ${LINK_OPTS} \
-				--includedir="${D}usr/include" \
-				--libdir="${D}usr/$(get_libdir)" \
-				--buildid=debug \
-				$(use python && echo --python-buildid=${PYTHON_ABI}) \
-				install || die "Installation of Boost debug libraries failed"
-		fi
-
-		if use python; then
-			rm -r ${PYTHON_DIRS} || die
-
-			# Move mpi.so Python module to Python site-packages directory and make sure it is slotted.
-			if use mpi; then
-				mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
-				mv "${D}usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
-				cat << EOF > "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
-	import DLFCN
-	flags = sys.getdlopenflags()
-	sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
-	from . import mpi
-	sys.setdlopenflags(flags)
-	del DLFCN, flags
-else:
-	from . import mpi
-del sys
-EOF
-			fi
-		fi
-	}
-	if use python; then
-		python_execute_function installation
-	else
-		installation
-	fi
-
-	use python || rm -rf "${D}usr/include/boost-${MAJOR_PV}/boost"/python* || die
-
-	if use doc; then
-		find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
-		dohtml \
-			-A pdf,txt,cpp,hpp \
-			*.{htm,html,png,css} \
-			-r doc
-		dohtml \
-			-A pdf,txt \
-			-r tools
-		insinto /usr/share/doc/${PF}/html
-		doins -r libs
-		doins -r more
-
-		# To avoid broken links
-		insinto /usr/share/doc/${PF}/html
-		doins LICENSE_1_0.txt
-
-		dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
-	fi
-
-	dosym boost-${MAJOR_PV}/boost /usr/include/boost
-
-	pushd "${D}usr/$(get_libdir)" > /dev/null || die
-
-	# The threading libs obviously always gets the "-mt" (multithreading) tag
-	# some packages seem to have a problem with it. Creating symlinks...
-
-	if use static-libs; then
-		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)"
-	else
-		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)"
-	fi
-	local lib
-	for lib in ${THREAD_LIBS}; do
-		dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
-	done
-
-	# The same goes for the mpi libs
-	if use mpi; then
-		if use static-libs; then
-			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}.a libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
-		else
-			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
-		fi
-		local lib
-		for lib in ${MPI_LIBS}; do
-			dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
-		done
-	fi
-
-	if use debug; then
-		if use static-libs; then
-			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname) libboost_thread-mt-${MAJOR_PV}-debug.a"
-		else
-			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname)"
-		fi
-
-		local lib
-		for lib in ${THREAD_DEBUG_LIBS}; do
-			dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
-		done
-
-		if use mpi; then
-			if use static-libs; then
-				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug.a libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
-			else
-				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
-			fi
-
-			local lib
-			for lib in ${MPI_DEBUG_LIBS}; do
-				dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
-			done
-		fi
-	fi
-
-	local f
-	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug); do
-		dosym ${f} /usr/$(get_libdir)/${f/-${MAJOR_PV}}
-	done
-
-	if use debug; then
-		dodir /usr/$(get_libdir)/boost-debug
-		local f
-		for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug); do
-			dosym ../${f} /usr/$(get_libdir)/boost-debug/${f/-${MAJOR_PV}-debug}
-		done
-	fi
-
-	popd > /dev/null || die
-
-	if use tools; then
-		pushd dist/bin > /dev/null || die
-		# Append version postfix to binaries for slotting
-		local b
-		for b in *; do
-			newbin "${b}" "${b}-${MAJOR_PV}"
-		done
-		popd > /dev/null || die
-
-		pushd dist > /dev/null || die
-		insinto /usr/share
-		doins -r share/boostbook
-		# Append version postfix for slotting
-		mv "${D}usr/share/boostbook" "${D}usr/share/boostbook-${MAJOR_PV}" || die
-		popd > /dev/null || die
-	fi
-
-	pushd status > /dev/null || die
-	if [[ -f regress.log ]]; then
-		docinto status
-		dohtml *.html ../boost.png
-		dodoc regress.log
-	fi
-	popd > /dev/null || die
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-src_test() { :; }
diff --git a/dev-libs/boost/boost-1.52.0-r1.ebuild b/dev-libs/boost/boost-1.52.0-r2.ebuild
index 9f33eb1d5a38..b3871594e1ea 100644
--- a/dev-libs/boost/boost-1.52.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.52.0-r2.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-r1.ebuild,v 1.2 2012/11/08 06:17:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r2.ebuild,v 1.1 2012/11/11 05:27:48 flameeyes Exp $
 
 EAPI="5"
 PYTHON_DEPEND="python? *"
@@ -19,7 +19,7 @@ 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"
-IUSE="debug doc icu mpi python static-libs +threads tools"
+IUSE="debug doc icu +nls mpi python static-libs +threads tools"
 
 RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
 	!icu? ( virtual/libiconv )
@@ -89,14 +89,12 @@ EOF
 }
 
 ejam() {
-	local NUMJOBS="-j$(makeopts_jobs)"
-
-	echo b2 ${NUMJOBS} -q -d+2 "$@"
-	b2 ${NUMJOBS} -q -d+2 "$@"
+	echo b2 "$@"
+	b2 "$@"
 }
 
 src_configure() {
-	OPTIONS=""
+	OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2 --user-config=${S}/user-config.jam"
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		# We need to add the prefix, and in two cases this exceeds, so prepare
@@ -116,17 +114,9 @@ src_configure() {
 	use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
 	use mpi || OPTIONS+=" --without-mpi"
 	use python || OPTIONS+=" --without-python"
+	use nls || OPTIONS+=" --without-locale"
 
-	OPTIONS+=" pch=off --boost-build=/usr/share/boost-build --prefix=\"${D}usr\" --layout=system"
-
-	if use static-libs; then
-		LINK_OPTS="link=shared,static"
-		LIBRARY_TARGETS="*.a *$(get_libname)"
-	else
-		LINK_OPTS="link=shared"
-		# There is no dynamically linked version of libboost_test_exec_monitor and libboost_exception.
-		LIBRARY_TARGETS="libboost_test_exec_monitor*.a libboost_exception*.a *$(get_libname)"
-	fi
+	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)"
 }
 
 src_compile() {
@@ -137,22 +127,10 @@ src_compile() {
 	building() {
 		create_user-config.jam
 
-		ejam gentoorelease \
-			--user-config=user-config.jam \
-			${OPTIONS} threading=$(usex threads multi single) ${LINK_OPTS} \
+		ejam ${OPTIONS} \
 			$(use python && echo --python-buildid=${PYTHON_ABI}) \
 			|| die "Building of Boost libraries failed"
 
-		# ... and do the whole thing one more time to get the debug libs
-		if use debug; then
-			ejam gentoodebug \
-				--user-config=user-config.jam \
-				${OPTIONS} threading=$(usex threads multi single) ${LINK_OPTS} \
-				--buildid=debug \
-				$(use python && echo --python-buildid=${PYTHON_ABI}) \
-				|| die "Building of Boost debug libraries failed"
-		fi
-
 		if use python; then
 			if [[ -z "${PYTHON_DIRS}" ]]; then
 				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
@@ -169,12 +147,12 @@ src_compile() {
 
 			if use mpi; then
 				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
-					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)"
+					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
 					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
 						die "Multiple mpi.so files found"
 					fi
 				else
-					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)" ]]; then
+					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
 						die "Inconsistent structure of build directories"
 					fi
 				fi
@@ -192,9 +170,7 @@ src_compile() {
 	if use tools; then
 		pushd tools > /dev/null || die
 
-		ejam gentoorelease \
-			--user-config=../user-config.jam \
-			${OPTIONS} \
+		ejam ${OPTIONS} \
 			|| die "Building of Boost tools failed"
 		popd > /dev/null || die
 	fi
@@ -216,28 +192,12 @@ src_install () {
 			fi
 		fi
 
-		einfo "Using the following command to install:"
-		ejam gentoorelease \
-			--user-config=user-config.jam \
-			${OPTIONS} threading=$(usex threads multi single) ${LINK_OPTS} \
+		ejam ${OPTIONS} \
 			--includedir="${D}usr/include" \
 			--libdir="${D}usr/$(get_libdir)" \
 			$(use python && echo --python-buildid=${PYTHON_ABI}) \
 			install || die "Installation of Boost libraries failed"
 
-		if use debug; then
-			einfo "Using the following command to install:"
-
-			ejam gentoodebug \
-				--user-config=user-config.jam \
-				${OPTIONS} threading=$(usex threads multi single) ${LINK_OPTS} \
-				--includedir="${D}usr/include" \
-				--libdir="${D}usr/$(get_libdir)" \
-				--buildid=debug \
-				$(use python && echo --python-buildid=${PYTHON_ABI}) \
-				install || die "Installation of Boost debug libraries failed"
-		fi
-
 		if use python; then
 			rm -r ${PYTHON_DIRS} || die
 
@@ -276,9 +236,7 @@ EOF
 			-A pdf,txt,cpp,hpp \
 			*.{htm,html,png,css} \
 			-r doc
-		dohtml \
-			-A pdf,txt \
-			-r tools
+		dohtml -A pdf,txt -r tools
 		insinto /usr/share/doc/${PF}/html
 		doins -r libs
 		doins -r more
@@ -295,28 +253,18 @@ EOF
 	local ext=$(get_libname)
 	if use threads; then
 		local f
-		for f in $(ls -1 *${ext}); do
+		for f in *${ext}; do
 			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
 		done
 	fi
 
-	if use debug; then
-		dodir /usr/$(get_libdir)/boost-debug
-		local f
-		for f in $(ls -1 *-debug*.a *debug*${ext}); do
-			dosym ../${f} /usr/$(get_libdir)/boost-debug/${f/-debug}
-		done
-	fi
-
 	popd > /dev/null || die
 
 	if use tools; then
 		dobin dist/bin/*
 
-		pushd dist > /dev/null || die
 		insinto /usr/share
-		doins -r share/boostbook
-		popd > /dev/null || die
+		doins -r dist/share/boostbook
 	fi
 
 	# boost's build system truely sucks for not having a destdir.  Because for
diff --git a/dev-libs/boost/files/boost-1.37.0-darwin-long-double.patch b/dev-libs/boost/files/boost-1.37.0-darwin-long-double.patch
deleted file mode 100644
index 06a313873c9e..000000000000
--- a/dev-libs/boost/files/boost-1.37.0-darwin-long-double.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Numerous sources suggest just to do this, boost devs only seem to "know"
-it is "bad".  Without this, boost simply dies compiling (joy).
-
---- boost/math/tools/config.hpp
-+++ boost/math/tools/config.hpp
-@@ -43,7 +43,7 @@
- // Darwin's rather strange "double double" is rather hard to
- // support, it should be possible given enough effort though...
- //
--#  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
-+// fsck it! #  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
- #endif
- #if defined(unix) && defined(__INTEL_COMPILER) && (__INTEL_COMPILER <= 1000)
- //
diff --git a/dev-libs/boost/files/boost-1.45.0-lambda_bind.patch b/dev-libs/boost/files/boost-1.45.0-lambda_bind.patch
deleted file mode 100644
index 0b800e9266dd..000000000000
--- a/dev-libs/boost/files/boost-1.45.0-lambda_bind.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: trunk/boost/lambda/detail/function_adaptors.hpp
-===================================================================
---- a/trunk/boost/lambda/detail/function_adaptors.hpp
-+++ b/trunk/boost/lambda/detail/function_adaptors.hpp
-@@ -17,4 +17,7 @@
- #include "boost/type_traits/same_traits.hpp"
- #include "boost/type_traits/remove_reference.hpp"
-+#include "boost/type_traits/remove_cv.hpp"
-+#include "boost/type_traits/add_const.hpp"
-+#include "boost/type_traits/add_volatile.hpp"
- #include "boost/utility/result_of.hpp"
- 
-@@ -238,12 +241,14 @@
-   template<class Args> class sig { 
-     typedef typename boost::tuples::element<1, Args>::type argument_type;
--
--    typedef typename detail::IF<boost::is_const<argument_type>::value,
-+    typedef typename boost::remove_reference<
-+      argument_type
-+    >::type unref_type;
-+
-+    typedef typename detail::IF<boost::is_const<unref_type>::value,
-       typename boost::add_const<T>::type,
-       T
-     >::RET properly_consted_return_type;
- 
--    typedef typename detail::IF<
--        boost::is_volatile<properly_consted_return_type>::value,
-+    typedef typename detail::IF<boost::is_volatile<unref_type>::value,
-       typename boost::add_volatile<properly_consted_return_type>::type,
-       properly_consted_return_type
-@@ -252,6 +257,8 @@
- 
-   public:
--    typedef typename 
--      boost::add_reference<properly_cvd_return_type>::type type;
-+    typedef typename detail::IF<boost::is_reference<argument_type>::value,
-+      typename boost::add_reference<properly_cvd_return_type>::type,
-+      typename boost::remove_cv<T>::type
-+    >::RET type;
-   };
-
diff --git a/dev-libs/boost/files/boost-1.46.1-python32.patch b/dev-libs/boost/files/boost-1.46.1-python32.patch
deleted file mode 100644
index 5e0583af0f6e..000000000000
--- a/dev-libs/boost/files/boost-1.46.1-python32.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: libs/python/src/converter/builtin_converters.cpp

-===================================================================

---- libs/python/src/converter/builtin_converters.cpp	(revision 67279)

-+++ libs/python/src/converter/builtin_converters.cpp	(working copy)

-@@ -431,7 +431,11 @@

-           if (!result.empty())
-           {
-               int err = PyUnicode_AsWideChar(
-+#if PY_VERSION_HEX >= 0x03020000
-+                  intermediate
-+#else
-                   (PyUnicodeObject *)intermediate
-+#endif
-                 , &result[0]
-                 , result.size());
- 
diff --git a/dev-libs/boost/files/point_release_naming_fix.patch b/dev-libs/boost/files/point_release_naming_fix.patch
deleted file mode 100644
index 8da5efa3833b..000000000000
--- a/dev-libs/boost/files/point_release_naming_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Jamroot.orig	2011-03-15 12:49:05.000000000 +0000
-+++ Jamroot	2011-03-15 12:49:20.000000000 +0000
-@@ -150,10 +150,7 @@
- 
- local version-tag = [ MATCH "^([^.]+)[.]([^.]+)[.]([^.]+)" : $(BOOST_VERSION) ]
-     ;
--if $(version-tag[3]) = 0
--{
--    version-tag = $(version-tag[1-2]) ;
--}
-+version-tag = $(version-tag[1-2]) ;
- 
- constant BOOST_VERSION_TAG : $(version-tag:J="_") ;
- 
diff --git a/dev-libs/boost/files/random-Jamfile-1.46.1 b/dev-libs/boost/files/random-Jamfile-1.46.1
deleted file mode 100644
index 81fb136be2b0..000000000000
--- a/dev-libs/boost/files/random-Jamfile-1.46.1
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2006 Tiziano Mueller
-#
-# Use, modification and distribution of the file is subject to the
-# Boost Software License, Version 1.0.
-# (See at http://www.boost.org/LICENSE_1_0.txt)
-
-
-project boost/random
-	: source-location ../src ;
-
-SOURCES = random_device ;
-
-lib boost_random
-	: $(SOURCES).cpp 
-	: <link>shared:<define>BOOST_RANDOM_DYN_LINK=1 ;
diff --git a/dev-libs/boost/files/remove-toolset-1.46.1.patch b/dev-libs/boost/files/remove-toolset-1.46.1.patch
deleted file mode 100644
index c80191ce43d6..000000000000
--- a/dev-libs/boost/files/remove-toolset-1.46.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Jamroot	2010-11-17 11:51:56.000000000 +0200
-+++ Jamroot.gentoo	2011-01-06 15:07:17.893270002 +0200
-@@ -377,7 +377,7 @@
-         if $(layout) = versioned
-         {
-             result = [ common.format-name
--                <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
-+                <base> <threading> <runtime> -$(BOOST_VERSION_TAG)
-                 -$(BUILD_ID)
-                 : $(name) : $(type) : $(property-set) ] ;
-         }        
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
index b85d4bf23d57..8ad9386c55b2 100644
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/metadata.xml
@@ -10,14 +10,28 @@
     <flag name='eselect' restrict='&lt;dev-libs/boost-1.50.0-r2'>
       Run "eselect boost update" even if version is already selected
     </flag>
-    <flag name='debug'>
+    <flag name='debug' restrict='&lt;dev-libs/boost-1.50.0-43'>
       Build and install debug versions of the Boost libraries. These
       libraries are not used by default, and should not be used unless
       you're developing against Boost.
     </flag>
+    <flag name='debug' restrict='&gt;dev-libs/boost-1.52.0-r2'>
+      Build and install only the debug version of the Boost
+      libraries. Only enable this flag if you're developing against
+      boost.
+    </flag>
     <flag name='threads'>
       Build multi-thread-compatible libraries instead of
       single-threaded only.
     </flag>
+    <flag name='nls'>
+      Build libboost_locale. This library requires compatible C
+      library interfaces, which might not be provided by uClibc or
+      other embedded libraries.
+    </flag>
+    <flag name='doc'>
+      Install the full API documentation documentation. This takes
+      over 200MB of extra disk space.
+    </flag>
   </use>
 </pkgmetadata>