[gentoo-commits] repo/gentoo:master commit in: dev-util/boost-build/files/, dev-util/boost-build/

[Sergey Popov]

commit:     80513ffdf94f733b72f917abd7ae7a15cd1d0677
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 06:19:04 2016 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 06:19:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80513ffd

dev-util/boost-build: drop old masked versions

Package-Manager: portage-2.2.26

 dev-util/boost-build/Manifest                      |   3 -
 dev-util/boost-build/boost-build-1.52.0-r1.ebuild  | 137 --------------------
 dev-util/boost-build/boost-build-1.53.0.ebuild     | 140 ---------------------
 dev-util/boost-build/boost-build-1.54.0.ebuild     | 140 ---------------------
 ...ild-1.48.0-support_dots_in_python-buildid.patch |  19 ---
 .../files/boost-build-1.50.0-fix-test.patch        |  11 --
 6 files changed, 450 deletions(-)

diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index bc223f6..fb6648e 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,6 +1,3 @@
-DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
-DIST boost_1_53_0.tar.bz2 55765258 SHA256 f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 SHA512 8cd7806653cb6ea4a1c6862796ef698de5ae0bdbda96954fedbe090c59e3e6cb8f8d385df35183e9063ac4e2c2fccf10744516c47a994cde5f1d1cba1b07e522 WHIRLPOOL e8c5ed6b34dd5f68dc7e102a9e22b302616a65077d3f4af370ece6352b02a866e04294a4fc76bbd5555b6a4131f590e6455e6a74b5f12c4ffc2dd15af0bc8746
-DIST boost_1_54_0.tar.bz2 57873778 SHA256 047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d SHA512 3467a2bb9b4797cadfc52150cb036939ef35263f421870897dbe9492d1504a714805668a193b0811fdaf39a3527ee693ff70da5b942d7ab11b307e2e693e1760 WHIRLPOOL dbe3cbecaccf86ca184cf73cff75c17d6307b680bab098e38a9efd24d17776481e597017fc9f8fc8f488495f315c6d2b14b9212c51cf98529c302482bf67e92a
 DIST boost_1_55_0.tar.bz2 58146647 SHA256 fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 SHA512 dc606477f4c303e8f40de2586c16394b6d758e198b35bf3a7d3e576a2f49171aadc4f95e8d685fa731bc4e61e19869d5a24e1e816febfca9de078d66e096e041 WHIRLPOOL 6ae111d6a956651bd91914432b743faffeb466703191b05193db47f02fd3528a14ce200f26c1ab77bf2c68994eb5b135b0176f66a746964d334b4793ba113ad5
 DIST boost_1_56_0.tar.bz2 94777674 SHA256 134732acaf3a6e7eba85988118d943f0fa6b7f0850f65131fff89823ad30ff1d SHA512 1ce9871c3a2519682538a5f1331938b948123432d99aea0ce026958cbebd25d84019a3a28c452724b9693df98a8d1264bb2d93d2fee508453f8b42836e67481e WHIRLPOOL e9e9bb965816b687141d55bc026e378a56ed577a2bf0bdad61a1736e7f11d1797e0cac0185a1fa25b6c4b9fe1f75cbb0bb73a5ea05e84d59385bb3b17a90fd12
 DIST boost_1_57_0.tar.bz2 60821561 SHA256 910c8c022a33ccec7f088bd65d4f14b466588dda94ba2124e78b8c57db264967 SHA512 61881440fd89644c43c6e3bc6292e9fed75a6d3a76f98654b189d0ed4e1087d77b585884e882270c08bf9f7132b173bfc1fde05848e06aa78ba7f1008d10714d WHIRLPOOL ff092af332434082a774645a5eb42829cdbdac805ef86dccce8988542062901524bd4d5fc890e3a9c01f0a721047501e5d8b13d50ffa5368066c3438dcf719d6

diff --git a/dev-util/boost-build/boost-build-1.52.0-r1.ebuild b/dev-util/boost-build/boost-build-1.52.0-r1.ebuild
deleted file mode 100644
index 484b2e2..0000000
--- a/dev-util/boost-build/boost-build-1.52.0-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_DEPEND="python? 2"
-
-RESTRICT="test"
-
-inherit eutils flag-o-matic python toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="A system for large project software construction, 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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 )"
-
-RDEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? ( 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}/${PN}-1.50.0-respect-c_ld-flags.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"
-	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() {
-	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 "${EROOT}"/usr) || die "building bjam failed"
-}
-
-src_install() {
-	dobin engine/bin.*/{bjam,b2}
-
-	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 "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
-	if ! use python; then
-		find "${ED}/usr/share/boost-build" -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
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup /usr/share/boost-build
-}

diff --git a/dev-util/boost-build/boost-build-1.53.0.ebuild b/dev-util/boost-build/boost-build-1.53.0.ebuild
deleted file mode 100644
index 34a3f9f..0000000
--- a/dev-util/boost-build/boost-build-1.53.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_DEPEND="python? 2"
-
-RESTRICT="test"
-
-inherit eutils flag-o-matic multilib python toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="A system for large project software construction, 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 ~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 )"
-
-RDEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? ( 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}/${PN}-1.50.0-respect-c_ld-flags.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
-	# Fix python components build on multilib systems, bug #496446
-	cd "${S}/engine"
-	sed -i \
-		-e 's|-s\b||' \
-		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
-		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() {
-	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 "${EROOT}"/usr) || die "building bjam failed"
-}
-
-src_install() {
-	dobin engine/bin.*/{bjam,b2}
-
-	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 "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
-	if ! use python; then
-		find "${ED}/usr/share/boost-build" -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
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup /usr/share/boost-build
-}

diff --git a/dev-util/boost-build/boost-build-1.54.0.ebuild b/dev-util/boost-build/boost-build-1.54.0.ebuild
deleted file mode 100644
index 24c42de..0000000
--- a/dev-util/boost-build/boost-build-1.54.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_DEPEND="python? 2"
-
-RESTRICT="test"
-
-inherit eutils flag-o-matic multilib python toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="A system for large project software construction, 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 ~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 )"
-
-RDEPEND="!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? ( 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-disable_python_rpath.patch" \
-		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
-		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
-		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" \
-		"${FILESDIR}/${PN}-1.54.0-fix-test.patch" \
-		"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
-
-	# Remove stripping option
-	# Fix python components build on multilib systems, bug #496446
-	cd "${S}/engine"
-	sed -i \
-		-e 's|-s\b||' \
-		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
-		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() {
-	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 "${EROOT}"/usr) || die "building bjam failed"
-}
-
-src_install() {
-	dobin engine/bin.*/{bjam,b2}
-
-	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 "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
-	if ! use python; then
-		find "${ED}/usr/share/boost-build" -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
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup /usr/share/boost-build
-}

diff --git a/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch
deleted file mode 100644
index b3bee03..0000000
--- a/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- tools/common.jam
-+++ tools/common.jam
-@@ -759,7 +759,15 @@
-         switch $(f:G)
-         {
-             case <base> :
--                result += $(name:B) ;
-+                local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ;
-+                if $(matched) = boost_python || $(matched) = boost_mpi_python
-+                {
-+                    result += $(name) ;
-+                }
-+                else
-+                {
-+                    result += $(name:B) ;
-+                }
-             
-             case <toolset> :
-                 result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :

diff --git a/dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch
deleted file mode 100644
index 31f8db2..0000000
--- a/dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/startup_v2.py.orig	2012-08-19 11:48:12.020600368 +0200
-+++ test/startup_v2.py	2012-08-19 11:48:28.564516623 +0200
-@@ -14,7 +14,7 @@
-     return re.match(expected,actual,re.DOTALL) != None
- 
- # Test the v1 startup behavior.
--t = BoostBuild.Tester(match=match_re, boost_build_path='', pass_toolset=0)
-+t = BoostBuild.Tester(match=match_re, boost_build_path='/invalid/location', pass_toolset=0)
- 
- t.set_tree('startup')
-