[kde-base/pykde4] Added arm fix as of bug 322351. Needs testing.

7 files changed, 126 insertions, 4 deletions

diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 8aea0d88a32..c99234797d0 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,5 +1,8 @@
+AUX pykde4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
+DIST kdebindings-4.4.4.tar.bz2 5091453 RMD160 38725fb1fec359e2b3e3acf23baf07e6d615dfdf SHA1 db5afa2a70558e34838a0f9296f008035e03f064 SHA256 bcfd514e8e4a88f1a36750b8b5fc3cbc52497f5ea22f811ff718301d7687c5f2
 DIST kdebindings-4.4.85.tar.bz2 6199742 RMD160 712a1979fafb47e48a601dbef83ea2c6f5151b04 SHA1 a46c3d549ba83a16614e8a412a5feece49a1cc98 SHA256 69afa95ea98b6bc7c48e0b552097f7b0378095c2c2c6f531cd5a949c23b35406
-EBUILD pykde4-4.4.85.ebuild 1835 RMD160 d02309b1ce0ddf231e8e522dab7711c9af43c745 SHA1 c12965f785846faa68794aa7da96c44c3aa31a30 SHA256 27662da61f2606cc6584cd7fb278d91b97ecf4dd9bc168763f9207b4ebcc69b3
-EBUILD pykde4-4.4.9999.ebuild 1757 RMD160 eac818eaf8203b5ea639a5cfa34ecca43a1a70eb SHA1 61cece9f28d006d09abb26614a81bfb57b934d27 SHA256 2f0fbad6945234664937574d319d853d21f5b83ae3a4e4ff5ad9260941b2bda0
-EBUILD pykde4-9999.ebuild 1757 RMD160 eac818eaf8203b5ea639a5cfa34ecca43a1a70eb SHA1 61cece9f28d006d09abb26614a81bfb57b934d27 SHA256 2f0fbad6945234664937574d319d853d21f5b83ae3a4e4ff5ad9260941b2bda0
-MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369
+EBUILD pykde4-4.4.4.ebuild 1894 RMD160 1095d0d02316da5d519c106b42147c4af1b71c04 SHA1 de5a992370a42d3fff57ac9034616b6775ec147f SHA256 48c3295833963f7eb87266cd19805cc19300206590ae4e5395a54b4c637f5d7d
+EBUILD pykde4-4.4.85.ebuild 1902 RMD160 48c273525020cc8e4319390741afcca6596f7332 SHA1 c488a81a7f3dfb46fd2af76a301f3935ccba2e30 SHA256 0b3794d575de75833ff5926ac77802da985c02ad60a9f8f7166eb7cafd9ac552
+EBUILD pykde4-4.4.9999.ebuild 1824 RMD160 afab6212e7099e46b13be4bdc71c3bc741579f90 SHA1 d728e21b06f682c7a3927ec520eb78df58ef8cf0 SHA256 33621611cf76894260fb59fa9432357348ff0e9701eaf1ec00bd7dd0658c9bc3
+EBUILD pykde4-9999.ebuild 1824 RMD160 afab6212e7099e46b13be4bdc71c3bc741579f90 SHA1 d728e21b06f682c7a3927ec520eb78df58ef8cf0 SHA256 33621611cf76894260fb59fa9432357348ff0e9701eaf1ec00bd7dd0658c9bc3
+MISC metadata.xml 330 RMD160 ed7d57ed98edb78a97224f0bc6f1e9aece46ee49 SHA1 940c5b4c08ba5779ea699f191f0d3e4f4d830eba SHA256 d5edf06119fb76af92826e93e0ef4a3cebd8b641b32279cda297baaf28eb710c
diff --git a/kde-base/pykde4/files/pykde4-arm-sip.patch b/kde-base/pykde4/files/pykde4-arm-sip.patch
new file mode 100644
index 00000000000..f967c451e7d
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-arm-sip.patch
@@ -0,0 +1,22 @@
+diff -Naur pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt pykde4-4.4.3/python/pykde4/CMakeLists.txt
+--- pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt	2010-03-29 14:57:40.000000000 +0200
++++ pykde4-4.4.3/python/pykde4/CMakeLists.txt	2010-05-31 15:49:17.095615617 +0200
+@@ -75,6 +75,9 @@
+     ${KDEPIMLIBS_INCLUDE_DIRS}
+ )
+ 
++# Pull in ARM configuration options if needed
++STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
++
+ SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
+ SET(SIP_CONCAT_PARTS 8)
+ IF (WIN32)
+@@ -82,7 +85,7 @@
+ ELSE (WIN32)
+     SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
+ ENDIF (WIN32)
+-SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
++SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
+ 
+ # Use an extra option when compiling on Python 3.
+ IF (PYTHON_3)
diff --git a/kde-base/pykde4/metadata.xml b/kde-base/pykde4/metadata.xml
index 9015e188a47..75138243522 100644
--- a/kde-base/pykde4/metadata.xml
+++ b/kde-base/pykde4/metadata.xml
@@ -4,5 +4,6 @@
 <herd>kde</herd>
 <use>
 	<flag name="semantic-desktop">Enables Nepomuk and Soprano python language bindings</flag>
+	<flag name="akonadi">Enables Akonadi python language bindings</flag>
 </use>
 </pkgmetadata>
diff --git a/kde-base/pykde4/pykde4-4.4.4.ebuild b/kde-base/pykde4/pykde4-4.4.4.ebuild
new file mode 100644
index 00000000000..ace98b29855
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.4.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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.7[dbus,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.7[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
+
+	if use arm; then
+		epatch "${FILESDIR}/pykde4-arm-sip.patch"
+	fi
+}
+
+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
+}
+
+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
+}
diff --git a/kde-base/pykde4/pykde4-4.4.85.ebuild b/kde-base/pykde4/pykde4-4.4.85.ebuild
index 6ef5e265567..28571b2eb36 100644
--- a/kde-base/pykde4/pykde4-4.4.85.ebuild
+++ b/kde-base/pykde4/pykde4-4.4.85.ebuild
@@ -37,6 +37,10 @@ src_prepare() {
 		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
 			|| die "Failed to disable examples"
 	fi
+
+	if use arm; then
+		epatch "${FILESDIR}/pykde4-arm-sip.patch"
+	fi
 }
 
 src_configure() {
diff --git a/kde-base/pykde4/pykde4-4.4.9999.ebuild b/kde-base/pykde4/pykde4-4.4.9999.ebuild
index 36aa6db98bd..4c4d1a632e9 100644
--- a/kde-base/pykde4/pykde4-4.4.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.4.9999.ebuild
@@ -37,6 +37,10 @@ src_prepare() {
 		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
 			|| die "Failed to disable examples"
 	fi
+
+	if use arm; then
+		epatch "${FILESDIR}/pykde4-arm-sip.patch"
+	fi
 }
 
 src_configure() {
diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index 36aa6db98bd..4c4d1a632e9 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -37,6 +37,10 @@ src_prepare() {
 		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
 			|| die "Failed to disable examples"
 	fi
+
+	if use arm; then
+		epatch "${FILESDIR}/pykde4-arm-sip.patch"
+	fi
 }
 
 src_configure() {