[gentoo-commits] proj/qt:master commit in: dev-python/PyQt4/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     c5f33057f5a022f3a6fc80eb080eccf508a5ab47
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Mar 12 09:18:39 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 09:18:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c5f33057

[dev-python/PyQt4] Sync with portage.

Package-Manager: portage-2.2.0_alpha166

---
 dev-python/PyQt4/PyQt4-4.10.1_pre20130312.ebuild |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-python/PyQt4/PyQt4-4.10.1_pre20130312.ebuild b/dev-python/PyQt4/PyQt4-4.10.1_pre20130312.ebuild
index 24f1c1a..3f78ec3 100644
--- a/dev-python/PyQt4/PyQt4-4.10.1_pre20130312.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.10.1_pre20130312.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2013/02/15 08:07:48 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.ebuild,v 1.1 2013/03/12 09:12:18 pesa Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@@ -41,7 +41,7 @@ QT_PV="4.8.0:4"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/sip-4.14.2:=[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.14.3:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	X? (
 		>=dev-qt/qtgui-${QT_PV}[dbus?]
@@ -77,8 +77,10 @@ src_prepare() {
 	# Support qreal on arm architecture (bug 322349).
 	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
 
-	# Use proper include directory for phonon.
-	sed -i -e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
+	# Allow building against KDE's phonon (bug 433944 and others).
+	sed -i \
+		-e "s:VideoWidget()\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/qt4/QtGui\"]:" \
+		-e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
 		configure.py || die
 
 	if ! use dbus; then
@@ -172,7 +174,7 @@ src_configure() {
 			popd > /dev/null || return
 		fi
 	}
-	python_foreach_impl run_in_build_dir configuration
+	python_parallel_foreach_impl run_in_build_dir configuration
 }
 
 src_compile() {