Use run_in_build_dir. Add python-3.3 support wrt bug #455020.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

3 files changed, 19 insertions, 29 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 3dd772a71d6b..5e44cb75707c 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.207 2013/01/29 18:44:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.208 2013/02/04 16:22:32 kensington Exp $
+
+  04 Feb 2013; Michael Palimaka <kensington@gentoo.org> PyQt4-4.9.6-r2.ebuild:
+  Use run_in_build_dir. Add python-3.3 support wrt bug #455020.
 
 *PyQt4-4.9.6-r2 (29 Jan 2013)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 06b462c56772..169e8690b0b2 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -8,18 +8,18 @@ DIST PyQt-x11-gpl-4.9.4.tar.gz 9801300 SHA256 29416e9b2dd394d39c3034e103717a40b9
 DIST PyQt-x11-gpl-4.9.6.tar.gz 9349834 SHA256 a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d SHA512 1d0ca00d529f67d33e51b947b9e2c49a64611a842f1a78220c9390afd1657e909451d9b758d0c008b6efbba7ed047f18ca41323e4db2269d685b9d2400a604aa WHIRLPOOL fd9e2339014e2cce9c4106f92593abca3d71881c57a90e6084a08fdc55213cd640723b988fa792bf4e20e448fb7f6fc43fb72bb45fb7c81bf5819684620ad4ae
 EBUILD PyQt4-4.9.4-r1.ebuild 5742 SHA256 601ced757792b9e858a0c4ad69a5aa5ccb6fd961c791f681de8ad2469db0b83b SHA512 294287e228c70a3ca41b52cfeebc7e35b121aeea46ce6c84ead7e9239f1cd2a15d195535376306f917a9b51a9936a8b48c1c985410cd1b402f1be80f5a001820 WHIRLPOOL 6ff0cb2300333730e50222b00bc2f1b3ff66f03e379e33872214df44be9773b324645964aee7a1ff87d1140187e7737dd3f1892163fdc70c88d00b94bed52de2
 EBUILD PyQt4-4.9.6-r1.ebuild 5409 SHA256 0fc73c6d4e14621a63832485886e72e721509c6f4ad48e3f58ca9c01024ea78f SHA512 341cdd8b98b71bbec23d900f9415650d89cb342dc1131faf624dcc2b2dd82fc3d16b2a51755cbdb52569702ad0a03b97b36730449da8562ac1bfa5420615cf61 WHIRLPOOL cffb492e02a92e500f8003d9df459783290e3550a42bb580b67f2e28c1f84e69fd3cddf031e3ccef04d9d20f0be4e749867d93aad62a0dd9cb1e6cb6f376a8db
-EBUILD PyQt4-4.9.6-r2.ebuild 5503 SHA256 7a10503c660c6b8fac25651f1c09f4e1a0ab2827e3f0fd3893bf0c27b5d13055 SHA512 44604cc92bcee93564c0c8536d2e6ee08b11af107e9f3f3caf4235dabd12060fbbf6dd4812d431398873df0cfdc1888adeeb1c976d7d4e91b57554a2b0a8858a WHIRLPOOL 2471e9a3fbd7497b6284d5b2da5306190e9216428a64b46288ff8ab919d77262a8d56a10aea7756d159c951fe39e2ac0eb537b7396e31b534e45f8965f99af74
+EBUILD PyQt4-4.9.6-r2.ebuild 5323 SHA256 a873d3aab44913ffdfe752c731b2e850ae7ee6081d62d8646ab96574294ba0c4 SHA512 ef330c7a271556572310a77e0952f5f4ef34465f53e204676683b98ab042ab2e0b53bfc8820cbb34082ef04bd6def8745febdbc91675928e2eeb2f3aaeaaa5ae WHIRLPOOL ee247b17932d42884f0dba0f9b41bfa1498505a58e9862c51d0c53e8e73c8db12640495a7006dff052ad43f4de5a12e3b4084b9a6d0d9a67d316088daed33ae4
 EBUILD PyQt4-4.9.6.ebuild 5777 SHA256 83d708e29360ace76838a47a7c6c65e2bf52d580a485974d04f64c5dd4368ac8 SHA512 fc32778b2fdd722c49a95c61f8c0e4450f8953b9beba8d7fe5862d4b4ae56624dde4ce486e0e3790c002c5e9b4b99345c65658f26a088940d159886b65c5316f WHIRLPOOL 5bb620c8d34a813a0a5cc525715e0837e5bbb7fbd489c48bcf8d16948116c5fbd22d6bc1424ec6b269126f0b7f8ac8f34720c08b955c4f4301bf3bde13d737e2
-MISC ChangeLog 28969 SHA256 3b605a34401e96d5c94c411155caaf478f4c5e33938fe7e3188ddc8a866dfab1 SHA512 f330b633329c8d5396cb6f67f2ab4188d3fea921b2beb1837885b4c5dcd0f7cbc0f0244b8615aabde4d15f675b3d33c3e6a3c4f80d65f1b1cf98342cea032727 WHIRLPOOL a0e5db4435048f7c7bd60dc886ea0e906d9b2149559c1a2fc58bf18908813df577a6b23b703c9e634cb57467b158ff183992d00311c7f73ecccbf51b0539bace
+MISC ChangeLog 29113 SHA256 3b781c46994b43b87ca2a9927e44199b29a3f4ebd4884aedf498fa8a8b965cf7 SHA512 1d200c4e0482b786c7f6e6aed4785a3cf0a4401699b5a32d4f70b8de1d067b7b877ce6c3e43408c294c1104abe46a4e314df6603fa63c0d5ce8d045fb9f57faa WHIRLPOOL 35c0d103df0b4c1c081af31bcbdeead11bbc2ecc410e380660d5572b03a87d46ec95d33f42be481347d2ea03510a2c820014b0197bfd0598c59d944edbb71bf7
 MISC metadata.xml 1259 SHA256 6e84edc762013d947ce99abe16bc677889a2df354930daa460cac89c7719b972 SHA512 afed2276d4b93648b7706013cf6877cb7cfb1df94d42aa7dd26b902cbd2ccdc3e420e267aeb26d5899a8c69b4cd17909ee30e0b13982fd0f9c8e6c7b13362857 WHIRLPOOL a65b3dabe625baf77ecdaac2a00c36b5bf42bb2f310b5238bc975cee192f87531175d88e02cbe22db85121ac01d5a23df292db474350b87db038a373cb79cda1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRCBe2AAoJEMbwO6tnXQ0sUikH/3X3noYauUyaHAkB6ANJu5RZ
-7FkpA6aHU8PbWn7iBJKc0OzMej/Ceaf+wE39qWsGArqS7UPxCJJ/xCI2tPBri2IB
-uS5QD+LPBSzn8pasFt/fd+7mmYJT5d9e65laeQQB69yg+8h9KyD3L8+rNmugb1yt
-37pb+NB7q5N/g8yh4lmAnWlt3FacWGz6tUrTC5d+znATbRGIlU5IXY1bmUDPSYm9
-z8Ik2ub89vws2Uy4I4ja66kzXuMgvaO5Zos4a8hskdJf5ofYtl4v8AZsHlleUWyC
-UFdh7hrlXhBFmbJnb1BhOmcU3UYr30HTf04mzlM554wl5klV2GU65SctYLL0v5Y=
-=A3tO
+iQEcBAEBCAAGBQJRD+BLAAoJEMbwO6tnXQ0scV0H/1H4hJA+uzwQ/wDCR+1Z7Osy
+TspoTUMpM8DuJiEyNZE2p5Eg8mPAABvDHZRKfvjJo0b1lEoOnJIKxUOs7WTde03q
+lkj9GVbvuRGvezgJ0mLnWtIkE/7WGS7DYO78NKFhMu4QGZ1r+Pr/1TGF2SXBFfWJ
+x25gZQum+W2aiOT/RgBysKgBAPiZ+jFSwGv2ZNrlHi0vFhcFiZWRDoAI1ixldLXq
+OKaiDF674ygJYfm9hCy5/q+tHX711hnODUCCXKJ4EsTws7oB1Rf4CDCFiysZRfSb
+KY06u/py9pSRDE54rZ1gU7DRwihSYtwXPJgdqNB02LOTnX5yEjX4yMl6Cx9rk8M=
+=RN2H
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild b/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
index 0b86f9d32bb1..b16f765f4aee 100644
--- a/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.1 2013/01/29 18:44:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.2 2013/02/04 16:22:32 kensington Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 
 inherit eutils qt4-r2 python-r1 toolchain-funcs
 
@@ -87,15 +87,13 @@ src_prepare() {
 	python_copy_sources
 
 	preparation() {
-		pushd "${BUILD_DIR}" > /dev/null
 		if [[ ${EPYTHON} == python3.* ]]; then
 			rm -fr pyuic/uic/port_v2
 		else
 			rm -fr pyuic/uic/port_v3
 		fi
-		popd > /dev/null
 	}
-	python_foreach_impl preparation
+	python_foreach_impl run_in_build_dir preparation
 }
 
 pyqt4_use_enable() {
@@ -104,7 +102,6 @@ pyqt4_use_enable() {
 
 src_configure() {
 	configuration() {
-		pushd "${BUILD_DIR}" > /dev/null
 		local myconf=(
 			"${PYTHON}" configure.py
 			--confirm-license
@@ -173,32 +170,22 @@ src_configure() {
 			eqmake4 python.pro
 			popd > /dev/null || return
 		fi
-
-		popd > /dev/null
 	}
-	python_foreach_impl configuration
+	python_foreach_impl run_in_build_dir configuration
 }
 
 src_compile() {
-	compilation() {
-		pushd "${BUILD_DIR}" > /dev/null
-		default
-		popd > /dev/null
-	}
-	python_foreach_impl compilation
+	python_foreach_impl run_in_build_dir default
 }
 
 src_install() {
 	installation() {
-		pushd "${BUILD_DIR}" > /dev/null
 		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
 		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-		popd > /dev/null
-
 		mv "${ED}"/usr/bin/pyuic4{,-${EPYTHON}} || die
 		python_optimize
 	}
-	python_foreach_impl installation
+	python_foreach_impl run_in_build_dir installation
 
 	dosym python-exec /usr/bin/pyuic4
 	dodoc NEWS THANKS