Fix byte-compiling the installed epython module when installing a new Python version.

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

8 files changed, 73 insertions, 19 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index d476f8b042d3..71fdc20ef2d2 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.622 2012/11/30 13:25:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.623 2012/11/30 23:57:44 mgorny Exp $
+
+  30 Nov 2012; Michał Górny <mgorny@gentoo.org> python-2.5.4-r5.ebuild,
+  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:
+  Fix byte-compiling the installed epython module when installing a new Python
+  version.
 
 *python-2.7.3-r3 (30 Nov 2012)
 *python-3.3.0-r1 (30 Nov 2012)
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 245fda2a2010..f9ade488ecc6 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -25,27 +25,27 @@ DIST python-gentoo-patches-3.1.5-0.tar.bz2 16939 SHA256 ceacc96a370dfaa232d0a623
 DIST python-gentoo-patches-3.2.3-0.tar.bz2 14265 SHA256 2ad8829aa6594edc405afd0ed148a2b4b608d7c6f09ea90bfb90d87580a4784b SHA512 1ea0c8711ec5952a8c0bafeaceec0d8f8821123fe4f622626b57c6e0b1065c349885537b933a4ef22c29e6c8f6c44f44dec587892a2b13dbfe92ec342f16197d WHIRLPOOL b6f6a4d8e7dcafbf944266d1b5744c71568ddb0c21c5b54c5e041ef8bfd5e1fc5a1e68fa3083d8a466182022a07ebe88d536a4742a5fe0443e5d73d5d4bc64ed
 DIST python-gentoo-patches-3.3.0-1.tar.bz2 11974 SHA256 bb2d066277a3802e6ea18eebddf42134b44cda25b5201b755628d497be28c488 SHA512 e0522c7924e8cf5af3ea42727d277e44691cc11926c77b8fdcdb21687a9ff1b2fa953bfc1b3cd8d3a01c8dea757735b1aadb3b7e0c804068763052316f7e7858 WHIRLPOOL 091b3c2b87e27a68ddba2e2076a20c25aaedc84055c1d336d93ccdc609cd06ab2eea8b17a34008d5eb27e8d9e5677dca8756aa4f06a6cb95329de912e9c06005
 EBUILD python-2.5.4-r4.ebuild 9900 SHA256 8acf8c08e6ef79524b548d30c0971f49ef3adf69c1d216d54f433dab00d42ab7 SHA512 ddd05933feeaabb7b2d5d15e3db74431163b38643b00955c27dedf3b08d8d39ee8e8737b852dca67b209aa045044d93c3b55ca1d6aa1c2a6fd7ded1bd5dc8ca4 WHIRLPOOL 31512099a4493bb1fa733651ae722f7e73c70ff543a26c2ade4f9ebba1039f380830f08c63ea1bd1b704e8a30e9e88cb36baad198d3cf63ca280c0edc519e101
-EBUILD python-2.5.4-r5.ebuild 9661 SHA256 c56424d7cc77dab2336107fa2a462801bf66e1e2299bcd25c12af1588a337141 SHA512 391a3df76035d8c13233396f537fb57d0cf662a62f2050849c0587a375993ac93e5cd4f6aaf27f5ac174c728b113b35c0b8c898a8e9ae97d7ae365c0f5be3775 WHIRLPOOL 1c5091a07ca25ceba6103908a7bf85eaec2e12540557f41994469a341d44378a7ba05eabd38849579d173a9a2288ddcd1f211c6781d35ff54cc3a6e4cb70891b
-EBUILD python-2.6.8-r1.ebuild 9238 SHA256 54f92cfbc6bb25bf541562fc22ab1cb78cc70779f749f1a0333dc24caca9c104 SHA512 558bd10c8856561606cd6110576b6ddd28620cf18906602389beaa796f9fb1387a9aee21efa2ce1c7da9cc25a570718f03dc6f77de6def7c151acc5ddac43d8a WHIRLPOOL df924a900df2b116d5638d57592cf22eadaa6df62e9d7c2ced84fcc9d79218ae26e0df96da3115fe3ea4b6260884ef6940d7d193943f9fe2025daae610aec06a
+EBUILD python-2.5.4-r5.ebuild 9865 SHA256 12bdc6fb7f45f62059aff60899f525bae920d00520fcacea7bf6423f78dd90f1 SHA512 3bdf61b3d2e116d317d2bcce55492b704dc91d74a65e1f3096bec4ea3621e314e8aca403afdc16a704b56f2792d90ad8ef538f90fbc1a9ec2a06d0de3dda2b05 WHIRLPOOL 6129b874c8c00a41802e679e0622ff0dd33fb0b9fb66009c1b647b5549c63ed7b4d665570fb484a37ec86543ec70ffd10d892eade89fad539c655560a395b102
+EBUILD python-2.6.8-r1.ebuild 9442 SHA256 33938416806768e215f68553d01c59a03726a9c39d1d47677af1b3daf85de1e9 SHA512 f0e70286490dabba149d17709a56cf1214cbc8905d24103fafd8fe2b51877abd6f006618769e3904ff77812029c9d02bc722540dcf1c74ede902d9d9c5eeb6bf WHIRLPOOL 9066b366b8a5abd28aa205caed4d94972a0a337dedb703778230067accd7d1338cda0d74b1b367cff53c3df8cd3e202dacb43ac2780cff31c0c2126d34dfdedd
 EBUILD python-2.6.8.ebuild 9434 SHA256 5192994b217db28509225c2b35347a24af7ecd16330fe25f3f978382c79de52a SHA512 1b7fa17f0a25756d8e674b631c646c38dfa0d193fe1418dc1ca1728272ee42392a3ac66349549fcd0d87f624a084c14679c985d9178c7b3e48112905f298c3f9 WHIRLPOOL 4d698b2409a2ea6f788c017ddf3e33fd1b260e5a17b81ea353c2eedfc97c76b944aff3626415fef3668ff7ade381a461debcf587cc631ce4ca6b08b1166680a7
 EBUILD python-2.7.3-r2.ebuild 9754 SHA256 5af662c2cd3e985e8c3bcf32a5338911b3ab4e01793bf191c663ae9a8cf72d6d SHA512 c8db2dc3c2f6331dc459990d3b560fa8e5b61680cafc3f2c04cb0e097c31aa0b5e4d9eaf3f71a76a5c9c3ecb3ffd467abde1054a122e9efdca0b945dae73766e WHIRLPOOL 0c91c7dffd5a6ab67c049e03d6db8cfa4c7dd000fe054f88ad59bf266b5effce2d95cc6b7efd0365486f0f8a3f8e5f9b76f303054fc3832675b9123a18473c64
-EBUILD python-2.7.3-r3.ebuild 9538 SHA256 fe9be5ba6d3d21422896fe34e81780c6772c81d9b6982277205d1bdee3d681f3 SHA512 5f82f493369e223672207d6f9ab5d7db0e19a5fab4978cccc109d90279d7292f16e3c4790979187cecc8f007907480ef55d1f04ef7ab527ba8d7a9fffd3ca411 WHIRLPOOL 570d06a514ff7154b7c652d2aedf273b497fa3040b383c841836c068b72cea3c010cbfeabc6d2320f3000e4781fce110a00047ed87d32e6a66aa621d0c6afd09
-EBUILD python-3.1.5-r1.ebuild 8076 SHA256 5a50a42c600d1dbc55c7f9bf265e5da54c56350ad8019d722507f1f583cc9d38 SHA512 66aac1aa4967970dab7e442cc439337e3170e564d3cb36de5fcbe7aa2a734a5998a0cb3e50dcb7cdc69404c23b774d736c60ede15082e70120e44d9ee77524b5 WHIRLPOOL 0c47660735c53ceac2a02be34eea3260e4bf4fab3af2b2df983789138afb7a9c59f7b8a652a89948c05bd2c467dad0b5cf367db2fba34ec64529f37d490a6ebc
+EBUILD python-2.7.3-r3.ebuild 9742 SHA256 fae8cbc3b2c320940cb0c399e8fb24223dd005043effffde137682fdf67e5d27 SHA512 dda4a78cad3c86c8a99627a4021b192ea1096223e8f0d27a78ed8f2b00ff05d1bbc3d493448141002c34ffeacfe11e3d85c196a6e46166f2007f8b12fd16c55a WHIRLPOOL 1ecf12b03df10c1407d48de6a2c54e3a754a73d028083bf265aad0733c142e0fef8d1329c9fea5b1a3069ebff0d5ece02de34d78388337e0a98c0213a73b54cf
+EBUILD python-3.1.5-r1.ebuild 8280 SHA256 6a1373769c7126ab6adcbb0914d6c23248efccdd74fa8a76fd458c4f0a116675 SHA512 e5d180830563c31664f300f688fa07cd58bbf4172eed83950ae2aa75ba90e87002eba43f6e91b68bc7904b5b48fe486eab80980a3f4d695b1806808a9bc1cb76 WHIRLPOOL 29381e8f8aea21d830035ce74308516a5ea86e0bf438ffe83c3de437df0ad1f4f441666109c1824f9f300bdf6c72d83ff695dc9ab8f49d496c95a0224fbcbc42
 EBUILD python-3.1.5.ebuild 8235 SHA256 0a9c9c102e7f7a32550250a8045d771ec2fee7f8b1c4116284ba343c8778c83f SHA512 9b5b3c9275914baed0138f119a63fe31bf6c2ad77367c386fe2d8571230947234cd22f5ac143f26b7279fa9c5b141b25a918d1432dfb526c157c89d5045020d2 WHIRLPOOL 2e39576d4f576b12d8f06a1c554fc532c9937ef6a020de728d736ad4da60d1d4e6eb73c981d3f7a06e935ee7756afa8df1c8f21927e0a64ea7f3641b83397d2f
 EBUILD python-3.2.3-r1.ebuild 8717 SHA256 f56283211c6680e935b1c5c6f360a6027196cd8192e1b1b45ee7f024f0403b09 SHA512 8f2f81f798177dfc09c609ad0bf6c488e95509b87c58ac94ce093035f72c838dff42510d6c2d295db4e5aa339c48792160588a1a215490ac3a26f07ad03f0aef WHIRLPOOL 5093dd636b764c0dd4761cbd8bbaaa44300090b66c2ac5e1229b2a123a9d9f8323c8b1e1363849c2a658747391dd9b2e0fecc612bf2f0b0bf93dbdd21215e98d
-EBUILD python-3.2.3-r2.ebuild 8550 SHA256 8de9ff24979a3227be77c7722b82b3275dac7bc8c70acd0b2bc7e3c10d9fd045 SHA512 5fc4ec24ea94dc0abff3347848a4e0e224663bf6839861fb6407a513e07f70a7fe7c9dbad2c86c40040ce402c78eebc4ea79783d1661625b98c79823912ad60b WHIRLPOOL 2804e9b270532f1ed333e7eca0918206a9b4c5317fcfe1667859918c793396ad554063783d6a469f21a349d6e2de9f40b02e92c8954892cdd06a6a2e3b8505b0
+EBUILD python-3.2.3-r2.ebuild 8754 SHA256 97bffd6db15dfea7e4c4d913f19828a96fa853ad888eb061d6ced9323dd23506 SHA512 a80384fba0775112d8bb33ebbc7796d4b82e886dd24a49251fa993992364f49fad082837aaeceadbc896c7895a27adb642c7659f64385274816780e576089487 WHIRLPOOL 0b67ae94542a45b37d33e99d90c496080ce9d6f4dd3d348245ccec6b8cec54fe226a8558f07e21c417160d52755d8e89a11adb4c95df779dfac85a9e8334fd9f
 EBUILD python-3.2.3.ebuild 8710 SHA256 c4994db3ce2262589a68b9ee61ae5aa5c650973a24e5a6f4932240a2f8d73dc4 SHA512 7c66fc64eb95c865d9eb9be6218a40455c45e845b4ac1f78e94df1e5d6a7fe7b8d7f201ee6f621882a435966c53534ea66676482e94ea5d7e7e987069d77448f WHIRLPOOL 397499e7106161a3199c3a3097426226bfb76ca9cec726bf673c754269a123e90af134ca5d79fc62510d2e73b75a471f54098534e603db5a26557d38a8a0ca76
-EBUILD python-3.3.0-r1.ebuild 8188 SHA256 b0487cb008f847410f1b61e9416a3d4daff3bf8579e8afccc2c66cfc5c14124b SHA512 5a2aee67081eeb08abe1b8b5eaa9936f9bb6594bd16ec81d6d46ff64318f3cdf349919e1dd95499d5ec6590cdbbc5c98f96c6a164c921a40ba87338dee85e83c WHIRLPOOL 856ac7651d62da5ffc65b702f985ff545827e0b868d3d9d5f852205bcde476cf59335d3517d08ea2fc2d1cfc575e18992585dbdee92cce4d2dee119ebea34944
+EBUILD python-3.3.0-r1.ebuild 8392 SHA256 a4ca084ac57af24150cd35693f2144dbb913a05e3120306014140c5885ff9dd3 SHA512 2a911dff2249b23d1631d1fea1b15c6fdd803df1ff79490475c53a766d726d6d1fabc0d0d9fef943dbe27cb476b0f2def248cd59aedaea4f02f92b5a43421efb WHIRLPOOL 2cf9c2b134dff88285fa0a3e218bfbf7d0e0c858b873ef86e2436ccbe9e1f4fa0e8e8db8fb1889e5611975b1bd93d07b1ed1fa9507462cd5467c5ba0790120de
 EBUILD python-3.3.0.ebuild 8339 SHA256 7ed60cb09463b2f56c9f796a4afad278cc09b2594051d8d5125c98d4d5ba988c SHA512 6512597ded770e07082f9f883c1dea0a3245264e04f31f8191a7c74bcda9b71ad085d254f57c0b7cd469caa02f1aefd9e75166adf6eea750ed76df56b73a9b20 WHIRLPOOL f61186f7d535fb41e183bc532612348923f413945c3e2a7a6933a96780d6769b5853826891d0aab63debe1e004bf04388b6552377841c8a5c3703165eb6e1cad
-MISC ChangeLog 9742 SHA256 3ac56d6a8e531ef99f6e86185e8320ef626f8cd1216e5214982165b80e5eb5e2 SHA512 378f89d4c470019746e032bb122ec9a2d5c61359c394adb9c6b23635d8a71c34215e418eb4a49e0113ed426a7775bb2423f9c1d72232a2e73ef0bca22466cd95 WHIRLPOOL 994f84628bb4002c945869436d2458e7d8c1895135139a82739dea061a318e504e5b27e8ce4e72e15aba28ef3a0d81921acef620be7137ed6ce6c6fdb56a380b
+MISC ChangeLog 10031 SHA256 283a37a7f45f18b5e82db6f44532c0689bb5073ded7ff918f3ba83177d26c2ab SHA512 2c54426c1d664c2ec68b622351739c93c211b52513cd2b06d3a73032e2ccb20c676c76f494f3442d713e4f371d427d1e556dcf037808df84d51170eb9ec3a4d8 WHIRLPOOL b812fff6f6768a5433155d8828065bfe482648661672fb6f004d0fb879b1e903ac0358e82ac79b3c735e45b18527ff299764b14c90db78ada700dcb03906b414
 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)
 
-iJwEAQEIAAYFAlC4s8YACgkQfXuS5UK5QB3gCwP/Rsh6DWzIqGH2B5H52gdE50SB
-jnXYWL5/CTeUYVy3qq5kYwD3j152Eyr3FViFMXRSanyEr6Eu9/BHXJAN7OvtKp4B
-qJfQ+7mszxJU3DMiCJ7wAhEngmI+X5F/LGLv2UUo5oJcCDrgO1Mnjldjv8vCm742
-PzZtt/MgZy4mie/6tLc=
-=YijW
+iJwEAQEIAAYFAlC5R/oACgkQfXuS5UK5QB09igP7BN6C82vykXQkQfYzDRU73YOd
+5npnlHFXeRNl9aKoK3ityNtlU0XqQpLhWmsaOTN6fAIsEFqYFT4zPQ7dvMDgja3d
+97DCebx/pAfYVilZj9L4AwwL88ZF0MiPq+x9oEZQH/g0/Lon6pnXhOqC1wpzAfc2
+p3SFsWg9n58duMpZfqU=
+=A2hh
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.5.4-r5.ebuild b/dev-lang/python/python-2.5.4-r5.ebuild
index 7af78dac418a..10a15b6d26b8 100644
--- a/dev-lang/python/python-2.5.4-r5.ebuild
+++ b/dev-lang/python/python-2.5.4-r5.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-lang/python/python-2.5.4-r5.ebuild,v 1.1 2012/11/30 13:25:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $
 
 EAPI="1"
 
@@ -274,6 +274,14 @@ src_install() {
 
 	# for python-exec
 	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python \
+			LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+		export LD_LIBRARY_PATH
+	fi
+
 	echo "EPYTHON='${EPYTHON}'" > epython.py
 	python_domodule epython.py
 }
diff --git a/dev-lang/python/python-2.6.8-r1.ebuild b/dev-lang/python/python-2.6.8-r1.ebuild
index 0b70c963e050..54f109996e9f 100644
--- a/dev-lang/python/python-2.6.8-r1.ebuild
+++ b/dev-lang/python/python-2.6.8-r1.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-lang/python/python-2.6.8-r1.ebuild,v 1.1 2012/11/30 13:25:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -271,6 +271,14 @@ src_install() {
 
 	# for python-exec
 	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python \
+			LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+		export LD_LIBRARY_PATH
+	fi
+
 	echo "EPYTHON='${EPYTHON}'" > epython.py
 	python_domodule epython.py
 }
diff --git a/dev-lang/python/python-2.7.3-r3.ebuild b/dev-lang/python/python-2.7.3-r3.ebuild
index 100f3de33d93..fc0ae67165fb 100644
--- a/dev-lang/python/python-2.7.3-r3.ebuild
+++ b/dev-lang/python/python-2.7.3-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-lang/python/python-2.7.3-r3.ebuild,v 1.1 2012/11/30 13:25:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -286,6 +286,14 @@ src_install() {
 
 	# for python-exec
 	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python \
+			LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+		export LD_LIBRARY_PATH
+	fi
+
 	echo "EPYTHON='${EPYTHON}'" > epython.py
 	python_domodule epython.py
 }
diff --git a/dev-lang/python/python-3.1.5-r1.ebuild b/dev-lang/python/python-3.1.5-r1.ebuild
index 4d7ed5bc6029..dd99c5e5eb94 100644
--- a/dev-lang/python/python-3.1.5-r1.ebuild
+++ b/dev-lang/python/python-3.1.5-r1.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-lang/python/python-3.1.5-r1.ebuild,v 1.1 2012/11/30 13:25:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -249,6 +249,14 @@ src_install() {
 
 	# for python-exec
 	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python \
+			LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+		export LD_LIBRARY_PATH
+	fi
+
 	echo "EPYTHON='${EPYTHON}'" > epython.py
 	python_domodule epython.py
 }
diff --git a/dev-lang/python/python-3.2.3-r2.ebuild b/dev-lang/python/python-3.2.3-r2.ebuild
index dabc6a50bd9e..7a430b619011 100644
--- a/dev-lang/python/python-3.2.3-r2.ebuild
+++ b/dev-lang/python/python-3.2.3-r2.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-lang/python/python-3.2.3-r2.ebuild,v 1.1 2012/11/30 13:25:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -263,6 +263,14 @@ src_install() {
 
 	# for python-exec
 	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python \
+			LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+		export LD_LIBRARY_PATH
+	fi
+
 	echo "EPYTHON='${EPYTHON}'" > epython.py
 	python_domodule epython.py
 }
diff --git a/dev-lang/python/python-3.3.0-r1.ebuild b/dev-lang/python/python-3.3.0-r1.ebuild
index 048c56a18e04..ea6a161b0efb 100644
--- a/dev-lang/python/python-3.3.0-r1.ebuild
+++ b/dev-lang/python/python-3.3.0-r1.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-lang/python/python-3.3.0-r1.ebuild,v 1.1 2012/11/30 13:25:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -253,6 +253,14 @@ src_install() {
 
 	# for python-exec
 	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python \
+			LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+		export LD_LIBRARY_PATH
+	fi
+
 	echo "EPYTHON='${EPYTHON}'" > epython.py
 	python_domodule epython.py
 }