Version bump to latest beta for testing; remove non stable candidate ebuild.

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

2 files changed, 35 insertions, 42 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 032afc9c164c..b0e09dfd3360 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/boost
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.286 2012/12/15 14:45:27 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.287 2013/01/25 23:04:42 flameeyes Exp $
+
+*boost-1.53.0_beta1 (25 Jan 2013)
+
+  25 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org>
+  +boost-1.53.0_beta1.ebuild, -boost-1.52.0-r4.ebuild:
+  Version bump to latest beta for testing; remove non stable candidate ebuild.
 
 *boost-1.52.0-r5 (15 Dec 2012)
 
diff --git a/dev-libs/boost/boost-1.52.0-r4.ebuild b/dev-libs/boost/boost-1.53.0_beta1.ebuild
index 86592460bf1a..e7d6492bdbab 100644
--- a/dev-libs/boost/boost-1.52.0-r4.ebuild
+++ b/dev-libs/boost/boost-1.53.0_beta1.ebuild
@@ -1,13 +1,11 @@
-# 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-libs/boost/boost-1.52.0-r4.ebuild,v 1.1 2012/11/22 03:37:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.53.0_beta1.ebuild,v 1.1 2013/01/25 23:04:42 flameeyes Exp $
 
 EAPI="5"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 
-inherit flag-o-matic multilib multiprocessing python toolchain-funcs versionator
+inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
 
 MY_P=${PN}_$(replace_all_version_separators _)
 
@@ -24,6 +22,7 @@ IUSE="debug doc icu +nls mpi python static-libs +threads tools"
 RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
 	!icu? ( virtual/libiconv )
 	mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
+	python? ( ${PYTHON_DEPS} )
 	sys-libs/zlib
 	!app-admin/eselect-boost"
 DEPEND="${RDEPEND}
@@ -50,7 +49,7 @@ create_user-config.jam() {
 	fi
 
 	if use python; then
-		python_configuration="using python : $(python_get_version) : /usr : $(python_get_includedir) : /usr/$(get_libdir) ;"
+		python_configuration="using python : : ${PYTHON} ;"
 	fi
 
 	cat > user-config.jam << __EOF__
@@ -60,12 +59,6 @@ ${python_configuration}
 __EOF__
 }
 
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \
@@ -74,9 +67,7 @@ src_prepare() {
 		"${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
 		"${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
 		"${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
-		"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
-		"${FILESDIR}/remove-toolset-1.48.0.patch" \
-		"${FILESDIR}/${PN}-1.52.0-tuple.patch"
+		"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
 
 	# Avoid a patch for now
 	for file in libs/context/src/asm/*.S; do
@@ -129,7 +120,7 @@ src_compile() {
 		create_user-config.jam
 
 		ejam ${OPTIONS} \
-			$(use python && echo --python-buildid=${PYTHON_ABI}) \
+			$(use python && echo --python-buildid=${EPYTHON#python}) \
 			|| die "Building of Boost libraries failed"
 
 		if use python; then
@@ -143,7 +134,8 @@ src_compile() {
 
 			local dir
 			for dir in ${PYTHON_DIRS}; do
-				mv ${dir} ${dir}-${PYTHON_ABI} || die "Renaming of '${dir}' to '${dir}-${PYTHON_ABI}' failed"
+				mv ${dir} ${dir}-${EPYTHON} \
+					|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
 			done
 
 			if use mpi; then
@@ -158,12 +150,13 @@ src_compile() {
 					fi
 				fi
 
-				mv stage/lib/mpi.so stage/lib/mpi.so-${PYTHON_ABI} || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${PYTHON_ABI}' failed"
+				mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
+					|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
 			fi
 		fi
 	}
 	if use python; then
-		python_execute_function building
+		python_foreach_impl building
 	else
 		building
 	fi
@@ -184,19 +177,22 @@ src_install () {
 		if use python; then
 			local dir
 			for dir in ${PYTHON_DIRS}; do
-				cp -pr ${dir}-${PYTHON_ABI} ${dir} || die "Copying of '${dir}-${PYTHON_ABI}' to '${dir}' failed"
+				cp -pr ${dir}-${EPYTHON} ${dir} \
+					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
 			done
 
 			if use mpi; then
-				cp -p stage/lib/mpi.so-${PYTHON_ABI} "${MPI_PYTHON_MODULE}" || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to '${MPI_PYTHON_MODULE}' failed"
-				cp -p stage/lib/mpi.so-${PYTHON_ABI} stage/lib/mpi.so || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to 'stage/lib/mpi.so' failed"
+				cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
+					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
+				cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
+					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
 			fi
 		fi
 
 		ejam ${OPTIONS} \
 			--includedir="${D}usr/include" \
 			--libdir="${D}usr/$(get_libdir)" \
-			$(use python && echo --python-buildid=${PYTHON_ABI}) \
+			$(use python && echo --python-buildid=${EPYTHON#python}) \
 			install || die "Installation of Boost libraries failed"
 
 		if use python; then
@@ -205,9 +201,10 @@ src_install () {
 			# Move mpi.so Python module to Python site-packages directory.
 			# https://svn.boost.org/trac/boost/ticket/2838
 			if use mpi; then
-				dodir $(python_get_sitedir)/boost
-				mv "${D}usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost" || die
-				cat << EOF > "${D}$(python_get_sitedir)/boost/__init__.py" || die
+				local moddir=$(python_get_sitedir)/boost
+				dodir "${moddir}"
+				mv "${D}usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
+				cat << EOF > "${D}${moddir}/__init__.py" || die
 import sys
 if sys.platform.startswith('linux'):
 	import DLFCN
@@ -221,10 +218,12 @@ else:
 del sys
 EOF
 			fi
+
+			python_optimize
 		fi
 	}
 	if use python; then
-		python_execute_function installation
+		python_foreach_impl installation
 	else
 		installation
 	fi
@@ -319,18 +318,6 @@ pkg_preinst() {
 	done
 }
 
-pkg_postinst() {
-	if use mpi && use python; then
-		python_mod_optimize boost
-	fi
-}
-
-pkg_postrm() {
-	if use mpi && use python; then
-		python_mod_cleanup boost
-	fi
-}
-
 # the tests will never fail because these are not intended as sanity
 # tests at all. They are more a way for upstream to check their own code
 # on new compilers. Since they would either be completely unreliable