Migrate to python-r1.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

4 files changed, 344 insertions, 20 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 668f23a09128..032afc9c164c 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.285 2012/11/22 19:48:37 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.286 2012/12/15 14:45:27 mgorny Exp $
+
+*boost-1.52.0-r5 (15 Dec 2012)
+
+  15 Dec 2012; Michał Górny <mgorny@gentoo.org> +boost-1.52.0-r5.ebuild,
+  metadata.xml:
+  Migrate to python-r1.
 
   22 Nov 2012; Rick Farina <zerochaos@gentoo.org> boost-1.49.0-r2.ebuild:
   sorry about that, that commit was not meant for gentoo-x86, reverting.
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index c94677510da0..b812cb80cb28 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX boost-1.48.0-disable_icu_rpath.patch 1073 SHA256 e1c947d20f0864e22f6dd2b091da6948bb51aec0d3323c37fe4264ddf57204b4 SHA512 efb62b65dbcb52258dcca074997a0380dfc52f48161777a8b6f9672179247e534e098784dcbb574826f495981fd2189290c7fe733d943bba2b668bb62ef50087 WHIRLPOOL 6f9a142e15bf3674114f2b07c8708055888e74cda4c3c775ca5470e8f54c921aa12660a1f905a370ec5f44f16b73f05025d3ff1ccad557d379ff55ad3ad0a8f0
 AUX boost-1.48.0-disable_libboost_python3.patch 1509 SHA256 0b229762863b72a5faa39ea57538f757548abc492325e6458d3801fd49e4804e SHA512 5aa0eb72365a0674d7d654b924c3189501495c22cc1eb50dc1ce7aaee941ba418c17857475ebbcc4d8f8102100d889aa1c059e3782dbff9eb03ff101bea2ffbb WHIRLPOOL 5710ac3ecf1f6d18db0307f07c720d12646666ec83adde2b2464cb87c901d57088e98801720efb176420f9728967c8752382b15ca69f632b00852d51be412795
@@ -16,22 +16,15 @@ DIST boost_1_49_0.tar.bz2 48499961 SHA256 dd748a7f5507a7e7af74f452e1c52a64e651ed
 DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
 EBUILD boost-1.49.0-r2.ebuild 14407 SHA256 0b2876567540ccf696342fe43a67590fa03c60d13a2b7f8796d40c1344b54032 SHA512 4249e7059c0c54b3a11737d444a6453254aba27d3b247841323045ea269ef4091c2818394c257303ef144564a48f18991ab90eea9d9378203b46498e74a904c6 WHIRLPOOL 4a30c5cd4cbdcd6592f609fcdb4c16a2515d3748fe841ed560deccd45a0795b013a57533613967fe75efccb04eaf2e534a75861173805c96f2422d2f24ec2d94
 EBUILD boost-1.52.0-r4.ebuild 9471 SHA256 dc520d7cfa9a368b0329551b6092420913c00da53422117e196266fc98edacfe SHA512 f8ef281244b2457262c546f6dc520750fcc00f9b2c2e17b8941afd1d0ea9dbe9fe69d89f56398f2043e154bfb31bfe472fab92dbb88be15ad2b02fa1fa35da74 WHIRLPOOL 567015d935a7bd8fb440b57b1ed169dac499135bb60db7cca25d2cea5e1b5e16dce7502af6b77dcd4e9b3174a83353af7ba79dea9c2f61224884e2b3433e74bf
-MISC ChangeLog 48601 SHA256 371fa0e9240a1ed8559dbcf4043a8b4bcbbc10347fcff2b07b7fcc76e23a645a SHA512 7192008cc76ee66406ad5111d63fc6fdaf1f5a929a30db2404df2610525f56711348d1652ffbab20356afe5693d31c19066c63fa4e9be7bc3a4bd962c3ed4f40 WHIRLPOOL abe0a99fd6998d17e544d532dba1d9599b996b749930cb8755d32f8c42191d6f98310744e445f26eb935636b2a6f2f631f50859ea4797cecc0eb119d2348deff
-MISC metadata.xml 1367 SHA256 da06c3791932e01be8294a352a8d4ea6f7c5218ae3d4636fa405329ca9bfee0e SHA512 39ba0f66bf4b97d3d623f43d3f68ef8b7dfa6f2ddb6f11748f646e189bd6e7ab030069f34eccaecb74306fc79a6d955271d3e133f1761cf14015fa792304f1df WHIRLPOOL b62a61213d39a23b40b80fa749edf44823af51e17392794e21b47d64dab6f91a4c0e9775bf3fa6eefa623ad3efec7696c7915ea7edf95cfbfb087476e6478576
+EBUILD boost-1.52.0-r5.ebuild 9192 SHA256 a18df966e8a9dee2739e3075ff026314f8a982b31ad721e0250e937098ce9963 SHA512 07dc87d14cb724f5ce4f6036c41c5d652a442100a8e903ead5fcf26330b821081feaeed6fba79d5abdbd4e428b5a86be7f5a5cf51b19ac11c20016337ba1543a WHIRLPOOL dd30a72812b322cc5cce325e3079b05ed243208bcc15a2a5d7f6f85400495fdb5f68693d4a0f70f6034af985632d54fc8f865054ee95a186f00d368d558f0377
+MISC ChangeLog 48746 SHA256 6ccff04dbae6a390389cdb95aa60f307f42438ce9406a0e185875894c55fc438 SHA512 092e37dc6ff1c2e2b1f9b5c50fe2a383b36fec5194c6b62f3958f4f8fec265fa2d287f2faf64ab58f09a8b2b1f6c83d75b62c9dd9a0c9c0c5b2f231b82d15c15 WHIRLPOOL ad528722454e69f617f0fc1071dd9914fcbaa7ffea351c72c71d9c08c470937181c585bb6df1fa462a7c38ec814778b2c04f18d0a1fd085dc88bf6690e40fd52
+MISC metadata.xml 1220 SHA256 12442e258455aa70d08879028a9bb0424d6a5ceea321984009ae7dd51af10c50 SHA512 163fa62be2cad395e8f9bb7779d105bd02be0e09ba4571c41accf707ec25b9ad0d15a62db90c2cc01660b3759235493c00d96f9b741a93fe857c4bea15ac52b9 WHIRLPOOL ae70da326b7b36689ee9a7f3c29921e9e4d85fd7f8b7863866ff9aa7a86eae2983fb12e23f7f0a0aac35a8c09572954ebf67212bb103bed4e15ee2e4ec764ba0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQroGzAAoJEKXdFCfdEflKLgkP/iX5ynXL5Ix6ykJjzC+8KlK1
-CTrV1xZq1HmpCpK5zu3CEpTpbHtv0vioUrBbltWQww5lDtXuuJtANv7RARW/mfXe
-X32+hd4laWs9JAF0WdTvv4sbt3eeX7C2Iz9HAQgvBksLkSmEbWJCnbvrPnGWJxDD
-QU1ExgEswijp7qL/aMtPxQBj1G7MWeICnm9ji57spS+NWPdexglOxOaoMw++Z067
-DG2gRp20jw3+Fl1dhf5aVo0VbAI3sCB7xtU49Psqnf/rsBLFdhQ/F/BeTuHeHiq3
-4m/CQdxvxDI2FzHBBAWRhLcvj9QisyOLe4OtJS7qgRNtzz1cfqf4hrCgMZ4AMzf2
-L5aoUIVWsQAu47l6K+RH3/248d9phakPQwSacsPc1dkooPaO//Xm/fVLrozxTDg/
-x0C5MTfRX5OAlsToOHx82N5Zvbsw+BrC/y1Z6aAkAvERjxlDzdmDF3/0dTh2EMOu
-N+Vf/bYwyNIx6NF30U5FU3K8WjOICQMzLpM36UPxZqv6G1Ux/CIPwTA0GUd/EkuI
-VZTXdSvUl8A6F9fQ3HeHYkt7aKYqRjcvKJnaW1w7XPNNONY5ynbU/R48huEmDqsx
-OgRIBc1m+BFXhCaoKzmVrYWTsSHbHXndGgqPtYxQY3RARbgGHqzMa8SjIMu6DDp6
-tPKr76OTsSqLUk6b31yL
-=fFW8
+iJwEAQEIAAYFAlDMjR0ACgkQfXuS5UK5QB1/qwP/cw5xHhvZB/mz+u/0vxWgOEzo
+hb7QiekePoUfTXABrZg8qjDKFcR1axXH12J2mR1QjJctQbjOd7ZCSElYQsieRp3w
+HXXwobFdKgUj4rX33de30AI4LDB0J8T4wYV9bknngbkm0uSrBpeXtVLXKaSAcdCC
+YzUtQ895esUhJdJ8vAI=
+=racv
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.52.0-r5.ebuild b/dev-libs/boost/boost-1.52.0-r5.ebuild
new file mode 100644
index 000000000000..0f0f40b358d0
--- /dev/null
+++ b/dev-libs/boost/boost-1.52.0-r5.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2012 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-r5.ebuild,v 1.1 2012/12/15 14:45:27 mgorny Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
+
+MY_P=${PN}_$(replace_all_version_separators _)
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="http://www.boost.org/"
+SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT=0
+MAJOR_V="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+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}
+	=dev-util/boost-build-${MAJOR_V}*"
+
+S=${WORKDIR}/${MY_P}
+
+create_user-config.jam() {
+	local compiler compiler_version compiler_executable
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+		compiler_executable="$(tc-getCXX)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+		compiler_executable="$(tc-getCXX)"
+	fi
+	local mpi_configuration python_configuration
+
+	if use mpi; then
+		mpi_configuration="using mpi ;"
+	fi
+
+	if use python; then
+		python_configuration="using python : : ${PYTHON} ;"
+	fi
+
+	cat > user-config.jam << __EOF__
+using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+${mpi_configuration}
+${python_configuration}
+__EOF__
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \
+		"${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
+		"${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch" \
+		"${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"
+
+	# Avoid a patch for now
+	for file in libs/context/src/asm/*.S; do
+		cat - >> $file <<EOF
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+EOF
+	done
+}
+
+ejam() {
+	echo b2 "$@"
+	b2 "$@"
+}
+
+src_configure() {
+	OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2 --user-config=${S}/user-config.jam"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# bug 298489
+	if use ppc || use ppc64; then
+		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
+	fi
+
+	# Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
+	append-cxxflags -std=gnu++98
+
+	use icu && OPTIONS+=" -sICU_PATH=/usr"
+	use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
+	use mpi || OPTIONS+=" --without-mpi"
+	use python || OPTIONS+=" --without-python"
+	use nls || OPTIONS+=" --without-locale"
+
+	OPTIONS+=" pch=off --boost-build=/usr/share/boost-build --prefix=\"${D}usr\" --layout=system threading=$(usex threads multi single) link=$(usex static-libs shared,static shared) --without-context"
+}
+
+src_compile() {
+	export BOOST_ROOT="${S}"
+	PYTHON_DIRS=""
+	MPI_PYTHON_MODULE=""
+
+	building() {
+		create_user-config.jam
+
+		ejam ${OPTIONS} \
+			$(use python && echo --python-buildid=${EPYTHON#python}) \
+			|| die "Building of Boost libraries failed"
+
+		if use python; then
+			if [[ -z "${PYTHON_DIRS}" ]]; then
+				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
+			else
+				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
+					die "Inconsistent structure of build directories"
+				fi
+			fi
+
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				mv ${dir} ${dir}-${EPYTHON} \
+					|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
+			done
+
+			if use mpi; then
+				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
+					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
+					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
+						die "Multiple mpi.so files found"
+					fi
+				else
+					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
+						die "Inconsistent structure of build directories"
+					fi
+				fi
+
+				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_foreach_impl building
+	else
+		building
+	fi
+
+	if use tools; then
+		pushd tools > /dev/null || die
+
+		ejam ${OPTIONS} \
+			|| die "Building of Boost tools failed"
+		popd > /dev/null || die
+	fi
+}
+
+src_install () {
+	installation() {
+		create_user-config.jam
+
+		if use python; then
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				cp -pr ${dir}-${EPYTHON} ${dir} \
+					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
+			done
+
+			if use mpi; then
+				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=${EPYTHON#python}) \
+			install || die "Installation of Boost libraries failed"
+
+		if use python; then
+			rm -r ${PYTHON_DIRS} || die
+
+			# Move mpi.so Python module to Python site-packages directory.
+			# https://svn.boost.org/trac/boost/ticket/2838
+			if use mpi; then
+				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
+	flags = sys.getdlopenflags()
+	sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
+	from . import mpi
+	sys.setdlopenflags(flags)
+	del DLFCN, flags
+else:
+	from . import mpi
+del sys
+EOF
+			fi
+
+			python_optimize
+		fi
+	}
+	if use python; then
+		python_foreach_impl installation
+	else
+		installation
+	fi
+
+	if ! use python; then
+		rm -r "${D}"/usr/include/boost/python* || die
+	fi
+
+	if ! use nls; then
+		rm -r "${D}"/usr/include/boost/locale || die
+	fi
+
+	rm -r "${D}"/usr/include/boost/context || die
+
+	if use doc; then
+		find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
+		dohtml \
+			-A pdf,txt,cpp,hpp \
+			*.{htm,html,png,css} \
+			-r doc
+		dohtml -A pdf,txt -r tools
+		insinto /usr/share/doc/${PF}/html
+		doins -r libs
+		doins -r more
+
+		# To avoid broken links
+		insinto /usr/share/doc/${PF}/html
+		doins LICENSE_1_0.txt
+
+		dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
+	fi
+
+	pushd "${D}usr/$(get_libdir)" > /dev/null || die
+
+	local ext=$(get_libname)
+	if use threads; then
+		local f
+		for f in *${ext}; do
+			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
+		done
+	fi
+
+	popd > /dev/null || die
+
+	if use tools; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# Yai for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}usr/include/boost" "${EROOT}usr/share/boostbook"; do
+		[[ -L ${symlink} ]] && rm -f "${symlink}"
+	done
+}
+
+# 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
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+src_test() { :; }
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
index 823afd5156a1..9c5d65685883 100644
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/metadata.xml
@@ -7,9 +7,6 @@
       Build and install the boost tools (bcp, quickbook, inspect,
       wave)
     </flag>
-    <flag name='eselect' restrict='&lt;dev-libs/boost-1.50.0-r2'>
-      Run "eselect boost update" even if version is already selected
-    </flag>
     <flag name='debug' restrict='&lt;dev-libs/boost-1.50.0-r3'>
       Build and install debug versions of the Boost libraries. These
       libraries are not used by default, and should not be used unless