Fix false python-files removal. Fix minorsyn.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 17 insertions, 158 deletions

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index eeaad9877cfd..d84cfa338929 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.98 2012/08/20 21:52:36 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.99 2012/08/21 05:37:06 dev-zero Exp $
+
+*boost-build-1.50.0-r3 (21 Aug 2012)
+
+  21 Aug 2012; Tiziano Müller <dev-zero@gentoo.org>
+  +boost-build-1.50.0-r3.ebuild, -boost-build-1.50.0-r1.ebuild,
+  -boost-build-1.50.0-r2.ebuild:
+  Fix false python-files removal. Fix minorsyn.
 
 *boost-build-1.50.0-r2 (20 Aug 2012)
 
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 7825c8d07b55..3e0fbfe7179b 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -36,15 +36,14 @@ EBUILD boost-build-1.46.1.ebuild 3307 SHA256 86ada1e18fbf568d0479374f53fc0dd2d25
 EBUILD boost-build-1.47.0.ebuild 3455 SHA256 201bcd7ba558e4e24a437eb83c881b0ca802706b7bb2699bc083b87d2b02ec49 SHA512 cbd4b04313ed5de2ed9cf9869aef8a360d4f6c112f6e16b1500baa7cf1e931034da15ffa89670037ea3d6f241cf69f2b0157e13cf98bc882d3bef5c52cc3174a WHIRLPOOL 1bf082e03364d92601e479f726516f22c534c5d9ee22f071ab7b7f1e42a9a2be1cdbfd00ee6521af54ddf5dac00d78657296efc04fe89b14ae2d69e507c30c0e
 EBUILD boost-build-1.48.0-r1.ebuild 3435 SHA256 91582e119ca3574374f9c745c318713594a8f2cfc4c0b534bb487e004963531b SHA512 20a0b0403b4f93ab7f86f0b2f626be4997f51ff0961f9266c18a2c1af0750161bb15915bb6b50ebfe7766fc6fe62446d4e3b0c3dc515cb2a886e6f29eb8ca3f6 WHIRLPOOL 915a502e977807ef3efb411ce49a90fe47ad4f73f7cba0a930ecd85d2829f43fd70b25c29ed07ba80efb345e79a8a721d9b0252bc8d429608de8867c4e619174
 EBUILD boost-build-1.49.0.ebuild 3448 SHA256 6ff13e7909bd95af00eced88317356eca3135a4f35c4c290ff938ee772030a3e SHA512 6c20c10fca38f7da34d1ef3efb64c8ffcaae065beaaafb8b39c0f20045a72d9809e376d1a47e8dace7981b31f2eca78255f1debc3ae3a9ff3a80c1af5692d0da WHIRLPOOL e64342b81601f8898e85bc32d3dbc17ac87d47ce6a2ab42196518ea401320376232779077e4c9413d7f603203c6beb7d7aae1258e12276e4a37a7fadaa4de230
-EBUILD boost-build-1.50.0-r1.ebuild 4209 SHA256 56572a184547aff18eb00c06d56c56884a0334bf9ceab2afc5bb08741caa8207 SHA512 9588058fdd2112314b89896ca9f9de2f038db93392f7d3741ae7e6f30a1bca16f5db63ee4bcf976a2aaae71c1bf2214c33031a359c4ad46774ea6dd477e2a356 WHIRLPOOL afd6709885fd72c3d20223b2ea8b944b1d3c1f355cbc9d206e25cb3624811ddf929fddeeb6e2a3251802d83d4f0b9cc2e2c2aec762b92876ecaf5ed29404dfa2
-EBUILD boost-build-1.50.0-r2.ebuild 3884 SHA256 c0b199055c6223c7fd2b61ad989b92d9c3e2714e9b6160594006f336741cc923 SHA512 172d6a699d4d63a822b78deb2ea06c3de8b8a8d1d9929c41c661694251f5fbfb9a6a146a629b8431f9bf44bc4d9ee9e6400b3a140a374167b1ce413b3f58c94a WHIRLPOOL 18b1a0083597818241c91919fa53f815b8c2d99f5c626d3304ff8d5c03b5ea6e80651304f2c25eac0e41f919dde8b2149d8095abeecad0ac61b11fb35c95e8ac
+EBUILD boost-build-1.50.0-r3.ebuild 3881 SHA256 0e3eb362b19befc06dbceda3ca4033e4f37dfb1adb3c683458bce418582d1b2e SHA512 ede9e6d72c27761a0565845e9975c3da31fff56f29eee0938e747f873d14b3916040223e07c8cdbc932bed67470a623fe0ae72b48a72dd0d523394ff40c43b0b WHIRLPOOL 03175ec466ddf2927cda6c632d90c46c5331bb60470b37c03318e32f346cbbcfb5fa891c2adb34f488a4cbec8377b43e3eca23b2c9541390dbd748b318a34640
 EBUILD boost-build-1.50.0.ebuild 3454 SHA256 2df90a34e3f76ccafddeb63682c0d19295c6a4ab458bc0ae5dd28baf62ab471d SHA512 3099c5c11a147db7e3cb9da8fcd7d154e5dd72457c0cccb1040e947ed6a42baa9830dc93d42aa2560549a215de7a8c95611b54f9ca6f4582f6e1528373faad0d WHIRLPOOL 09840e898b04b8c6f18f6960ebdca285b6df68c7a67ca93260e18282ff99c23403002b6fc06c4d7853c910fc5b1c7b1797ef3256757e0465c51164e9083f68bd
-MISC ChangeLog 13734 SHA256 41421992a2bdf2f0694e7ba8edc53d0e09533c0985fdf1bfcb1093313c04008d SHA512 348c9ab88b0c1218ac7879ea9455e44d2e36c9beb989690db72a1564008717cabfaf935a5b34e1891ce0518b409c64e9e64a379dde674c1c6a69fb5f9f1a5753 WHIRLPOOL cf004e37a3f887a1e8e04102b11f762baf3a2698f304f4d4054b1af516154087e4e2964d775a1d4d2e74cc6cf9ad233f0f5a5460efb0d2b21e806455a46b81c2
+MISC ChangeLog 13971 SHA256 7b29a5cc998110ff3a800d0d83551fcb5a46ac1c7867fe492a6d42e23a92f85c SHA512 ae1f8033e2176d707420e58cd5855b440f374ef8d75bfd50e613b8ebf8433d88a1ed56bb384271feef505460b47919cc46ad94e2ae3a1dc149770e72f87ae101 WHIRLPOOL fbd405c04c76ccba1c7baaa2efcbeeda6f5cfdcce6c75b085c1506354755e06021283560536a0d3450ebc2cb8b7428faf98fdad15eddb0998fbe75ad32f29a87
 MISC metadata.xml 593 SHA256 baf2b55eeb97d733abc5d6d9f9e7a1c6ed777edcf690b506987f93919080ff3a SHA512 30252ea95d008b232401fd8d73d3ddee78dd5d930880b8902f5b8e296ebacb2c842cbb49a1a5ef242081e50d252774b77494db5e4f9eefb2cdfdf26823d0ce97 WHIRLPOOL 7427db931db5d10b4a083a8a1eef9e9d6ff4e6605b3e799669907ded8b7e6d253cefb1a216798cc8aae9d40de1225d8dcce72048f7d5ec4c270480b2fd863c28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAysaoACgkQGwVqY66cHjB2OACfaoCufd9OS5PrNtvPsVLcZaXo
-Ex8An0zOpt1MbLowH/vb59FH4M3VajVZ
-=drUJ
+iEYEAREIAAYFAlAzHogACgkQGwVqY66cHjBTGACfe1nxUEvR04fZxeTb3NZCHhkX
+ehAAnibC5W9sNpMMKtTKiCGV4DBs+R7x
+=S4T5
 -----END PGP SIGNATURE-----
diff --git a/dev-util/boost-build/boost-build-1.50.0-r1.ebuild b/dev-util/boost-build/boost-build-1.50.0-r1.ebuild
deleted file mode 100644
index 11cf651cdb33..000000000000
--- a/dev-util/boost-build/boost-build-1.50.0-r1.ebuild
+++ /dev/null
@@ -1,146 +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-r1.ebuild,v 1.2 2012/08/19 18:26:58 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() {
-	# - install versioned tools
-	# - install into versioned directory
-	# - don't install examples
-	sed -i \
-		-e "s|b2|b2-${MAJOR_PV}|" \
-		-e "s|bjam|bjam-${MAJOR_PV}|" \
-		-e "s|    boost-build|boost-build-${MAJOR_PV}|" \
-		-e '/$(e2)/d' \
-		Jamroot.jam || die "sed failed"
-
-	# 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 boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam *.py \
-		build kernel options tools util || die
-
-	rm "${D}/usr/share/boost-build-${MAJOR_PV}/build/project.ann.py" || die "removing faulty python file failed"
-	use python || find "${D}/usr/share/boost-build-${MAJOR_PV}" -iname "*.py" -delete || die "removing experimental python files failed"
-
-	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}/{build,kernel,tools,tools/doxygen,util}
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup /usr/share/boost-build-${MAJOR_PV}/{build,kernel,tools,tools/doxygen,util}
-}
diff --git a/dev-util/boost-build/boost-build-1.50.0-r2.ebuild b/dev-util/boost-build/boost-build-1.50.0-r3.ebuild
index 3f768a5d3091..a967fa8f078e 100644
--- a/dev-util/boost-build/boost-build-1.50.0-r2.ebuild
+++ b/dev-util/boost-build/boost-build-1.50.0-r3.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.50.0-r2.ebuild,v 1.1 2012/08/20 21:52:36 dev-zero Exp $
+# $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"
@@ -99,13 +99,12 @@ src_install() {
 	newbin engine/bin.*/b2 b2-${MAJOR_PV}
 
 	insinto /usr/share/boost-build-${MAJOR_PV}
-	doins -r \
+	doins -r "${FILESDIR}/site-config.jam" \
 		boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
-		build kernel options tools util \
-		"${FILESDIR}/site-config.jam" 
+		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
+	if ! use python ; then
 		find "${D}/usr/share/boost-build-${MAJOR_PV}" -iname "*.py" -delete || die "removing experimental python files failed"
 	fi