Unslotting. This removes a bunch of older packages that will not build on modern systems, keeps only three versions (stable, mostly-stable and masked).

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

21 files changed, 25 insertions, 1529 deletions

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index 10d8d93cc991..231f2b23a5a0 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-util/boost-build
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.105 2012/10/25 21:55:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.106 2012/10/31 16:32:18 flameeyes Exp $
+
+  31 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  -boost-build-1.34.1.ebuild, -boost-build-1.35.0-r1.ebuild,
+  -boost-build-1.35.0-r2.ebuild, -boost-build-1.37.0.ebuild,
+  -boost-build-1.39.0.ebuild, -boost-build-1.40.0.ebuild,
+  -boost-build-1.41.0.ebuild, -boost-build-1.42.0.ebuild,
+  -boost-build-1.45.0.ebuild, -boost-build-1.47.0.ebuild,
+  -boost-build-1.48.0-r1.ebuild, -boost-build-1.50.0-r3.ebuild,
+  -boost-build-1.50.0.ebuild, -files/1.35.0-fix_broken_icu_build.patch,
+  -files/boost-1.41-fix-mpich2-detection.patch,
+  -files/boost-1.42-fix-mpich2-detection.patch, boost-build-1.46.1.ebuild,
+  boost-build-1.49.0.ebuild, boost-build-1.51.0.ebuild, metadata.xml:
+  Unslotting. This removes a bunch of older packages that will not build on
+  modern systems, keeps only three versions (stable, mostly-stable and masked).
 
 *boost-build-1.51.0 (25 Oct 2012)
 
diff --git a/dev-util/boost-build/boost-build-1.34.1.ebuild b/dev-util/boost-build/boost-build-1.34.1.ebuild
deleted file mode 100644
index dc3ea174d9f8..000000000000
--- a/dev-util/boost-build/boost-build-1.34.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.34.1.ebuild,v 1.18 2012/06/06 20:28:58 jer Exp $
-
-inherit flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	python? ( dev-lang/python )"
-RDEPEND=""
-
-S=${WORKDIR}/boost_${MY_PV}/tools
-
-src_unpack() {
-	unpack ${A}
-
-	# Remove stripping option
-	cd "${S}/jam/src"
-	sed -i \
-		-e 's/-s\b//' \
-		build.jam || die "sed failed"
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}/build/v2"
-	sed -i \
-		-e 's/\(feature optimization : off speed space\)/\1 none/' \
-		-e 's/\(feature debug-symbols : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd jam/src
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	dobin jam/src/bin.*/bjam || die
-
-	cd "${S}/build/v2"
-	insinto /usr/share/boost-build
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-}
diff --git a/dev-util/boost-build/boost-build-1.35.0-r1.ebuild b/dev-util/boost-build/boost-build-1.35.0-r1.ebuild
deleted file mode 100644
index 6b76fa757623..000000000000
--- a/dev-util/boost-build/boost-build-1.35.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.35.0-r1.ebuild,v 1.13 2012/06/07 21:05:00 zmedico Exp $
-
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	python? ( dev-lang/python )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/boost_${MY_PV}/tools
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PV}-fix_broken_icu_build.patch"
-
-	# Remove stripping option
-	cd "${S}/jam/src"
-	sed -i \
-		-e 's/-s\b//' \
-		build.jam || die "sed failed"
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}/build/v2"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd jam/src
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	dobin jam/src/bin.*/bjam
-
-	cd "${S}/build/v2"
-	insinto /usr/share/boost-build
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-
-	dodoc doc/userman.pdf changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-src_test() {
-	cd jam/test
-	./test.sh || die "tests failed"
-}
diff --git a/dev-util/boost-build/boost-build-1.35.0-r2.ebuild b/dev-util/boost-build/boost-build-1.35.0-r2.ebuild
deleted file mode 100644
index b70ea6f8bc4f..000000000000
--- a/dev-util/boost-build/boost-build-1.35.0-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.35.0-r2.ebuild,v 1.11 2012/06/06 20:28:58 jer Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ~ppc64 s390 sh sparc x86"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	python? ( dev-lang/python )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/boost_${MY_PV}/tools"
-
-src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/{jam,build/v2} || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-fix_broken_icu_build.patch"
-
-	# Remove stripping option
-	cd "${S}/jam/src"
-	sed -i -e 's|-s\b||' \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}/build/v2"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd jam/src
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		Jambase || die "sed failed"
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	newbin jam/src/bin.*/bjam bjam-${MAJOR_PV}
-
-	cd "${S}/build/v2"
-	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-
-	dodoc doc/userman.pdf changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
-
-src_test() {
-	cd jam/test
-	./test.sh || die "tests failed"
-}
diff --git a/dev-util/boost-build/boost-build-1.37.0.ebuild b/dev-util/boost-build/boost-build-1.37.0.ebuild
deleted file mode 100644
index 417ed6c0ef38..000000000000
--- a/dev-util/boost-build/boost-build-1.37.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.37.0.ebuild,v 1.5 2012/06/06 20:31:24 jer Exp $
-
-EAPI="2"
-
-inherit flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT="1.37"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1
-	python? ( dev-lang/python )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/boost_${MY_PV}/tools"
-
-src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/{jam,build/v2} || die
-}
-
-src_prepare() {
-	# Remove stripping option
-	cd "${S}/jam/src"
-	sed -i -e 's|-s\b||' \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}/build/v2"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd jam/src
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		Jambase || die "sed failed"
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	newbin jam/src/bin.*/bjam bjam-${MAJOR_PV}
-
-	cd "${S}/build/v2"
-	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-
-	dodoc doc/userman.pdf changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
-
-src_test() {
-	cd jam/test
-	./test.sh || die "tests failed"
-}
diff --git a/dev-util/boost-build/boost-build-1.39.0.ebuild b/dev-util/boost-build/boost-build-1.39.0.ebuild
deleted file mode 100644
index 3d7aa7240975..000000000000
--- a/dev-util/boost-build/boost-build-1.39.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.39.0.ebuild,v 1.4 2012/06/06 20:31:24 jer Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1
-	python? ( dev-lang/python )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/boost_${MY_PV}/tools"
-
-src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/{jam,build/v2} || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.42-env-whitespace.patch" # 293652
-
-	# Remove stripping option
-	cd "${S}/jam/src"
-	sed -i -e 's|-s\b||' \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}/build/v2"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd jam/src
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		Jambase || die "sed failed"
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	newbin jam/src/bin.*/bjam bjam-${MAJOR_PV}
-
-	cd "${S}/build/v2"
-	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-
-	dodoc changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
-
-src_test() {
-	cd jam/test
-	./test.sh || die "tests failed"
-}
diff --git a/dev-util/boost-build/boost-build-1.40.0.ebuild b/dev-util/boost-build/boost-build-1.40.0.ebuild
deleted file mode 100644
index 5abf0b3ed3f7..000000000000
--- a/dev-util/boost-build/boost-build-1.40.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.40.0.ebuild,v 1.3 2010/08/14 06:35:53 dirtyepic Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1
-	python? ( dev-lang/python )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/boost_${MY_PV}/tools"
-
-src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/{jam,build/v2} || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.42-env-whitespace.patch" # 293652
-
-	# Remove stripping option
-	cd "${S}/jam/src"
-	sed -i -e 's|-s\b||' \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}/build/v2"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd jam/src
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		Jambase || die "sed failed"
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	newbin jam/src/bin.*/bjam bjam-${MAJOR_PV}
-
-	cd "${S}/build/v2"
-	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-
-	dodoc changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
-
-src_test() {
-	cd jam/test
-	./test.sh || die "tests failed"
-}
diff --git a/dev-util/boost-build/boost-build-1.41.0.ebuild b/dev-util/boost-build/boost-build-1.41.0.ebuild
deleted file mode 100644
index 75dbe85e351d..000000000000
--- a/dev-util/boost-build/boost-build-1.41.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.41.0.ebuild,v 1.10 2010/09/19 17:52:31 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1
-	python? ( dev-lang/python )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/boost_${MY_PV}/tools"
-
-src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/{jam,build/v2} || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/boost-1.41-fix-mpich2-detection.patch"
-	epatch "${FILESDIR}/${PN}-1.42-env-whitespace.patch" # 293652
-
-	# Remove stripping option
-	cd "${S}/jam/src"
-	sed -i -e 's|-s\b||' \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}/build/v2"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd jam/src
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		Jambase || die "sed failed"
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	newbin jam/src/bin.*/bjam bjam-${MAJOR_PV}
-
-	cd "${S}/build/v2"
-	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-
-	dodoc changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
-
-src_test() {
-	cd jam/test
-	./test.sh || die "tests failed"
-}
diff --git a/dev-util/boost-build/boost-build-1.42.0.ebuild b/dev-util/boost-build/boost-build-1.42.0.ebuild
deleted file mode 100644
index 0f69d8771e12..000000000000
--- a/dev-util/boost-build/boost-build-1.42.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.42.0.ebuild,v 1.11 2011/04/16 11:29:07 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1
-	python? ( dev-lang/python )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/boost_${MY_PV}/tools"
-
-src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/{jam,build/v2} || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/boost-1.42-fix-mpich2-detection.patch"
-	epatch "${FILESDIR}/${PN}-1.42-env-whitespace.patch" # 293652
-
-	# Remove stripping option
-	cd "${S}/jam/src"
-	sed -i -e 's|-s\b||' \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}/build/v2"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd jam/src
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		Jambase || die "sed failed"
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	newbin jam/src/bin.*/bjam bjam-${MAJOR_PV}
-
-	cd "${S}/build/v2"
-	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-
-	dodoc changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
-
-src_test() {
-	cd jam/test
-	./test.sh || die "tests failed"
-}
diff --git a/dev-util/boost-build/boost-build-1.45.0.ebuild b/dev-util/boost-build/boost-build-1.45.0.ebuild
deleted file mode 100644
index 6c9c2a4faeef..000000000000
--- a/dev-util/boost-build/boost-build-1.45.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.45.0.ebuild,v 1.1 2011/01/06 14:00:10 dev-zero Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1
-	python? ( dev-lang/python )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
-
-src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
-}
-
-src_prepare() {
-	# TODO:
-	#	epatch "${FILESDIR}/boost-1.42-fix-mpich2-detection.patch"
-
-	cd "${S}/engine"
-	epatch "${FILESDIR}/${PN}-1.42-env-whitespace.patch" # 293652
-
-	# Remove stripping option
-	cd "${S}/engine/src"
-	sed -i -e 's|-s\b||' \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd engine/src
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		Jambase || die "sed failed"
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	newbin engine/src/bin.*/bjam bjam-${MAJOR_PV}
-
-	cd "${S}"
-	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-
-	dodoc changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
-
-src_test() {
-	cd engine/test
-	./test.sh || die "tests failed"
-}
diff --git a/dev-util/boost-build/boost-build-1.46.1.ebuild b/dev-util/boost-build/boost-build-1.46.1.ebuild
index 287a5b945307..65771da0ca10 100644
--- a/dev-util/boost-build/boost-build-1.46.1.ebuild
+++ b/dev-util/boost-build/boost-build-1.46.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.46.1.ebuild,v 1.9 2011/12/28 19:22:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.46.1.ebuild,v 1.10 2012/10/31 16:32:18 flameeyes Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ DESCRIPTION="A system for large project software construction, which is simple t
 HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
 SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
 LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
+SLOT=0
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="examples python"
 
diff --git a/dev-util/boost-build/boost-build-1.47.0.ebuild b/dev-util/boost-build/boost-build-1.47.0.ebuild
deleted file mode 100644
index 322571cc50b8..000000000000
--- a/dev-util/boost-build/boost-build-1.47.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.47.0.ebuild,v 1.1 2011/09/26 11:01:51 hwoarang Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1
-	python? ( dev-lang/python )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
-
-src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
-}
-
-src_prepare() {
-	# TODO:
-	#	epatch "${FILESDIR}/boost-1.42-fix-mpich2-detection.patch"
-
-	cd "${S}/engine"
-	epatch "${FILESDIR}/${PN}-1.42-env-whitespace.patch" # 293652
-
-	# Remove stripping option
-	cd "${S}/engine"
-	sed -i -e 's|-s\b||' \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c || die
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd engine
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		Jambase || die "sed failed"
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	newbin engine/bin.*/bjam bjam-${MAJOR_PV}
-	newbin engine/bin.*/b2 b2-${MAJOR_PV}
-
-	cd "${S}"
-	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-
-	dodoc changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
-
-src_test() {
-	cd test/engine
-
-	FIXME: Replace the ls call with the proper way of doing this.
-
-	BJAM_BIN=$(ls ../../engine/bin.*/b2)
-	${BJAM_BIN} -f test.jam "-sBJAM=${BJAM_BIN}" || die "tests failed"
-}
diff --git a/dev-util/boost-build/boost-build-1.48.0-r1.ebuild b/dev-util/boost-build/boost-build-1.48.0-r1.ebuild
deleted file mode 100644
index eac5072823e2..000000000000
--- a/dev-util/boost-build/boost-build-1.48.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.48.0-r1.ebuild,v 1.7 2012/06/14 18:50:29 jdhore Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? *"
-
-inherit eutils flag-o-matic python toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
-
-src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-support_dots_in_python-buildid.patch"
-	epatch "${FILESDIR}/${P}-disable_python_rpath.patch"
-
-	# Remove stripping option
-	cd "${S}/engine"
-	sed -i -e 's|-s\b||' \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c || die
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd engine
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		Jambase || die "sed failed"
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	newbin engine/bin.*/bjam bjam-${MAJOR_PV}
-	newbin engine/bin.*/b2 b2-${MAJOR_PV}
-
-	cd "${S}"
-	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-
-	dodoc changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
-
-src_test() {
-	cd test/engine
-
-	# FIXME: Replace the ls call with the proper way of doing this.
-
-	BJAM_BIN=$(ls ../../engine/bin.*/b2)
-	${BJAM_BIN} -f test.jam "-sBJAM=${BJAM_BIN}" || die "tests failed"
-}
diff --git a/dev-util/boost-build/boost-build-1.49.0.ebuild b/dev-util/boost-build/boost-build-1.49.0.ebuild
index 073225549421..71c67d316861 100644
--- a/dev-util/boost-build/boost-build-1.49.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.49.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.49.0.ebuild,v 1.8 2012/10/21 09:07:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.49.0.ebuild,v 1.9 2012/10/31 16:32:18 flameeyes Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
 SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
+SLOT=0
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples python"
 
diff --git a/dev-util/boost-build/boost-build-1.50.0-r3.ebuild b/dev-util/boost-build/boost-build-1.50.0-r3.ebuild
deleted file mode 100644
index a967fa8f078e..000000000000
--- a/dev-util/boost-build/boost-build-1.50.0-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.50.0-r3.ebuild,v 1.1 2012/08/21 05:37:06 dev-zero Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-inherit eutils flag-o-matic python toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples python test"
-
-RDEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? ( =dev-lang/python-2*
-		sys-apps/diffutils )"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
-
-pkg_setup() {
-	if use python ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-1.48.0-support_dots_in_python-buildid.patch" \
-		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
-		"${FILESDIR}/${P}-respect-c_ld-flags.patch" \
-		"${FILESDIR}/${P}-fix-test.patch"
-
-	# Remove stripping option
-	cd "${S}/engine"
-	sed -i -e 's|-s\b||' \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c || die
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_configure() {
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		engine/Jambase || die "sed failed"
-
-	if use python ; then
-		# replace versions by user-selected one (TODO: fix this when slot-op
-		# deps are available to always match the best version available)
-		sed -i \
-			-e "s|2.7 2.6 2.5 2.4 2.3 2.2|${PYTHON_ABI}|" \
-			engine/build.jam || die "sed failed"
-	fi
-}
-
-src_compile() {
-	cd engine
-
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python /usr) || die "building bjam failed"
-}
-
-src_install() {
-	newbin engine/bin.*/bjam bjam-${MAJOR_PV}
-	newbin engine/bin.*/b2 b2-${MAJOR_PV}
-
-	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r "${FILESDIR}/site-config.jam" \
-		boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
-		build kernel options tools util
-
-	rm "${D}/usr/share/boost-build-${MAJOR_PV}/build/project.ann.py" || die "removing faulty python file failed"
-	if ! use python ; then
-		find "${D}/usr/share/boost-build-${MAJOR_PV}" -iname "*.py" -delete || die "removing experimental python files failed"
-	fi
-
-	dodoc changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
-
-src_test() {
-	cd test
-
-	export TMP="${T}"
-
-	DO_DIFF="${PREFIX}/usr/bin/diff" $(PYTHON -2) test_all.py
-
-	if [ -s test_results.txt ] ; then
-		eerror "At least one test failed: $(<test_results.txt)"
-		die "tests failed"
-	fi
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize /usr/share/boost-build-${MAJOR_PV}
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup /usr/share/boost-build-${MAJOR_PV}
-}
diff --git a/dev-util/boost-build/boost-build-1.50.0.ebuild b/dev-util/boost-build/boost-build-1.50.0.ebuild
deleted file mode 100644
index e30926da46f1..000000000000
--- a/dev-util/boost-build/boost-build-1.50.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.50.0.ebuild,v 1.1 2012/07/06 22:18:47 floppym Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? *"
-
-inherit eutils flag-o-matic python toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
-
-DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples python"
-
-DEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
-
-src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.48.0-support_dots_in_python-buildid.patch"
-	epatch "${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch"
-
-	# Remove stripping option
-	cd "${S}/engine"
-	sed -i -e 's|-s\b||' \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c || die
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}"
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_compile() {
-	cd engine
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	# For slotting
-	sed -i \
-		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
-		Jambase || die "sed failed"
-
-	# The build.jam file for building bjam using a bootstrapped jam0 ignores
-	# the LDFLAGS env var (bug #209794). We have now two options:
-	# a) change the cc-target definition in build.jam to include separate compile
-	#    and link targets to make it use the LDFLAGS var, or
-	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
-	#    (which should not be set by us).
-	if [[ -z "${LDFLAGS}" ]] ; then
-		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
-			|| die "building bjam failed"
-	else
-		LDFLAGS=$(echo ${LDFLAGS}) # 293652
-		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
-			$(use_with python) || die "building bjam failed"
-	fi
-}
-
-src_install() {
-	newbin engine/bin.*/bjam bjam-${MAJOR_PV}
-	newbin engine/bin.*/b2 b2-${MAJOR_PV}
-
-	cd "${S}"
-	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
-		build kernel options tools util || die
-
-	dodoc changes.txt hacking.txt release_procedure.txt \
-		notes/build_dir_option.txt notes/relative_source_paths.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
-
-src_test() {
-	cd test/engine
-
-	# FIXME: Replace the ls call with the proper way of doing this.
-
-	BJAM_BIN=$(ls ../../engine/bin.*/b2)
-	${BJAM_BIN} -f test.jam "-sBJAM=${BJAM_BIN}" || die "tests failed"
-}
diff --git a/dev-util/boost-build/boost-build-1.51.0.ebuild b/dev-util/boost-build/boost-build-1.51.0.ebuild
index 261dbd374404..be900ec1a2a2 100644
--- a/dev-util/boost-build/boost-build-1.51.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.51.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.51.0.ebuild,v 1.1 2012/10/25 21:55:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.51.0.ebuild,v 1.2 2012/10/31 16:32:18 flameeyes Exp $
 
 EAPI="5"
 PYTHON_DEPEND="python? 2"
@@ -15,15 +15,16 @@ HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
 SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
+SLOT=0
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples python test"
 
+REQUIRED_USE="test? ( python )"
+
 RDEPEND="!<dev-libs/boost-1.34.0
 	!<=dev-util/boost-build-1.35.0-r1"
 DEPEND="${RDEPEND}
-	test? ( =dev-lang/python-2*
-		sys-apps/diffutils )"
+	test? ( sys-apps/diffutils )"
 
 S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
 
diff --git a/dev-util/boost-build/files/1.35.0-fix_broken_icu_build.patch b/dev-util/boost-build/files/1.35.0-fix_broken_icu_build.patch
deleted file mode 100644
index b4611054c9b0..000000000000
--- a/dev-util/boost-build/files/1.35.0-fix_broken_icu_build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- trunk/tools/build/v2/build/targets.jam (revision 45072)
-+++ trunk/tools/build/v2/build/targets.jam (revision 45245)
-@@ -1170,5 +1170,5 @@
-             ECHO [ targets.indent ] "Building target '$(fn)'" ;
-             targets.increase-indent ;
--            ECHO [ targets.indent ] "Build request: " [ $(property-set).raw ] ;
-+            ECHO [ targets.indent ] "Build request: " $(property-set) [ $(property-set).raw ] ;
-             local cf = [ build-system.command-line-free-features ] ;
-             ECHO [ targets.indent ] "Command line free features: " [ $(cf).raw ] ;
-@@ -1275,5 +1275,14 @@
-                 # case we don't want any diagnostic. In the former case, we need
-                 # diagnostics. FIXME
--                self.generated.$(property-set) = $(rproperties) ;
-+                
-+                # If this target fails to build, add <build>no to properties
-+                # to cause any parent target to fail to build.  Except that it
-+                # - does not work now, since we check for <build>no only in
-+                #   common properties, but not in properties that came from
-+                #   dependencies
-+                # - it's not clear if that's a good idea anyway.  The alias
-+                #   target, for example, should not fail to build if a dependency
-+                #   fails.
-+                self.generated.$(property-set) = [ property-set.create <build>no ] ;
-             }
-         }
-@@ -1283,4 +1292,7 @@
-             {
-                 ECHO [ targets.indent ] "Already built" ;
-+                local ur = $(self.generated.$(property-set)) ;
-+                ur = $(ur[0]) ;
-+                ECHO [ targets.indent ] "  Usage requirements " [ $(ur).raw ] ;
-             }
-         }
diff --git a/dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch b/dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch
deleted file mode 100644
index d3bd646a8ebb..000000000000
--- a/dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: tools/build/v2/tools/mpi.jam
-===================================================================
---- tools/build/v2/tools/mpi.jam        (revision 57744)
-+++ tools/build/v2/tools/mpi.jam        (working copy)
-@@ -156,14 +156,27 @@
-         # into a feature.
-         local match = [ MATCH "^(-.)(.*)" : $(cmdline) ] ;
-         local matched ;
--        if $(match) && $(match[2]) {
-+        if $(match) && $(match[2]) {
-            local prefix = $(match[1]) ;
-            if $(feature_kinds$(prefix)) {
-                local name = $(feature_kinds$(prefix)) ;
-                local add = [ add_feature $(prefix) $(name) $(cmdline) ] ;
-
-                if $(add) {
--                  result += $(add[1]) ;
-+
-+                  if $(add[1]) = <find-shared-library>pthread
-+                  {
-+                      # Uhm. It's not really nice that this MPI implementation
-+                      # uses -lpthread as opposed to -pthread. We do want to
-+                      # set <threading>multi, instead of -lpthread.
-+                      result += "<threading>multi" ;
-+                      MPI_EXTRA_REQUIREMENTS += "<threading>multi" ;
-+                  }
-+                  else
-+                  {
-+                      result += $(add[1]) ;
-+                  }
-+
-                   cmdline = $(add[2]) ;
-                   matched = yes ;
-                }
-
diff --git a/dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch b/dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch
deleted file mode 100644
index d3bd646a8ebb..000000000000
--- a/dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: tools/build/v2/tools/mpi.jam
-===================================================================
---- tools/build/v2/tools/mpi.jam        (revision 57744)
-+++ tools/build/v2/tools/mpi.jam        (working copy)
-@@ -156,14 +156,27 @@
-         # into a feature.
-         local match = [ MATCH "^(-.)(.*)" : $(cmdline) ] ;
-         local matched ;
--        if $(match) && $(match[2]) {
-+        if $(match) && $(match[2]) {
-            local prefix = $(match[1]) ;
-            if $(feature_kinds$(prefix)) {
-                local name = $(feature_kinds$(prefix)) ;
-                local add = [ add_feature $(prefix) $(name) $(cmdline) ] ;
-
-                if $(add) {
--                  result += $(add[1]) ;
-+
-+                  if $(add[1]) = <find-shared-library>pthread
-+                  {
-+                      # Uhm. It's not really nice that this MPI implementation
-+                      # uses -lpthread as opposed to -pthread. We do want to
-+                      # set <threading>multi, instead of -lpthread.
-+                      result += "<threading>multi" ;
-+                      MPI_EXTRA_REQUIREMENTS += "<threading>multi" ;
-+                  }
-+                  else
-+                  {
-+                      result += $(add[1]) ;
-+                  }
-+
-                   cmdline = $(add[2]) ;
-                   matched = yes ;
-                }
-
diff --git a/dev-util/boost-build/metadata.xml b/dev-util/boost-build/metadata.xml
index 207fd63c502a..f3682b7999d7 100644
--- a/dev-util/boost-build/metadata.xml
+++ b/dev-util/boost-build/metadata.xml
@@ -2,16 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cpp</herd>
-  <maintainer>
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
-  <maintainer>
-    <email>SebastianLuther@gmx.de</email>
-    <name>Sebastian Luther</name>
-  </maintainer>
-  <maintainer>
-    <email>arfrever.fta@gmail.com</email>
-    <name>Arfrever Frehtes Taifersar Arahesis</name>
-  </maintainer>
 </pkgmetadata>