When cross-compiling, run the configures in parallel for a nice speed up #462264 by SpanKY.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

7 files changed, 321 insertions, 100 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 8546adea7333..fe84ad609d9c 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.639 2013/03/24 01:41:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.640 2013/03/26 21:29:32 vapier Exp $
+
+  26 Mar 2013; Mike Frysinger <vapier@gentoo.org> python-2.6.8-r1.ebuild,
+  python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, python-3.2.3-r2.ebuild,
+  python-3.3.0-r1.ebuild:
+  When cross-compiling, run the configures in parallel for a nice speed up
+  #462264 by SpanKY.
 
   24 Mar 2013; Mike Gilbert <floppym@gentoo.org> python-3.3.0-r1.ebuild,
   python-3.3.0.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index ddd4c942a24f..2bc78f00ba55 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -26,24 +26,34 @@ DIST python-gentoo-patches-3.2.3-0.tar.bz2 14265 SHA256 2ad8829aa6594edc405afd0e
 DIST python-gentoo-patches-3.3.0-1.tar.bz2 11974 SHA256 bb2d066277a3802e6ea18eebddf42134b44cda25b5201b755628d497be28c488 SHA512 e0522c7924e8cf5af3ea42727d277e44691cc11926c77b8fdcdb21687a9ff1b2fa953bfc1b3cd8d3a01c8dea757735b1aadb3b7e0c804068763052316f7e7858 WHIRLPOOL 091b3c2b87e27a68ddba2e2076a20c25aaedc84055c1d336d93ccdc609cd06ab2eea8b17a34008d5eb27e8d9e5677dca8756aa4f06a6cb95329de912e9c06005
 EBUILD python-2.5.4-r4.ebuild 9909 SHA256 af5cb198d3f33d83d76d39977f7add833a0a0f07670e93dc305db6036918aee4 SHA512 7c3c361520567f711974028be2cdb7d97f020f085df867bccb28019bfaba5186dd21fd81661dc563221947ba9110956e0a62c111b20d182fb97eb1f64966913d WHIRLPOOL a7b0fe019c019a8290f6ca344f8bb0c7053c42b2c346b49caf6e50f29a88e61accb20132c3d27f555ef53c3cd3774273cd678e81875257a09af7e89ce48a18f7
 EBUILD python-2.5.4-r5.ebuild 10108 SHA256 9113c60ea93bfed5aaf68942d0d59f833b37132d928523e45284b06086f04a90 SHA512 5dbba62d8509ebc685205b2f1624539796b2e5509bec09e7ea41276122f1808d7ee3e019490a0890e67ab06bc0385955f8c065def08d7d79523e0637efac1893 WHIRLPOOL eb3046274b3f6ae6e6eedf906ab175322aa325abf2d334b6de7cf3a431bdb2315cd7fb8375d4407ae725044b4eec7c90b878904254db0387181175c94890bb21
-EBUILD python-2.6.8-r1.ebuild 9670 SHA256 b457bfdc4e7ce906b167f79db8fffbd9318184ab18a527289341cbde66d1f5d3 SHA512 6d38f69be938a7a6d7a7da5176c5e90adf6b66fd23cf61fe39c08cff2ce8fa592922af78cb253b73520342bdc74e05b79dd3213ed9ca2379d35366823eb1f2bb WHIRLPOOL 88ee15b22b364d70be0533567de4a97857199a5fa3958cfba2cd202634f3d36aeba51e53a99ceaf27cacd5692dd6372557e39c98bb8716ec8681598fa153e94c
+EBUILD python-2.6.8-r1.ebuild 10932 SHA256 c5bfe10c8048cc7dd136105b9794e23620400c4835800f2e6967cf606a0bb6f9 SHA512 520da7f7856fccb9f462ae3ab3a5d8a470f70231033b19b473a2bf61d5cfc0dc3038ae794c6f93b8b72032da2a3c7f38b1a90b5ca60fa1bcd6085bddb0edcde1 WHIRLPOOL b5cb082e61f647ad251f805410e099c1bb04c7dc1b1f685b34d6930092138d5a07bda01392ebd0ac6840865f4b72615ff96bff3a14c9a877619d37fac95b3dfc
 EBUILD python-2.6.8.ebuild 9443 SHA256 97056f3086a704aea8aa805706f92de748a5ef9dcef8aa5d7b73ad7de22c75e3 SHA512 4e0b0d29a9118f3d8dc8092af5da19c63557744e1dd3ca87b95f1da0aaf86fc176f5bbb923a6ecfa94ef36a04838203d13b253d25dc70cf6974ddfba0583fdd4 WHIRLPOOL 8cf239e0012776efa542942c2faf41203532ac66fccadd06a5f15b5241d33f18b7377cdc6c97b9157a202ae7fc9c795f7e0b5623224a23cc5eba3fe7c6e2681f
 EBUILD python-2.7.3-r2.ebuild 9907 SHA256 b339b4e83a9b7d75d0e04b85300cfa827ed7ede252784ac1b3b2ace60b07e32c SHA512 fc37232bbe6c7344d0381c9b79c967519ee401e14c596d87d4dc07d8100c6f672c7a69b2b204af7db50c3961273f5408f3b8ba01dd35ba5307af1894774bca40 WHIRLPOOL e455203a9a9610f9ef076d2c448f5da4aade7955209b58f17eca30f949794af18dac8d7c3fcf85df9a074826c8947b07e5c69a726d77a6011dd34675321c434d
-EBUILD python-2.7.3-r3.ebuild 10351 SHA256 0aeefe36c18c9f38f31ddee853bcf0d3e43a45f69180e40ad485e2d6713ca12b SHA512 eefd59ccfd807712ce179ac35eb4e740ca61d25cc29d0fd9cb88b431e441981c1c0ce578ec72cd880eac1c3a89f55a354a11b673889077d3725117d7b3644932 WHIRLPOOL 2abb59728e8ab1d5f42073518381ba13bf4340406d0012fa753f4afe4076051de35aa1ac39b0df1816062880ed44b9519913c458fe1fe0317f59748beef3db9d
-EBUILD python-3.1.5-r1.ebuild 8534 SHA256 b8edae338e0eccb127e65f5747cc3544fd27d77897e30cd99b55dc31c1cdecbc SHA512 23c1b9876617652be63f03090411c06a80c139ac1fa16a01f345130c74635525c625228ee003f365801763acee037fecbb47157e060825c09799afa42869edbd WHIRLPOOL 0709283aba02462b9f8946d0f26f87505f2578ff862c43f5aecaa3311fd70b25614e28e0422407777dd80a037a52942cbc42fb07ebf3ba4028fbf349a5f681b5
+EBUILD python-2.7.3-r3.ebuild 11620 SHA256 28eb04648ced4c16737c77381bfd095ee18eeac09ea71e88dc184435e9cbed5a SHA512 bce0d3ea90fa334fb6082443a2f4beaa14d49c312280ea41f25997f2d8d64ffdd4e25fc4037554f8638311bc6416597d963551770e4c3ef4fb85c04419d87c6f WHIRLPOOL c336d7998530e3c0fed0bb1dec81689d51439deb82946620131d78ba4f6b589d7ace069f27a3f6e06a1c28def11438773cccb03dee869e6fe74ce45ad346e3c9
+EBUILD python-3.1.5-r1.ebuild 9796 SHA256 a3569254df06fd466223aeb5b4d23684f9b79b1c3bd264351bb5672db5085e40 SHA512 81c7195ee2d08eb83a96cdaaacefc002db6a264f2825b2bc1973f25c165671723ed9afd417fb2c1dbb348e53d7c5e527e50eb5dd407ed2cb65e36ca52e5a46c2 WHIRLPOOL fb59ffb182207fc717b0c589dba9044371e8bd9a40358a2f27c1117875958b500950d274429ec359dd2027c18daa382060bba0b6cb14854ed44d484cc884d1be
 EBUILD python-3.1.5.ebuild 8243 SHA256 925c87e1b3f3b839b5b07a1465f9ceef834f8d726bca5eb106a3304fb6a09245 SHA512 36bd432ffc21c39a582577d428b6af78d942ad5fd5710ddfa58853fcbcfd279080cff8575b9b28bce5b161d7207c937cce21184ca729a4222aa27ef6208f57a3 WHIRLPOOL c8aaa3697c0d53e92756c152c47b7c278f2cc5212c544d4f6856249441a2b4d05481444109b1d401b52c7d5b517b0be02e60aa04f7fd2da5bd8dfb0e7bcc69fd
 EBUILD python-3.2.3-r1.ebuild 8874 SHA256 b3f241244bb3ab16dd016338d960de0e65b054095aec70bcb9058736904e4201 SHA512 71598028b8345a20a9679a6d320470f7ca19dfa7af2e0f4c5b7ea6250f539470a0623653fa30435bcff43feb2a82bdbea61e49f80450cc01121fca1cb39868df WHIRLPOOL 67b92c8ea6552b05b29cefb5ffb1487b5988ef8b03ef5c0d2daa1ee178f24840f650a0370224f753f7a4d1db3fd68b54816f743281bf7cb5249e3c7c0541ae96
-EBUILD python-3.2.3-r2.ebuild 9409 SHA256 07bc2b8b38d57d06ede6f8803d883367c6dde6c9d26617a02c2f3909b093d338 SHA512 ae2a8c890c5fab710c62a0354af4829028406f910515f385c6953fb7179730513dfc4fec3cef37e4cf255a8380a7249c3c9086f9682bac2c6aa11f36d25cfe83 WHIRLPOOL 15c4087a7af896fe23fc4efb6798b4b05cb9a028db3b175f948a4b18edfb74aa0ff26dfed17c77fb0cf30161ec5efda47e6995ed195a90659608b124d77cc455
+EBUILD python-3.2.3-r2.ebuild 10685 SHA256 4ffdb3009f9d79ce175e10165d93170b9c50e9141d4e906c88c79c303047272d SHA512 7663e52b5f3cde299101b1a5d1b625806f8ed5531dab5df6ae77a413522342c378ac4ae6a27561dd5feebfcf36f144e2ef5f9dbf252637bb8d9fe68b2578af8d WHIRLPOOL 911210587d783a1c7e1356cfffe23982ef021c1e91a87fc69f35abc32f7787f1147104419f1e1b2c1df3a928293d38354fab9e2e575c599ab4d4804e58fa280a
 EBUILD python-3.2.3.ebuild 8862 SHA256 4d8f8aa6ece70e7efc48adc226c1c4c3550b49d42f10c07a7780f84f51484685 SHA512 fabb7c297cdc7bae567bcc0d74866690660ed3e99ed315d7a6ae6bfa33afafb1353b10196397618d57f59cc36470592abcc73f5fee321f9f4da43fea7ad9d720 WHIRLPOOL 93beda7c5f7ea9edcda7e74d33cab8e9d735265fce0c2cb513b4856be65ebb32326ffc8b0f9c6d6161407db88ed05b6cbf76706bd92ca2138ab900ce01858e3b
-EBUILD python-3.3.0-r1.ebuild 9086 SHA256 b6799461b40d67079d42f9f196c1f66c4340a726ff35f90bf0b02a34804daa5d SHA512 946e29e52cb0c62a59e151924383e342ae021c7a7f1e3b8c6f7b9e3b0fc3bb5095a0af788f80ea7c64af1ccd814f9f22d3fa2151e86f3597dbd38f5235d8db9c WHIRLPOOL c7ed9183c545438c15805d57b459b5208a360cc3893983452c43262a37ca505ce9fe261a2582edc026591d6ab2c354356e34ec8c5408a3edd2414fab3591cfb0
+EBUILD python-3.3.0-r1.ebuild 10358 SHA256 eb94d3e94b5b7fde7d80d39b9322643603d98eb9578bd822d77521a6d4f15022 SHA512 20c56e1c3451d85f4811fb929a31ec27072674614c49bf08377cc630f4a1dab0ce55bce9763b630055d13cf3d7ebb2cdbc07919aa09c4a1643aa2df95edfe62d WHIRLPOOL 9b918db0643e7b6e75a80550d18da756766b200d68def2a4a77d16dcae655c06e46a4b52db47e42396f8c95a6de094f65e2cdcc31ecdbf23594ad457c2bd4442
 EBUILD python-3.3.0.ebuild 8521 SHA256 ee29fd4d942eb57cc8c8a05295a51d67dd245a17068950fda3f1e33a340c5424 SHA512 8293731f588ffda59423f79d7eea92bae49df21eb5df4df57a2c867953411657b8a85b4a73c805dda34b494a5c41b1430e8116733b077c4f8d510a838f106f49 WHIRLPOOL bf1dfdea5f145e6fdd2a69c332e3b00c279c6be2d6cf20db75bd40491205979da86fd8c73d18b9694f3abdd299ed3fe7fed714c9d9e395fa13b973821f693815
-MISC ChangeLog 13789 SHA256 112f59dafdd77f9b24b0b314ffc4046b5ebcea203b5f5544b29f70b379e4205e SHA512 9b217528882df035d61fa9b82fb63cc2bc8d6c7c73ab10529d34d8f781194bb6f05df430fe86f7f418b8d72d0d3446c219fa7cb8821e8b8559ca620258530d29 WHIRLPOOL 0c0201877eb61936e0874fd2de3371293ea049673a7b51a8012d4dd969b888d75472dd597b22cda44f55f177d6341ed979e9290f5cea860fb174be8911bfb101
+MISC ChangeLog 14059 SHA256 cb30c30be5b9540340e8e5d5fd34d6bb91d7813d579bf17c7ad68ac89ed1fdfc SHA512 4fed2e38a205754cbf943d88dc79322952d4a0ed0a6d316b0e2c85f40a6da3e6720fd9d0f52b00db5f2aeb7a95888c45d9c9ce75d7bca9d62d1817aea7918ff3 WHIRLPOOL 2e294679f66b11e189a6fd355ceece14830a3ade65c4abcefa73d9737500e43e9d83f9b22123599467b00c61b46b3b1a537d94445599f7daca1a319ca4f23e46
 MISC ChangeLog-2011 100599 SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8 SHA512 4181ba9d965139ba58218da5b960c87b7a611b27606a1ab1ce1b4c3c9255b4e0e2947307cbfffc531f0f8b6b545ee11e083fcb29dc7b2b7ba31c6bb40b8ab128 WHIRLPOOL 4ceebb6a6ed58b906d3a7331795748ac6e4fe2e1401bcccae9024a8e81e2c444aebc5fec610398cfe6002354ad3b10487484598da5091867874727f07e239c56
 MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFOWc4ACgkQC77qH+pIQ6QPuwD5AUsZZSlMXOISr2h88V3vXTzU
-wgTzASuJpOGno1lKWR4A/1hhRV1MVvb3dVrd5Ua1d0Zw4ChECvGS6ae9ekXGDcjM
-=ZjJG
+iQIcBAEBCAAGBQJRUhROAAoJELEHsLL7fEFWA7QP/3jcU7soMAAEDsPNetNLo1MY
+qMsAjbVGaw3zhfYlBHna5WwlpEQ8xNz0bfQXAxPogWBMgxgyQSEP8IYQx98+aU/Q
+EgxMTTIUqvZK6UNoEA+32HBSmDOivhjO9jUvn3M4pt7nJzM5FjL3G1Kc/LL7SFmR
+Z3ICPstj/GAiyIpfl88TrknnOweUVovlJqbhdF+bStidO8zy7aHfg6EINul0lZu/
+TJXGcJYfKwIfcBnwhnh7vf54scqXOvZSnYx6CmTZBM73kQMY7kr+khrHcBpmeZL9
+1NQM9RvvSSrp9UKrbNdCE1ktOMWxgcvBhpBzYJ5WrtrKTYkyQuJU7ewPmbIWBfzm
+8Hgof3WdM6C6Rbgve0yiY33mGlMOZ4lJ+F0OWiXdYi+HZyiPYfoz5p0Ha1jZzsLg
+6ZavqEM2n+8hrOcLgvoZ0xdteset1NSo927YiGbUdDJsByALcnxGYHx8r7PIQ/q3
+NNB336DBONOdghnnJGWafxaY08fbETCPt4qGoDv8pgV8nLp/2Hq7e+FV6Axoikkt
+xjQQFNKuBTpK6OydbJIdDL2PZDQ0O6nc4Ym22+SD9xa0g1bYUfiJREePOQo4kV2t
+IDUqkZHznESpnaX4x2VCOytIcKe5H+Br5q6E7iCOb++Ru8CA6LE1xZC3usWehdkO
+mArDCRtama4jDusq4KGx
+=7c4Z
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.6.8-r1.ebuild b/dev-lang/python/python-2.6.8-r1.ebuild
index 8744e64af9f8..30349ffd90ce 100644
--- a/dev-lang/python/python-2.6.8-r1.ebuild
+++ b/dev-lang/python/python-2.6.8-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild,v 1.13 2013/03/23 13:28:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild,v 1.14 2013/03/26 21:29:32 vapier Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
 WANT_LIBTOOL="none"
 
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
 
 MY_P="Python-${PV}"
 PATCHSET_REVISION="0"
@@ -151,17 +151,21 @@ src_configure() {
 		use hardened && replace-flags -O3 -O2
 	fi
 
+	# Run the configure scripts in parallel.
+	multijob_init
+
+	mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
+
 	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
-			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
-			Makefile.pre.in || die "sed failed"
+		(
+		multijob_child_init
+		cd "${WORKDIR}"/${CBUILD} >/dev/null
+		OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
+		"${S}"/configure \
+			--{build,host}=${CBUILD} \
+			|| die "cross-configure failed"
+		) &
+		multijob_post_fork
 	fi
 
 	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
@@ -175,7 +179,9 @@ src_configure() {
 	# Please query BSD team before removing this!
 	append-ldflags "-L."
 
-	OPT="" econf \
+	cd "${WORKDIR}"/${CHOST}
+	ECONF_SOURCE=${S} OPT="" \
+	econf \
 		--with-fpectl \
 		--enable-shared \
 		$(use_enable ipv6) \
@@ -185,9 +191,41 @@ src_configure() {
 		--mandir='${prefix}/share/man' \
 		--with-libc="" \
 		--with-system-ffi
+
+	if tc-is-cross-compiler; then
+		# Modify the Makefile.pre so we don't regen for the host/ one.
+		# We need to link the host python programs into $PWD and run
+		# them from here because the distutils sysconfig module will
+		# parse Makefile/etc... from argv[0], and we need it to pick
+		# up the target settings, not the host ones.
+		sed -i \
+			-e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
+			-e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
+			-e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
+			Makefile{.pre,} || die "sed failed"
+	fi
+
+	multijob_finish
 }
 
 src_compile() {
+	if tc-is-cross-compiler; then
+		cd "${WORKDIR}"/${CBUILD}
+		# Disable as many modules as possible -- but we need a few to install.
+		PYTHON_DISABLE_MODULES=$(
+			sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \
+				egrep -v '(unicodedata|time|cStringIO|_struct|binascii)'
+		) \
+		PTHON_DISABLE_SSL="1" \
+		SYSROOT= \
+		emake || die "cross-make failed"
+		# See comment in src_configure about these.
+		ln python ../${CHOST}/hostpython || die
+		ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
+		ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die
+	fi
+
+	cd "${WORKDIR}"/${CHOST}
 	default
 
 	# Work around bug 329499. See also bug 413751.
@@ -201,11 +239,13 @@ src_test() {
 		return
 	fi
 
+	cd "${WORKDIR}"/${CHOST}
+
 	# Skip failing tests.
 	local skipped_tests="distutils tcl"
 
 	for test in ${skipped_tests}; do
-		mv Lib/test/test_${test}.py "${T}"
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
 	done
 
 	# Rerun failed tests in verbose mode (regrtest -w).
@@ -213,7 +253,7 @@ src_test() {
 	local result="$?"
 
 	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" Lib/test
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
 	done
 
 	elog "The following tests have been skipped:"
@@ -237,6 +277,7 @@ src_install() {
 
 	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
 
+	cd "${WORKDIR}"/${CHOST}
 	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
 
 	# Backwards compat with Gentoo divergence.
@@ -261,11 +302,11 @@ src_install() {
 	use threads || rm -fr "${libdir}/multiprocessing"
 	use wininst || rm -f "${libdir})/distutils/command/"wininst-*.exe
 
-	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins -r Tools || die "doins failed"
+		doins -r "${S}"/Tools || die "doins failed"
 	fi
 
 	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
diff --git a/dev-lang/python/python-2.7.3-r3.ebuild b/dev-lang/python/python-2.7.3-r3.ebuild
index 9cde17d191a9..a8ac14ead5d7 100644
--- a/dev-lang/python/python-2.7.3-r3.ebuild
+++ b/dev-lang/python/python-2.7.3-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild,v 1.15 2013/03/23 13:28:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild,v 1.16 2013/03/26 21:29:32 vapier Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
 WANT_LIBTOOL="none"
 
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
 
 MY_P="Python-${PV}"
 PATCHSET_REVISION="1"
@@ -154,17 +154,21 @@ src_configure() {
 		use hardened && replace-flags -O3 -O2
 	fi
 
+	# Run the configure scripts in parallel.
+	multijob_init
+
+	mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
+
 	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
-			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
-			Makefile.pre.in || die "sed failed"
+		(
+		multijob_child_init
+		cd "${WORKDIR}"/${CBUILD} >/dev/null
+		OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
+		"${S}"/configure \
+			--{build,host}=${CBUILD} \
+			|| die "cross-configure failed"
+		) &
+		multijob_post_fork
 
 		# The configure script assumes it's buggy when cross-compiling.
 		export ac_cv_buggy_getaddrinfo=no
@@ -190,7 +194,9 @@ src_configure() {
 		dbmliborder+="${dbmliborder:+:}bdb"
 	fi
 
-	OPT="" econf \
+	cd "${WORKDIR}"/${CHOST}
+	ECONF_SOURCE=${S} OPT="" \
+	econf \
 		--with-fpectl \
 		--enable-shared \
 		$(use_enable ipv6) \
@@ -203,9 +209,41 @@ src_configure() {
 		--enable-loadable-sqlite-extensions \
 		--with-system-expat \
 		--with-system-ffi
+
+	if tc-is-cross-compiler; then
+		# Modify the Makefile.pre so we don't regen for the host/ one.
+		# We need to link the host python programs into $PWD and run
+		# them from here because the distutils sysconfig module will
+		# parse Makefile/etc... from argv[0], and we need it to pick
+		# up the target settings, not the host ones.
+		sed -i \
+			-e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
+			-e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
+			-e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
+			Makefile{.pre,} || die "sed failed"
+	fi
+
+	multijob_finish
 }
 
 src_compile() {
+	if tc-is-cross-compiler; then
+		cd "${WORKDIR}"/${CBUILD}
+		# Disable as many modules as possible -- but we need a few to install.
+		PYTHON_DISABLE_MODULES=$(
+			sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \
+				egrep -v '(unicodedata|time|cStringIO|_struct|binascii)'
+		) \
+		PTHON_DISABLE_SSL="1" \
+		SYSROOT= \
+		emake || die "cross-make failed"
+		# See comment in src_configure about these.
+		ln python ../${CHOST}/hostpython || die
+		ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
+		ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die
+	fi
+
+	cd "${WORKDIR}"/${CHOST}
 	default
 
 	# Work around bug 329499. See also bug 413751.
@@ -219,11 +257,13 @@ src_test() {
 		return
 	fi
 
+	cd "${WORKDIR}"/${CHOST}
+
 	# Skip failing tests.
 	local skipped_tests="distutils gdb"
 
 	for test in ${skipped_tests}; do
-		mv Lib/test/test_${test}.py "${T}"
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
 	done
 
 	# Rerun failed tests in verbose mode (regrtest -w).
@@ -231,7 +271,7 @@ src_test() {
 	local result="$?"
 
 	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" Lib/test
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
 	done
 
 	elog "The following tests have been skipped:"
@@ -255,6 +295,7 @@ src_install() {
 
 	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
 
+	cd "${WORKDIR}"/${CHOST}
 	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
 
 	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
@@ -280,16 +321,16 @@ src_install() {
 	use threads || rm -fr "${libdir}/multiprocessing"
 	use wininst || rm -f "${libdir})/distutils/command/"wininst-*.exe
 
-	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins -r Tools || die "doins failed"
+		doins -r "${S}"/Tools || die "doins failed"
 	fi
 	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
 	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
 		emake --no-print-directory -s -f - 2>/dev/null)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
 
 	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
 	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
diff --git a/dev-lang/python/python-3.1.5-r1.ebuild b/dev-lang/python/python-3.1.5-r1.ebuild
index 4fe36f2fc607..4990cf636e07 100644
--- a/dev-lang/python/python-3.1.5-r1.ebuild
+++ b/dev-lang/python/python-3.1.5-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild,v 1.13 2013/03/23 13:28:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild,v 1.14 2013/03/26 21:29:32 vapier Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
 WANT_LIBTOOL="none"
 
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
 
 MY_P="Python-${PV}"
 PATCHSET_REVISION="0"
@@ -123,17 +123,21 @@ src_configure() {
 		use hardened && replace-flags -O3 -O2
 	fi
 
+	# Run the configure scripts in parallel.
+	multijob_init
+
+	mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
+
 	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
-			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
-			Makefile.pre.in || die "sed failed"
+		(
+		multijob_child_init
+		cd "${WORKDIR}"/${CBUILD} >/dev/null
+		OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
+		"${S}"/configure \
+			--{build,host}=${CBUILD} \
+			|| die "cross-configure failed"
+		) &
+		multijob_post_fork
 	fi
 
 	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
@@ -152,7 +156,9 @@ src_configure() {
 		dbmliborder+="${dbmliborder:+:}gdbm"
 	fi
 
-	OPT="" econf \
+	cd "${WORKDIR}"/${CHOST}
+	ECONF_SOURCE=${S} OPT="" \
+	econf \
 		--with-fpectl \
 		--enable-shared \
 		$(use_enable ipv6) \
@@ -164,9 +170,41 @@ src_configure() {
 		--with-dbmliborder="${dbmliborder}" \
 		--with-libc="" \
 		--with-system-ffi
+
+	if tc-is-cross-compiler; then
+		# Modify the Makefile.pre so we don't regen for the host/ one.
+		# We need to link the host python programs into $PWD and run
+		# them from here because the distutils sysconfig module will
+		# parse Makefile/etc... from argv[0], and we need it to pick
+		# up the target settings, not the host ones.
+		sed -i \
+			-e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
+			-e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
+			-e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
+			Makefile{.pre,} || die "sed failed"
+	fi
+
+	multijob_finish
 }
 
 src_compile() {
+	if tc-is-cross-compiler; then
+		cd "${WORKDIR}"/${CBUILD}
+		# Disable as many modules as possible -- but we need a few to install.
+		PYTHON_DISABLE_MODULES=$(
+			sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \
+				egrep -v '(unicodedata|time|cStringIO|_struct|binascii)'
+		) \
+		PTHON_DISABLE_SSL="1" \
+		SYSROOT= \
+		emake || die "cross-make failed"
+		# See comment in src_configure about these.
+		ln python ../${CHOST}/hostpython || die
+		ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
+		ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die
+	fi
+
+	cd "${WORKDIR}"/${CHOST}
 	default
 
 	# Work around bug 329499. See also bug 413751.
@@ -185,11 +223,13 @@ src_test() {
 		return
 	fi
 
+	cd "${WORKDIR}"/${CHOST}
+
 	# Skip failing tests.
 	local skipped_tests="distutils"
 
 	for test in ${skipped_tests}; do
-		mv Lib/test/test_${test}.py "${T}"
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
 	done
 
 	# Rerun failed tests in verbose mode (regrtest -w).
@@ -197,7 +237,7 @@ src_test() {
 	local result="$?"
 
 	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" Lib/test
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
 	done
 
 	elog "The following tests have been skipped:"
@@ -217,6 +257,7 @@ src_test() {
 src_install() {
 	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
 
+	cd "${WORKDIR}"/${CHOST}
 	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
 
 	# Backwards compat with Gentoo divergence.
@@ -239,11 +280,11 @@ src_install() {
 	use threads || rm -fr "${libdir}/multiprocessing"
 	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
 
-	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins -r Tools || die "doins failed"
+		doins -r "${S}"/Tools || die "doins failed"
 	fi
 
 	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
diff --git a/dev-lang/python/python-3.2.3-r2.ebuild b/dev-lang/python/python-3.2.3-r2.ebuild
index 3f8652747e3d..7ab96b9c15aa 100644
--- a/dev-lang/python/python-3.2.3-r2.ebuild
+++ b/dev-lang/python/python-3.2.3-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild,v 1.16 2013/03/23 13:28:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild,v 1.17 2013/03/26 21:29:32 vapier Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
 WANT_LIBTOOL="none"
 
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
 
 MY_P="Python-${PV}"
 PATCHSET_REVISION="0"
@@ -137,17 +137,21 @@ src_configure() {
 		use hardened && replace-flags -O3 -O2
 	fi
 
+	# Run the configure scripts in parallel.
+	multijob_init
+
+	mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
+
 	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
-			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
-			Makefile.pre.in || die "sed failed"
+		(
+		multijob_child_init
+		cd "${WORKDIR}"/${CBUILD} >/dev/null
+		OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
+		"${S}"/configure \
+			--{build,host}=${CBUILD} \
+			|| die "cross-configure failed"
+		) &
+		multijob_post_fork
 
 		# The configure script assumes it's buggy when cross-compiling.
 		export ac_cv_buggy_getaddrinfo=no
@@ -170,7 +174,9 @@ src_configure() {
 		dbmliborder+="${dbmliborder:+:}gdbm"
 	fi
 
-	OPT="" econf \
+	cd "${WORKDIR}"/${CHOST}
+	ECONF_SOURCE=${S} OPT="" \
+	econf \
 		--with-fpectl \
 		--enable-shared \
 		$(use_enable ipv6) \
@@ -184,9 +190,41 @@ src_configure() {
 		--enable-loadable-sqlite-extensions \
 		--with-system-expat \
 		--with-system-ffi
+
+	if tc-is-cross-compiler; then
+		# Modify the Makefile.pre so we don't regen for the host/ one.
+		# We need to link the host python programs into $PWD and run
+		# them from here because the distutils sysconfig module will
+		# parse Makefile/etc... from argv[0], and we need it to pick
+		# up the target settings, not the host ones.
+		sed -i \
+			-e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
+			-e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
+			-e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
+			Makefile{.pre,} || die "sed failed"
+	fi
+
+	multijob_finish
 }
 
 src_compile() {
+	if tc-is-cross-compiler; then
+		cd "${WORKDIR}"/${CBUILD}
+		# Disable as many modules as possible -- but we need a few to install.
+		PYTHON_DISABLE_MODULES=$(
+			sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \
+				egrep -v '(unicodedata|time|cStringIO|_struct|binascii)'
+		) \
+		PTHON_DISABLE_SSL="1" \
+		SYSROOT= \
+		emake || die "cross-make failed"
+		# See comment in src_configure about these.
+		ln python ../${CHOST}/hostpython || die
+		ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
+		ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die
+	fi
+
+	cd "${WORKDIR}"/${CHOST}
 	emake CPPFLAGS="" CFLAGS="" LDFLAGS="" || die "emake failed"
 
 	# Work around bug 329499. See also bug 413751.
@@ -200,11 +238,13 @@ src_test() {
 		return
 	fi
 
+	cd "${WORKDIR}"/${CHOST}
+
 	# Skip failing tests.
 	local skipped_tests="gdb"
 
 	for test in ${skipped_tests}; do
-		mv Lib/test/test_${test}.py "${T}"
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
 	done
 
 	# Rerun failed tests in verbose mode (regrtest -w).
@@ -212,7 +252,7 @@ src_test() {
 	local result="$?"
 
 	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" Lib/test
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
 	done
 
 	elog "The following tests have been skipped:"
@@ -232,6 +272,7 @@ src_test() {
 src_install() {
 	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
 
+	cd "${WORKDIR}"/${CHOST}
 	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
 
 	sed \
@@ -256,17 +297,17 @@ src_install() {
 	use threads || rm -fr "${libdir}/multiprocessing"
 	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
 
-	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		find Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r Tools || die "doins failed"
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools || die "doins failed"
 	fi
 	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
 	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
 		emake --no-print-directory -s -f - 2>/dev/null)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
 
 	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
 	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
diff --git a/dev-lang/python/python-3.3.0-r1.ebuild b/dev-lang/python/python-3.3.0-r1.ebuild
index 65161d865a1f..84865b5fc536 100644
--- a/dev-lang/python/python-3.3.0-r1.ebuild
+++ b/dev-lang/python/python-3.3.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild,v 1.10 2013/03/24 01:41:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild,v 1.11 2013/03/26 21:29:32 vapier Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
 WANT_LIBTOOL="none"
 
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
 
 MY_P="Python-${PV}"
 PATCHSET_REVISION="1"
@@ -129,17 +129,21 @@ src_configure() {
 		use hardened && replace-flags -O3 -O2
 	fi
 
+	# Run the configure scripts in parallel.
+	multijob_init
+
+	mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
+
 	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
-			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
-			Makefile.pre.in || die "sed failed"
+		(
+		multijob_child_init
+		cd "${WORKDIR}"/${CBUILD} >/dev/null
+		OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
+		"${S}"/configure \
+			--{build,host}=${CBUILD} \
+			|| die "cross-configure failed"
+		) &
+		multijob_post_fork
 
 		# The configure script assumes it's buggy when cross-compiling.
 		export ac_cv_buggy_getaddrinfo=no
@@ -162,7 +166,9 @@ src_configure() {
 		dbmliborder+="${dbmliborder:+:}gdbm"
 	fi
 
-	OPT="" econf \
+	cd "${WORKDIR}"/${CHOST}
+	ECONF_SOURCE=${S} OPT="" \
+	econf \
 		--with-fpectl \
 		--enable-shared \
 		$(use_enable ipv6) \
@@ -175,9 +181,41 @@ src_configure() {
 		--enable-loadable-sqlite-extensions \
 		--with-system-expat \
 		--with-system-ffi
+
+	if tc-is-cross-compiler; then
+		# Modify the Makefile.pre so we don't regen for the host/ one.
+		# We need to link the host python programs into $PWD and run
+		# them from here because the distutils sysconfig module will
+		# parse Makefile/etc... from argv[0], and we need it to pick
+		# up the target settings, not the host ones.
+		sed -i \
+			-e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
+			-e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
+			-e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
+			Makefile{.pre,} || die "sed failed"
+	fi
+
+	multijob_finish
 }
 
 src_compile() {
+	if tc-is-cross-compiler; then
+		cd "${WORKDIR}"/${CBUILD}
+		# Disable as many modules as possible -- but we need a few to install.
+		PYTHON_DISABLE_MODULES=$(
+			sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \
+				egrep -v '(unicodedata|time|cStringIO|_struct|binascii)'
+		) \
+		PTHON_DISABLE_SSL="1" \
+		SYSROOT= \
+		emake || die "cross-make failed"
+		# See comment in src_configure about these.
+		ln python ../${CHOST}/hostpython || die
+		ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
+		ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die
+	fi
+
+	cd "${WORKDIR}"/${CHOST}
 	emake CPPFLAGS="" CFLAGS="" LDFLAGS="" || die "emake failed"
 
 	# Work around bug 329499. See also bug 413751.
@@ -191,11 +229,13 @@ src_test() {
 		return
 	fi
 
+	cd "${WORKDIR}"/${CHOST}
+
 	# Skip failing tests.
 	local skipped_tests="gdb"
 
 	for test in ${skipped_tests}; do
-		mv Lib/test/test_${test}.py "${T}"
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
 	done
 
 	# Rerun failed tests in verbose mode (regrtest -w).
@@ -203,7 +243,7 @@ src_test() {
 	local result="$?"
 
 	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" Lib/test
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
 	done
 
 	elog "The following tests have been skipped:"
@@ -223,6 +263,7 @@ src_test() {
 src_install() {
 	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
 
+	cd "${WORKDIR}"/${CHOST}
 	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
 
 	sed \
@@ -247,17 +288,17 @@ src_install() {
 	use threads || rm -fr "${libdir}/multiprocessing"
 	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
 
-	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		find Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r Tools || die "doins failed"
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools || die "doins failed"
 	fi
 	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
 	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
 		emake --no-print-directory -s -f - 2>/dev/null)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
 
 	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
 	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"