Revision bump, add patch that fixes compilation with PyKDE 4.5.2

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

4 files changed, 219 insertions, 12 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 1f1f2b1fef20..64664854df33 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.129 2010/09/21 12:14:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.130 2010/10/06 11:05:05 tampakrap Exp $
+
+*PyQt4-4.7.7-r1 (06 Oct 2010)
+
+  06 Oct 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  +PyQt4-4.7.7-r1.ebuild, +files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff:
+  Revision bump, add patch that fixes compilation with PyKDE 4.5.2
 
 *PyQt4-4.7.7 (21 Sep 2010)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index c0bc022c4d6b..9751b5254704 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX PyQt4-4.5.4-qgraphicslinearlayout-fix.patch 572 RMD160 81e80c650ef118a7fe9b1a0c581117774552daa7 SHA1 90980166dbe91f4b8e32b82736c92761547c2126 SHA256 b489794c26b1884971dc4bebaec3a625a1827df7b9532965b321ba2c00472562
 AUX PyQt4-4.6.1-configure-multilib.patch 883 RMD160 4ce96cdf4d53773c245544737c894c2494e9de29 SHA1 d0c9b214172b47537873e3fc1bd5fb34e815220c SHA256 6b33666a0b773122330d33a1b88ddd3b18d2d3b2c265e3fd4edc253f1bdfab1a
 AUX PyQt4-4.7.2-configure.py.patch 933 RMD160 1c9525855d47bcdbf0c88618294be44274ce653b SHA1 4b27ab9173692a9d74598dc7c7fc88c3531e09b5 SHA256 1a87c58ccb14441f77c7c764b6e6c40d1bdd64c5b35581f3deda54019a3461be
 AUX PyQt4-4.7.3-qreal_float_support.patch 6460 RMD160 f022dc75ccde5b923c689f82d169d02e8b066a19 SHA1 2e000133b482f5bb36a5795e375bfa3f60dd5c55 SHA256 8183d7a12c094d02eb4f1ac2b983690c39ee54182a0d28adba52348f705e9c16
+AUX PyQt4-4.7.7-fix-scpk-and-flag-issue.diff 1490 RMD160 0bfb92059ebf3518980ce5af432747ee01bf8540 SHA1 8e70a0a45757274ce92444054bd387abcb453022 SHA256 2f0b26dd0f725240378bd350303a97717f1a7c7bf37753ac5cc1d0717c013085
 AUX configure-4.6.1.py.patch 1409 RMD160 f8a2b0c92fc53756679cff39d366b34cfb5b6d72 SHA1 c2cb0478de7d4f29c4db656f824b4dfce742209d SHA256 c80ecf0323ba47e14ac7e9941cf640a6ae552ad558001984097a8a33861028bd
 AUX configure.py.patch 1727 RMD160 31802058d0b0488264cdbcfeebd7ce9aff250957 SHA1 df4fee27f1486422b25d0072cfc388b207814c8f SHA256 06ee44a9fe43615b6bfada4aa7294303c016fd7c378ddf537823e33546306926
 DIST PyQt-x11-gpl-4.5.4.tar.gz 6970552 RMD160 0f7a48edb65116c8fb23357f66d164ff1fe48684 SHA1 be8b01b8b2343a6a85f18d16f10bc549e88265d6 SHA256 b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
@@ -17,14 +15,8 @@ EBUILD PyQt4-4.5.4-r4.ebuild 4004 RMD160 12533cb11dbcc3ad71fc08e53ea00c0a90ba7ef
 EBUILD PyQt4-4.6.2.ebuild 4025 RMD160 47ba49049478e52969db91376cdc22173d284cd7 SHA1 5705b8cf534fcbc0f066c709851c616e1a35fe43 SHA256 e3fadf2cfe5a87bdfc66038ddaf28e0b6f4970cd86445a36a608f4054a94461b
 EBUILD PyQt4-4.7.3.ebuild 4646 RMD160 3cf016fea23fac507d06554ae69668eb9bb6bce8 SHA1 e16dc80e590e0de0ffb5b0299bca553ca98f2b8d SHA256 1d4a19367fd2bb2c8fbe114f37b0347ca2bd7185a6f642af5800480779725578
 EBUILD PyQt4-4.7.5.ebuild 4588 RMD160 280689ec5e6b154cf079ccc5c47b4ffa3efa2d7a SHA1 9da88ae7b2e56c52937c6128ade01f7d3942463e SHA256 c511233b23e8fcb91a991b80461c5f7d439a15bae256af629083f0ad5f7fe130
+EBUILD PyQt4-4.7.7-r1.ebuild 4621 RMD160 c0388d1ec3dc1023b03ace24d3d0aea80e89e206 SHA1 7b116ccdf872e517349acb8bb4cf37f006c961c6 SHA256 c8affd430fb3a96f53b28be03664bcda23562fc514a679ba8585eb411808502f
 EBUILD PyQt4-4.7.7.ebuild 4568 RMD160 aeca02046166c8163cfccdd8a90d938e11975c8a SHA1 23565455e211378eb524eaa6c8c772a34afaac7d SHA256 6f12bd9c2b606dc1ee7daba3dde67a351d3464085341f8c3da931a3aad653f36
 EBUILD PyQt4-4.7.ebuild 4521 RMD160 ad65e74cc548e948b30a8f351ec5cc6c093303f3 SHA1 c455c022244deda7ef8bbe3eaba1e6d31b7e93cb SHA256 a01e9535a585f0eb7bee8a97b1254c11686f59653454f84a3126cecf9bc7a160
-MISC ChangeLog 17542 RMD160 2f3321c8b9c7cb5eae903a41ee6d590831526bcb SHA1 095922e5a070e6f8ab156c98a26eb3e56c189805 SHA256 af5e1cfb547a912a394c666de2e361f3ceacdae85f8734b3ae3c2a7ae9330dcd
+MISC ChangeLog 17773 RMD160 2c4110b648a96915d4b5da33b069defdeb29ba6e SHA1 ddcd55a31907ad4c8c4ab4eba438da12751481b3 SHA256 a95ff14f67a62aa9b179875eca076932ec3b824732202dd4713b459494485e5f
 MISC metadata.xml 846 RMD160 9ebdd502e44dac1e93f95e60936ad7871be6ed1c SHA1 2731e0ad5e11b9f0e4089cd9d9e2b342b6103c09 SHA256 6a481f4cc08dcb57f2b7bb0cc3d6944aa281fd3bc7a3aa586aa50372323b838c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyYoa8ACgkQ9/cejkQaxBDa6ACeKVpjQTuOr71ryS5/JwyF4fRr
-izcAnR22njB8dLPs/gNwjgaHm5onlRuI
-=/rpF
------END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild b/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild
new file mode 100644
index 000000000000..9c97939e1ddc
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild,v 1.1 2010/10/06 11:05:05 tampakrap Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit qt4-r2 python toolchain-funcs
+
+MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
+QTVER="4.6.2" # minimal Qt version this is supposed to work with
+
+DESCRIPTION="A set of Python bindings for the Qt toolkit"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
+SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="X assistant +dbus debug doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
+
+DEPEND=">=dev-python/sip-4.11
+	>=x11-libs/qt-core-${QTVER}:4
+	>=x11-libs/qt-script-${QTVER}:4
+	>=x11-libs/qt-test-${QTVER}:4
+	X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?] )
+	assistant? ( >=x11-libs/qt-assistant-${QTVER}:4 )
+	dbus? (
+		>=dev-python/dbus-python-0.80
+		>=x11-libs/qt-dbus-${QTVER}:4
+	)
+	multimedia? ( >=x11-libs/qt-multimedia-${QTVER}:4 )
+	opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 )
+	phonon? (
+		!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) )
+		kde? ( media-sound/phonon )
+	)
+	sql? ( >=x11-libs/qt-sql-${QTVER}:4 )
+	svg? ( >=x11-libs/qt-svg-${QTVER}:4 )
+	webkit? ( >=x11-libs/qt-webkit-${QTVER}:4 )
+	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:4 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6.1-configure-multilib.patch"
+	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
+	"${FILESDIR}/${P}-fix-scpk-and-flag-issue.diff"
+)
+
+src_prepare() {
+	if ! use dbus; then
+		sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \
+			"${S}"/configure.py || die
+	fi
+
+	# Patch to support qreal for arm architecture
+	# wrt bug #322349
+	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
+
+	qt4-r2_src_prepare
+
+	# Use proper include dir
+	sed -e "s|/usr/include|${EPREFIX}/usr/include|g" \
+		-i configure.py
+
+	python_copy_sources
+
+	preparation() {
+		if [[ "$(python_get_version --major)" == "3" ]]; then
+			rm -fr pyuic/uic/port_v2
+		else
+			rm -fr pyuic/uic/port_v3
+		fi
+	}
+	python_execute_function -s preparation
+}
+
+pyqt4_use_enable() {
+	use $1 && echo "--enable=${2:-$1}"
+}
+
+src_configure() {
+	configuration() {
+		local myconf="$(PYTHON) configure.py
+				--confirm-license
+				--bindir="${EPREFIX}"/usr/bin
+				--destdir="${EPREFIX}"$(python_get_sitedir)
+				--sipdir="${EPREFIX}"/usr/share/sip
+				--qsci-api
+				$(use debug && echo '--debug')
+				--enable=QtCore
+				--enable=QtNetwork
+				--enable=QtScript
+				--enable=QtTest
+				--enable=QtXml
+				$(pyqt4_use_enable X QtGui)
+				$(pyqt4_use_enable X QtDesigner)
+				$(pyqt4_use_enable X QtScriptTools)
+				$(pyqt4_use_enable assistant QtAssistant)
+				$(pyqt4_use_enable assistant QtHelp)
+				$(pyqt4_use_enable multimedia QtMultimedia)
+				$(pyqt4_use_enable opengl QtOpenGL)
+				$(pyqt4_use_enable phonon)
+				$(pyqt4_use_enable sql QtSql)
+				$(pyqt4_use_enable svg QtSvg)
+				$(pyqt4_use_enable webkit QtWebKit)
+				$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
+				CC=$(tc-getCC) CXX=$(tc-getCXX)
+				LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX)
+				CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}'"
+		echo ${myconf}
+		eval ${myconf} || return 1
+
+		for mod in QtCore $(use X && echo 'QtDesigner QtGui'); do
+			# Run eqmake4 inside the qpy subdirs to prevent
+			# stripping and many other QA issues
+			pushd qpy/${mod} > /dev/null || die
+			eqmake4 $(ls w_qpy*.pro)
+			popd > /dev/null || die
+
+			# Fix insecure runpaths
+			sed -i -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \
+				${mod}/Makefile || die "failed to fix rpath issues"
+		done
+
+		# Fix pre-stripping of libpythonplugin.so
+		if use X; then
+			cd "${BUILDDIR}"/designer
+			eqmake4 python.pro
+		fi
+	}
+	python_execute_function -s configuration
+}
+
+src_compile() {
+	python_src_compile
+}
+
+src_install() {
+	installation() {
+		# INSTALL_ROOT is needed for the QtDesigner module,
+		# the other Makefiles use DESTDIR.
+		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	}
+	python_execute_function -s installation
+
+	dodoc doc/pyqt4ref.txt NEWS THANKS || die
+
+	if use doc; then
+		dohtml -r doc/* || die
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize PyQt4
+}
+
+pkg_postrm() {
+	python_mod_cleanup PyQt4
+}
diff --git a/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff b/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff
new file mode 100644
index 000000000000..38083e76e523
--- /dev/null
+++ b/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff
@@ -0,0 +1,40 @@
+Index: PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py
+===================================================================
+--- PyQt-x11-gpl-4.7.7.orig/pyuic/uic/Loader/loader.py
++++ PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py
+@@ -1,3 +1,5 @@
++import os.path
++
+ from PyQt4 import QtGui, QtCore
+ from PyQt4.uic.uiparser import UIParser
+ from PyQt4.uic.Loader.qobjectcreator import LoaderCreatorPolicy
+@@ -19,6 +21,7 @@ class DynamicUILoader(UIParser):
+     def loadUi(self, filename, toplevelInst=None):
+         self.toplevelInst = toplevelInst
+ 
+-        # By using QFileInfo.path() rather than os.path.dirname() we allow
+-        # QString file names.
+-        return self.parse(filename, QtCore.QFileInfo(filename).path())
++        # Allow the filename to be a QString.
++        filename = str(filename)
++
++        return self.parse(filename, os.path.dirname(filename))
+Index: PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip
+===================================================================
+--- PyQt-x11-gpl-4.7.7.orig/sip/QtCore/qglobal.sip
++++ PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip
+@@ -312,12 +312,12 @@ public:
+     // Qt.Alignment class.
+     QFlags operator|(int f);
+ %MethodCode
+-        sipRes = new QFlags(*a0 | (ENUM(a1)));
++        sipRes = new QFlags(*a0 | a1);
+ %End
+ 
+     QFlags operator^(int f);
+ %MethodCode
+-        sipRes = new QFlags(*a0 ^ (ENUM(a1)));
++        sipRes = new QFlags(*a0 ^ a1);
+ %End
+ 
+     // These are necessary to prevent Python comparing object IDs.