Version bump. Remove obsolete.

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

4 files changed, 34 insertions, 141 deletions

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index 9e3bff50e099..703c336c8116 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,13 @@
 # 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.111 2012/12/08 12:11:22 grobian Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.112 2013/01/25 23:03:15 flameeyes Exp $
+
+*boost-build-1.53.0_beta1 (25 Jan 2013)
+
+  25 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org>
+  +boost-build-1.53.0_beta1.ebuild, -boost-build-1.46.1.ebuild,
+  -boost-build-1.51.0.ebuild:
+  Version bump. Remove obsolete.
 
   08 Dec 2012; Fabian Groffen <grobian@gentoo.org>
   +files/boost-build-1.49.0-darwin-gentoo-toolchain.patch,
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 3bca434f9fef..af32f07c287c 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -9,20 +9,22 @@ AUX boost-build-1.50.0-fix-test.patch 428 SHA256 649d36035315caad20807a6b6931155
 AUX boost-build-1.50.0-respect-c_ld-flags.patch 2014 SHA256 15db5440bee28ff3109f0a9a45a4426026b1ded36da88fa8f8a828bff961cd74 SHA512 cd9454009a09795f9b6ad7da187046e43ad624cb56ac79d53596771b69793666247bac540e580060a20694ea7c42f0bb13b266b98cee43a04397bc8931016508 WHIRLPOOL 9267db366be1dff9ead6b846c88a78312600fd2b3a0b9864fa3c7c767a3bd41a4b10b2508f44eb39bb0748163bacda4423eafe2872b2b6482bdcc269c25a1bdd
 AUX boost-build-1.52.0-darwin-no-python-framework.patch 415 SHA256 1a85311e133f3cdb3d17bfd10fe64c244c2efa23722def1334f89dad9274dace SHA512 68a43d610f5d92f5733b9fbf08348e06e190ec7e30f8d5e63ff95c3123539bc582b4d4fe960de586c0df243c5c49e36e9bccf49ca2017884aaa6a2a2b5759d56 WHIRLPOOL 82458d31670568b583f5c067c3224560d50c97f830e67138c31054371267012a29f9a1e902f885c576b2b39af4d92a387028183223d626a3e45a8cfbc9ef366d
 AUX site-config.jam 688 SHA256 795b0719536a934a1c65cfd4abf09ad4f30ad7d90ad4d55b00c858ee35e8890f SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df WHIRLPOOL be4e6a1a308dc41e522be919d765b85cb67909ed74d022ca4bf8264ec86ade1caffe8d69a630b21d4abfed1d0c1e8ef079f874046a713fcdf4f0d72f3f0b6386
-DIST boost_1_46_1.tar.bz2 42001335 SHA256 e1dfbf42b16e5015c46b98e9899c423ca4d04469cbeee05e43ea19236416d883 SHA512 e7cc4383bb960cb59eecd29ef66e2c53466fe5f126bde58f50ba104ee8ab220771db5f7b35e4b9856e9f257d1def5a9b7ea48e1d2757976a89c5a2e3f1fdc327 WHIRLPOOL 4d8d94821c996475ec2bab962b92ec061b890a318897cab695e66daef3f9c8687990450fb26fd783fd0c5be35ccb71616994ef0c8e41c555312ae5383e3649cf
 DIST boost_1_49_0.tar.bz2 48499961 SHA256 dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c SHA512 9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d WHIRLPOOL c049b4212307b0208d0b37ac870a7cfb8562d2b685ce505e1971af7bc68ae9746b06ea80ddc52599ed4cbd6dc3305b5f8051cd771387412aaa1d2f8e939a48ba
-DIST boost_1_51_0.tar.bz2 50811407 SHA256 fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696 SHA512 43a45ff34879328c57e1694e199b895d7535df7cdf78b127ec2649841ac5973f2dddbc0b00a1ed71f2347def6d44f1d8cc5c0deea120f60f53714ebe28046478 WHIRLPOOL 2cfe8ff8b1b812f1a2d02cad25a06fe2a824ef319d95e113fc307d432ff54f2367ac86d922517ce63fce2335b14a9d86ec0c9858b10466b4bf76d28c1ceca828
 DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
-EBUILD boost-build-1.46.1.ebuild 3275 SHA256 75a659bc6f3c58d00596fbc8e5507a3e54c99e6b6093c45ef2c20e4877382f8a SHA512 c1885d403dae63dff6338988b9843eb24e755613b7c920bd5247779fcbda4c63848737dd79e2eaf964320c29d84ce0dd72bb52e032b77775857d4883cdc3a5d0 WHIRLPOOL 9145e6ed21de86cb93cf064e3a3cc363bb978eebc4c2365b280ea74ea655dcc74a87098089e26553d04dc346e1fcd8a4c9e0e0a1170292055e17a3fe8d3da917
+DIST boost_1_53_0_beta1.tar.bz2 55879466 SHA256 a86669b92af08bc05a96857f893d8f7e4bdaecf3c58bfe13b8a57b30b4470685 SHA512 9acc6d96610516f4198bf922ed6a14d6948315aee0ec7b32b04e2c59620a582a1d0cdf83b8ad4c8298a33d686fd8a1f2dd1dd5012750981774824d119e082579 WHIRLPOOL ef654834d5cfefdeb5358cd70dafaf07391820c929e0285b9e78596a27eb0fbd0cd9eeb59f1a8322650f70a25c2a66ad985ff5a9225d47162a13ca486a9cc596
 EBUILD boost-build-1.49.0.ebuild 3409 SHA256 255344ee046ebdb39073ec68058629fc1c13f6b396f7e8b38b7d56f10de5cd21 SHA512 8b0cad7b8af43843d0a004494cdfb396cfafe26fd78095fcc8dabccb89cca0250868c7f1e76955fab1829869eae5741739cf848128c304c57251ba35d4dd1ac3 WHIRLPOOL df250e18c580f16decae85b73d6121a2e28042b34eebfd6b8589fdb568ce55a3a62b3c23a1ffaca83b2f1a5576128678f476449087a46216504f6c025273f3e9
-EBUILD boost-build-1.51.0.ebuild 3869 SHA256 64d0e2710615e1c6721e00f667b6b06a4a12978a8ac23e43a6ca34e20225d833 SHA512 4daaf709b8e0dcbaaca4cf8cc4d5e35d245f2a070055ab2a32bba34129695ed375ec6ace9d28ae6cd70a8e9c7456b6df0e9fcfec65a5fc5a14e08d10faf4308a WHIRLPOOL 805b892ff901208381f1d593526feed36a0d224f2bfa67e43a09e70370a5ef945fc7c038f44c6652e2bbb0dfe8178d7fb2dfe3589b5d170c8b50ef4278e7b1da
 EBUILD boost-build-1.52.0-r1.ebuild 3825 SHA256 d0bd16d8b27d90834c9bab9727b82b39b3089723c864ed98599c100cea600f16 SHA512 9bc3667d9428006eb9f0f3df29b3bd2110f55aa3a48a8532f69f026c249a55e953e922b65b1da58c950e53307def9b34a10bf3951e2d3d5f6981dd78c672ad46 WHIRLPOOL 85b3d6fe9c4fee354334f2e06f0d2787a1a5b91baac23473460b73ea1a61471ea5c651158058559f8db5b1589c79f7e211577e64eb001031e993a32cb58a9725
-MISC ChangeLog 16423 SHA256 e5506605e3f448df34eb9da2f94b9e2ee811064e97ff9cb0dd40cd6f773dd472 SHA512 53435c94eb510b196785bea7d604db24b201571db8d50f8ecf9a2e5991e5f767e8b17e81cadc97bd27aa3bf46d7891e7d9e82ff14696fe2a002604b6ecc9a49a WHIRLPOOL f6604156c945bec03dff72f13711c07222c0d5b72c47c320c610a6ebe420bfc84c5fb7b11e3f887818b6d019ca11ff4f76ff4c58bff9b019e3c7fab5ac194dce
+EBUILD boost-build-1.53.0_beta1.ebuild 3830 SHA256 adf169af122e98e7bf4ffc2352623f5405a1c77b3be7bc1b07d1812484936110 SHA512 47b4535649f025236f3152bef2fdd47ea1d4cf700343dc5f3c35b357479c93ec661baf6f9991ea98d66186cdac819769695f3c78444e7609d93e3cf9a6701467 WHIRLPOOL a8bba152774fdff8afcb25438e3654e86e1bad255efef55a8184b7a63447866ebf2f018eb71947511423a5261b819483d141977bb81628447a026de97e6f14a6
+MISC ChangeLog 16650 SHA256 deee27251fae9e924911ca1362978391829ce45f634dd2901d4120f5fd50b63c SHA512 c384760f9738f7ceb6fbc11a1f181d1bc17403995236d82785f2d45d7e001538795e10dc1b5dfec4b0b19315ed3225a78ef6eeff41e6d5b6225ff0a8d540681b WHIRLPOOL 1e6c6b26c7c9aaa3908e87861566379f220e77a5ede39d60d906fe2a29b9aca08f72f71e75ad97235aed4f9cf95b00c19392545e5baf4b0975e29aac6b34af97
 MISC metadata.xml 158 SHA256 b52dff4a9d9f4eab0428972c9ee5a96df08f39325e4b491c39493da499fedf51 SHA512 5300260c2c2bad38b7a27b5c1d609b48b105034c63807958425e8f8fbcccc02a408bb5565480bb3ee3c87d368ed16859c48b447241adf15896e7508c6c442e65 WHIRLPOOL 17880f728fdb3dbd6ca582547c3c546ffe798d89d37ac717bc0be4e4764b60b867979c996ca89f4fdeedee021c419b964405b5fb674a220e582a436f653b8f30
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDDLm0ACgkQX3X2B8XHTolcGACgouJUFfHEeY2pY3SXMPkg1Y6d
-//sAn1hmtM4T9GbWUnaXoi2yHKGjVunW
-=5dBw
+iQEcBAEBCAAGBQJRAw9CAAoJEBzRPIrUMBNCv/8H/jV3kp86nBlzJI0T+MB23Hbn
+nMyf1I7Z+FVPn6qAkzx3KeWvllSS5rx5kxsesAXIbFt5X9OjWytacqlzRjsfUMMp
+43MJzy9uCIWoT8QP34FQMycXRAlccXi6pSaORuRXb/UiVG27g3FIQmfWHiAdjRmE
+Xfh/CmwnYFeDxWFHV728MR38kf5yGTxCLdyD7b0S2M558wqOEE1gKtuqeIETsCZE
+CSnw1HdjnELG5UuUtQ3m1h9FnqITJ554PRlb3qjNia9ijJjOLtioYYed3nfkYBQr
+2kXQXM57W/x9XJ1e/GgY+diu8XBr+63ioU1GUgkYAOqX7yUF76s3Be897b3dygE=
+=klPA
 -----END PGP SIGNATURE-----
diff --git a/dev-util/boost-build/boost-build-1.46.1.ebuild b/dev-util/boost-build/boost-build-1.46.1.ebuild
deleted file mode 100644
index 65771da0ca10..000000000000
--- a/dev-util/boost-build/boost-build-1.46.1.ebuild
+++ /dev/null
@@ -1,111 +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.46.1.ebuild,v 1.10 2012/10/31 16:32:18 flameeyes 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 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/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.51.0.ebuild b/dev-util/boost-build/boost-build-1.53.0_beta1.ebuild
index be900ec1a2a2..916740df39f0 100644
--- a/dev-util/boost-build/boost-build-1.51.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.53.0_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.2 2012/10/31 16:32:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.53.0_beta1.ebuild,v 1.1 2013/01/25 23:03:15 flameeyes Exp $
 
 EAPI="5"
 PYTHON_DEPEND="python? 2"
@@ -8,7 +8,6 @@ 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"
@@ -16,7 +15,7 @@ SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT=0
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 
 REQUIRED_USE="test? ( python )"
@@ -36,7 +35,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	tar xjpf "${DISTDIR}/${A}" ./boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
 }
 
 src_prepare() {
@@ -44,7 +43,9 @@ src_prepare() {
 		"${FILESDIR}/${PN}-1.48.0-support_dots_in_python-buildid.patch" \
 		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
 		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
-		"${FILESDIR}/${PN}-1.50.0-fix-test.patch"
+		"${FILESDIR}/${PN}-1.50.0-fix-test.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
 
 	# Remove stripping option
 	cd "${S}/engine"
@@ -66,11 +67,6 @@ src_prepare() {
 }
 
 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)
@@ -92,21 +88,20 @@ src_compile() {
 		toolset=cc
 	fi
 
-	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python /usr) || die "building bjam failed"
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
 }
 
 src_install() {
-	newbin engine/bin.*/bjam bjam-${MAJOR_PV}
-	newbin engine/bin.*/b2 b2-${MAJOR_PV}
+	dobin engine/bin.*/{bjam,b2}
 
-	insinto /usr/share/boost-build-${MAJOR_PV}
+	insinto /usr/share/boost-build
 	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"
+	rm "${ED}/usr/share/boost-build/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"
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
 	fi
 
 	dodoc changes.txt hacking.txt release_procedure.txt \
@@ -132,9 +127,9 @@ src_test() {
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize /usr/share/boost-build-${MAJOR_PV}
+	use python && python_mod_optimize /usr/share/boost-build
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup /usr/share/boost-build-${MAJOR_PV}
+	use python && python_mod_cleanup /usr/share/boost-build
 }