4 files changed, 132 insertions, 2 deletions
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index c2aa6fabfac6..bc6bf7926bbc 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.96 2011/01/10 11:53:48 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.97 2011/01/15 20:02:04 arfrever Exp $
+
+*pykde4-4.4.5-r1 (15 Jan 2011)
+
+  15 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +pykde4-4.4.5-r1.ebuild, +files/pykde4-4.4.5-PyQt4-4.7.5.patch:
+  Fix compatibility with >=dev-python/PyQt4-4.7.5 (bug #349453).
 
 *pykde4-4.5.5 (10 Jan 2011)
 
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index d028458c8641..22cc8c922f36 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,11 +1,13 @@
 AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
+AUX pykde4-4.4.5-PyQt4-4.7.5.patch 1065 RMD160 09b431c53354628c3a692a5f9c72ccea1202fc56 SHA1 cf5f48219916ac14ac2a156c7807639c5fd253c5 SHA256 0410dc77dc73e7465619cd24eb60436bc5abd073365dd1c4c294b59c73d9ed46
 AUX pykde4-4.4.5-sip-4.12.patch 1988 RMD160 2d742d6d2d911a21ab8dbc3b3f938ac2096f8efe SHA1 ed5f74f9198e3e90c9fbb46c621d6e310a08fa0e SHA256 e15d7fda0dc0b2678bbd721601ee2581a00e6c478f5034c57877da394c9a14b2
 AUX pykde4-4.4.92-build-fix-sip.patch 557 RMD160 d9d1c299f6acbc97c75ff8ddc23bd13d1ff0bce6 SHA1 6cb4154b980320fcff792434b8abf7b9fce1ce68 SHA256 0b2fd1753e7fe41698a8c1c0568c4cd52fd14ddc6c010f91f6052fe89044cf6e
 AUX pykde4-4.5.5-typedefs-fix.patch 3309 RMD160 c81c29abdd9adaa73ffbf899fd722b861ba95a10 SHA1 f0e0318e996ccd82eaa9304c184b8d4cda4d7a50 SHA256 5a94419ae8edc80b7231ed3d3afb23d497fc47adf798b6e18bca9060788f87d7
 AUX pykde4-mapped-type-fix.patch 1406 RMD160 7af64a0841d604fc695441524561142a0ad1e3fe SHA1 8167ae067f6cb47b7685c2d052b9d57d3e88ba10 SHA256 94cbc246a62fe0256e3a57bdfd1aae6b1a313229031433f65a389442c7fa10e2
 DIST kdebindings-4.4.5.tar.bz2 5092007 RMD160 057cafc1922a5ab3999e6dcc532d656dd4cf446c SHA1 2f041c5b050da879e8f5d09f668b56881f9f1bb2 SHA256 c443b59fc4b5fd480bc112c409ac2378147853a59292a8a8404c2243379a1451
 DIST kdebindings-4.5.5.tar.bz2 7134992 RMD160 c69f387c8dd5e3205fa8a436cc63cecf9511f38e SHA1 5f754f0b6989df9557c5ccec18b4f96207fceb94 SHA256 7bfa2df7e8a01c7f1a9cfd2e79e544794b94490d3ca3576cbbedb2328ef257c5
+EBUILD pykde4-4.4.5-r1.ebuild 2235 RMD160 5e70672eecfc2cd33c7c0b6cdc49597c10986d50 SHA1 5280147159b4f9e87615a730dbe280e6ac20fe80 SHA256 e5693b7050431c6e9e63699af8e004d45e6f7d6dddf006bf7c2f8b0ac10c027d
 EBUILD pykde4-4.4.5.ebuild 2220 RMD160 bb1b21a33cd2799f2b44e79138da1d995156f3b1 SHA1 b8164103e98cef32eb493c44b3368012482795ce SHA256 a3c9c65639c8c3b0c5e1eff6d895b3f8a3dc00421bd77cd0ad82d06c6b37e5b7
 EBUILD pykde4-4.5.5.ebuild 2070 RMD160 2cac5f0facf82f81273055592aa7c22d7571fba8 SHA1 8a829516141d04a30cc442c31c1b69514f271c2d SHA256 4e5bececd08ed3c8fd16a58d5476a09f79c33887c6943cca693fe7002922ebf8
-MISC ChangeLog 12926 RMD160 f69cfd8cbb38cccde7e87b46f5674a1f8542adfd SHA1 d3c04ea807cc9599b7904ee03bb13e48b3c67ccd SHA256 264a7d1b298582a00145215ac21499fe27dea023a2f66218e22d218aaf3079e5
+MISC ChangeLog 13162 RMD160 703c5f3623017921b2386cb28ff39aa257cfe73e SHA1 0760ffcac4659b0190dfc56287f572bfe9609aca SHA256 4c2c98709c4c6d8ec8c8374c954ad3c40919ef496505fdb704e6a1a5e805317a
 MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369
diff --git a/kde-base/pykde4/files/pykde4-4.4.5-PyQt4-4.7.5.patch b/kde-base/pykde4/files/pykde4-4.4.5-PyQt4-4.7.5.patch
new file mode 100644
index 000000000000..c0ccdc071a62
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.4.5-PyQt4-4.7.5.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/show_bug.cgi?id=349453
+http://websvn.kde.org/?view=revision&revision=1209688
+
+--- python/pykde4/tools/pykdeuic4/pykdeuic4.py
++++ python/pykde4/tools/pykdeuic4/pykdeuic4.py
+@@ -39,7 +39,7 @@
+     def __init__(self,string):
+         original_i18n_string.__init__(self,string)
+     def __str__(self):
+-        return "kdecore.i18n(\"%s\")" % (qtproxies.escape(self.string),)
++        return "kdecore.i18n(%s)" % (qtproxies.as_string(self.string),)
+ qtproxies.i18n_string = kde_i18n_string
+ 
+ def kdeFilter():
+@@ -71,7 +71,7 @@
+     indenter.indentwidth = indent
+     comp = compiler.UICompiler()
+     comp.factory._cwFilters.append(kdeFilter())
+-    winfo = comp.compileUi(uifile, output)
++    winfo = comp.compileUi(uifile, output, None)
+ 
+     if exe:
+         output.write("""
+@@ -104,7 +104,7 @@
+     app = kdeui.KApplication()
+     mainWindow = MainWin(None, "main window")
+     mainWindow.show()
+-    app.connect (app, QtCore.SIGNAL ("lastWindowClosed ()"), app.quit)
++    app.lastWindowClosed.connect(app.quit)
+     app.exec_ ()
+ """)
+ 
diff --git a/kde-base/pykde4/pykde4-4.4.5-r1.ebuild b/kde-base/pykde4/pykde4-4.4.5-r1.ebuild
new file mode 100644
index 000000000000..92805f4dc22a
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.4.5-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.5-r1.ebuild,v 1.1 2011/01/15 20:02:05 arfrever Exp $
+
+EAPI="3"
+
+KMNAME="kdebindings"
+KMMODULE="python/pykde4"
+OPENGL_REQUIRED="always"
+PYTHON_USE_WITH="threads"
+RESTRICT_PYTHON_ABIS="2.4"
+inherit python kde4-meta
+
+DESCRIPTION="Python bindings for KDE4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples semantic-desktop"
+
+# blocker added due to compatibility issues and error during compile time
+DEPEND="
+	!dev-python/pykde
+	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	aqua? ( >=dev-python/PyQt4-4.8[dbus,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8[dbus,sql,svg,webkit,X] )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python_pkg_setup
+	kde4-meta_pkg_setup
+}
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	if ! use examples; then
+		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
+			|| die "Failed to disable examples"
+	fi
+
+	# See bug 328135
+	epatch "${FILESDIR}"/${PN}-4.4.92-build-fix-sip.patch
+
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+
+	epatch "${FILESDIR}/${PN}-mapped-type-fix.patch"
+	has_version ">=dev-python/sip-4.12" && epatch "${FILESDIR}/${P}-sip-4.12.patch"
+	epatch "${FILESDIR}/${P}-PyQt4-4.7.5.patch"
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_QScintilla=OFF
+		-DWITH_PolkitQt=OFF
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop KdepimLibs)
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	use doc && HTML_DOCS=("${S}/python/pykde4/docs/html/")
+
+	kde4-meta_src_install
+
+	python_convert_shebangs -r $(python_get_version) "${ED}"
+	python_clean_installation_image -q
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	python_mod_optimize PyKDE4 PyQt4
+
+	if use examples; then
+		echo
+		elog "PyKDE4 examples have been installed to"
+		elog "${EKDEDIR}/share/apps/${PN}/examples"
+		echo
+	fi
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	python_mod_cleanup PyKDE4 PyQt4
+}