Added qt-xmlpatterns as dependency. Apply patch from but #267012

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 94 insertions, 2 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 6f1ef795c96c..7e5047593da9 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.53 2009/04/07 18:30:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.54 2009/04/26 21:39:55 hwoarang Exp $
+
+*PyQt4-4.4.4-r4 (26 Apr 2009)
+
+  26 Apr 2009; Markos Chandras <hwoarang@gentoo.org>
+  +files/PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch,
+  +PyQt4-4.4.4-r4.ebuild:
+  Adding qt-xmlpatterns as dependency. Add patch for QGraphicsProxyWidget (
+  thanks to Fabio Erculiani <lxnay@sabayonlinux.org> for providing the patch
+  ). Fixes bug #267012
 
 *PyQt4-4.4.4-r3 (07 Apr 2009)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index aed4e572bb4c..3acd29b3466c 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,3 +1,4 @@
+AUX PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch 1004 RMD160 5fa5609d31b53978846999be8045c75b940c3dd1 SHA1 a7122535d44bd8a81984870e98322b14521d2ced SHA256 db539a666d834756013fc48012914dd181116df7f5d1d21485ff947e20441eed
 AUX PyQt4-4.4_compile.patch 883 RMD160 016122f1e9cbf8c74da760fd094e280fd5ec0257 SHA1 b745edae97d52882b44a53461b98c96e11dbee20 SHA256 dc95ae5b5f7d07431d563c2035d68c6097b8f20dbb2285d2762066938c69e830
 AUX configure.py.patch 825 RMD160 fc52b91818c10c03233b61b6c5b12c7c54800e85 SHA1 698df8a4b3041eae84772a9e1f118939e1f3984e SHA256 507b6dc7cae3879323792c0e2746509cbab445ad0912c5be46ff53074437072e
 DIST PyQt-x11-gpl-4.4.4.tar.gz 6982063 RMD160 970bca082a93402b1986b4e8a14738575732e8ae SHA1 6b91a8020de10e807fa0d3db6b7a92029a17cf0b SHA256 fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
@@ -6,5 +7,6 @@ EBUILD PyQt4-4.4-r1.ebuild 1906 RMD160 f077a3006236ea7e3063afbef7ad583e2edbecab
 EBUILD PyQt4-4.4.4-r1.ebuild 2070 RMD160 cc81de744370f47f0324602084b9f15fd6a9c406 SHA1 bb45a403214ebc70f0cd1c68a84a72b1b7f835ae SHA256 127f3697cf1d8ed177c82b5baedcee7cfb4f4be70901b6d234007e8e1261b1d2
 EBUILD PyQt4-4.4.4-r2.ebuild 2053 RMD160 2e558121c9279e447a7d81c30343e05f66584343 SHA1 b128d8cc5e13de8326a7743b9c0c7b24455227bf SHA256 88ae962727bf120178c1ee79c314848df812934b71ba908a1ff4a12dc5027535
 EBUILD PyQt4-4.4.4-r3.ebuild 2088 RMD160 d25e7cea62f734c2ae559420e7d991d8e7c7e0da SHA1 364dd4834bfdbf6bcbee4c09ccf9e3c4aafbf235 SHA256 efedc37ce936261f82ae699658428c66fd774dda157d8f785f19d2304f1face6
-MISC ChangeLog 6804 RMD160 078f1ac16cf9a3469c46a7f670ab8e814291b5a2 SHA1 81307c2fe223477ab8055e9c3b6261586a8bdd3d SHA256 721c2bb49ed7ba0e67535462380ad1add54e301988168cd15c188ddcd7942d16
+EBUILD PyQt4-4.4.4-r4.ebuild 2203 RMD160 622b71d6e3c06d1373504bb1f1368739b4da478c SHA1 1e4a62b4e2e8b5dbbf2450b237b54718415d3c88 SHA256 bc81fe0a2e9b18ab83b847de66900ec58d69132fc48f9344adaf950bf46fd8e6
+MISC ChangeLog 7166 RMD160 163a8b72ae77d510ab7f3f52602d8f3b60827e52 SHA1 4b66493a882577fe8b98a08c090a8556db9004b7 SHA256 6411e11bb524724974914451e58aaa2e6d9f6e0026fbdb79dbdbb479c89b837f
 MISC metadata.xml 310 RMD160 7987a603f301bfeabb3463923b7494b5c94a9584 SHA1 05d2e20067db8b517dbdcafd91041a25bc432fb9 SHA256 a3bf6c3468371cba4c2bfa6f527df4f11bb32bdb2f3448cc2b9cb7ebb07e08fe
diff --git a/dev-python/PyQt4/PyQt4-4.4.4-r4.ebuild b/dev-python/PyQt4/PyQt4-4.4.4-r4.ebuild
new file mode 100644
index 000000000000..cb16c86eb042
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.4.4-r4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r4.ebuild,v 1.1 2009/04/26 21:39:55 hwoarang Exp $
+
+EAPI="2"
+
+inherit distutils qt4
+
+MY_P=PyQt-x11-gpl-${PV}
+
+DESCRIPTION="A set of Python bindings for the Qt toolkit"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/"
+SRC_URI="http://www.riverbankcomputing.com/static/Downloads/PyQt4/${MY_P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus debug doc examples opengl qt3support svg webkit X"
+
+RDEPEND=">=dev-python/sip-4.7.8
+	>=x11-libs/qt-core-4.4.2:4
+	>=x11-libs/qt-xmlpatterns-4.4.2:4
+	dbus? (	dev-python/dbus-python
+		>=x11-libs/qt-dbus-4.4.2:4 )
+	opengl? ( >=x11-libs/qt-opengl-4.4.2:4 )
+	svg? ( >=x11-libs/qt-svg-4.4.2:4 )
+	qt3support? ( >=x11-libs/qt-qt3support-4.4.2:4 )
+	webkit? ( >=x11-libs/qt-webkit-4.4.2:4 )
+	X? ( >=x11-libs/qt-gui-4.4.2:4 )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/configure.py.patch"
+	"${FILESDIR}/PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch"
+)
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e "s:^[ \t]*check_license():# check_license():" "${S}"/configure.py
+	sed -i -e "s:join(qt_dir, \"mkspecs\":join(\"/usr/share/qt4\",	\"mkspecs\":g" "${S}"/configure.py
+	sed -i -e "s:\"QT_INSTALL_HEADERS\"\:   os.path.join(qt_dir, \"include\":\"QT_INSTALL_HEADERS\"\:   os.path.join(qt_dir, \"include/qt4\":g" "${S}"/configure.py
+	sed -i -e "s:\"QT_INSTALL_LIBS\"\:      os.path.join(qt_dir, \"lib\":\"QT_INSTALL_LIBS\"\:      os.path.join(qt_dir, \"lib/qt4\":g" "${S}"/configure.py
+}
+
+src_configure() {
+	distutils_python_version
+	addpredict ${QTDIR}/etc/settings
+
+	local myconf="-d /usr/$(get_libdir)/python${PYVER}/site-packages -b /usr/bin -v /usr/share/sip"
+	use debug && myconf="${myconf} -u"
+
+	"${python}" configure.py ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install || die "install failed"
+	dodoc ChangeLog NEWS README THANKS
+	use doc && dohtml -r doc/html/*
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/PyQt4/files/PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch b/dev-python/PyQt4/files/PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch
new file mode 100644
index 000000000000..9c811b849ec5
--- /dev/null
+++ b/dev-python/PyQt4/files/PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch
@@ -0,0 +1,16 @@
+diff -Nurp PyQt-x11-gpl-4.4.4.orig/sip/QtGui/qgraphicsproxywidget.sip PyQt-x11-gpl-4.4.4/sip/QtGui/qgraphicsproxywidget.sip
+--- PyQt-x11-gpl-4.4.4.orig/sip/QtGui/qgraphicsproxywidget.sip	2008-11-08 12:55:56.000000000 +0100
++++ PyQt-x11-gpl-4.4.4/sip/QtGui/qgraphicsproxywidget.sip	2009-04-21 21:59:09.938689971 +0200
+@@ -87,6 +87,12 @@ protected:
+     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+     virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+     virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
++
++    virtual void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
++    virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
++    virtual void dragMoveEvent(QGraphicsSceneDragDropEvent *event);
++    virtual void dropEvent(QGraphicsSceneDragDropEvent *event);
++
+     virtual void wheelEvent(QGraphicsSceneWheelEvent *event);
+     virtual void keyPressEvent(QKeyEvent *event);
+     virtual void keyReleaseEvent(QKeyEvent *event);