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).

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

11 files changed, 44 insertions, 1108 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/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>