Revbump to fix building with PyQt4-4.9.5. Bug #436578

Package-Manager: portage-2.1.11.23/cvs/Linux x86_64

4 files changed, 238 insertions, 9 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index da2e88cbd1ba..09c83d3396c9 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.178 2012/10/02 18:12:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.179 2012/10/05 20:26:35 hwoarang Exp $
+
+*pykde4-4.9.2-r1 (05 Oct 2012)
+
+  05 Oct 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/pykde4-4.9.2-pyqt45.patch, +pykde4-4.9.2-r1.ebuild:
+  Revbump to fix building with PyQt4-4.9.5. Bug #436578
 
 *pykde4-4.9.2 (02 Oct 2012)
 
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index fd6aecd047dd..fdb79e294f7f 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -3,22 +3,30 @@ Hash: SHA256
 
 AUX kpythonpluginfactorywrapper.c-r1 1255 SHA256 f89773e5b44515093a0434a2c8925097d0dc358b58fa11a125e732d191727576 SHA512 aa167083a56dc0f7d03c282cc4adec062f56d610ed39c55fbe1dea918d08427e86da392b25b0982c7db6c69adeb342bd6e53b290f24c1de028d9f945e0df1229 WHIRLPOOL 96a08f80bc88cf1d278dc7980a585d8e7b29945a6a9df1cdf6d685434996f861cc9b50a849848415298953a922892e7096d32b2d37aa8edc47755b9506d6b77d
 AUX pykde4-4.4.4-arm-sip.patch 822 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2 SHA512 047c20ae42030c434bbcc0b4c522ecc9b5ded43631362390666a20aadbc8d9a0c4d76ddcfee1c805b161dddfa62eede48281e6c4f985c940e2d9bf30af0eb3f3 WHIRLPOOL 82bc0045cc48773b075270f49c1b583f419929317ee574ba0ed9851573dcfd2d6c9b40aae3f12d492450fb32e16a4f71127b9eb2b1d1215209c9fee8f2c5f175
+AUX pykde4-4.9.2-pyqt45.patch 1852 SHA256 550bf76dcf533a44683ab22fa5d729f1e5e9c5d90583f9c24e1e974e2f59e9a8 SHA512 7d81f8aba7c59e9f2951b5009719e354deae8f03cc65fb81bc6ec25d60e1837e0c56a061d275101816a663eda457818cdfe0855154c952724fa2f9c0812f4cb2 WHIRLPOOL 1da66193630b19cb3528405a9b29bf4c2e7a66b34a10b6954d12bbc4ad1dd9af3609c17522bf9abef9e7deca2652b64adb73cc5bd06c14035bf0d79fb99d37ac
 DIST pykde4-4.8.5.tar.xz 2110444 SHA256 cbd251cfddfde57603ea2c477ff9a7d9862253cf99e33aa707c4540499edbe43 SHA512 a2e9869327d365f08d277b45ddf14a459ff89392b2749e5769a0bb0e061a2d2171c69dd88326c53102640dc508b6475551837d873ad4f77d561701e4b2f252ce WHIRLPOOL 616e46a7d7b41fdb5dd8332975aa3f19c5b682b13a1a04d5be4cfddf0ea8d9f97ace21eece72664aed1d88899bfc086de00e62d327bae0f04f57cb07a14b5c71
 DIST pykde4-4.9.1.tar.xz 1971216 SHA256 7a77caa5832be93df2d4d3808791af0b52c6fbc14efcaffeeaff5e9f90b67deb SHA512 a195af622395ab71f283797b1a8c0c79502b3a3ce1f28d4f124876404d17b9bfec146081d8897df903c987bed8abdf47a7d7f27e83b1559fa9b515b95fae88d5 WHIRLPOOL 6e346191901c4c79ae673b5819b8f4c1baa1e57d36e63635c236b51441089d24d2d5b509e10c7ad1f46f73101c80aecb957cfc095cb8a805fc14164b2d1345a3
 DIST pykde4-4.9.2.tar.xz 1990988 SHA256 5b4c1c2899fed504e4a5fefd9cd91b5ccc7d64bf1b353d6b543813e6247bef01 SHA512 4366d3335856c32b464940acf1d1df642b8331a7ec6c2d5ce9df6c6ed37934a425a1b4d46fa930eff1cc2a8eb4f2a6cffc8f787f9d7d450a61e987b589567a0e WHIRLPOOL 0c398b050fa85d374d1c11550b7fd95f66d5924a4d5baebcfacbe2c5d4abd70d414b24b7b42b6de6fd4a1ae58dc1c5952b051c157d7a4e187c28666cbd901696
 EBUILD pykde4-4.8.5.ebuild 4235 SHA256 40f2184b5ddbd0f8d4a1712e5a0583523ce2fa9e7272d0d725a7f5f973521f33 SHA512 32a97e3a9f46d20e604c5c56ca04769fa37f4b5a3920110248f8c74fa84c38bb092423207b091b54c1ca75e9c7d1a738e44f394b238b193fb95a68d5e3491ad2 WHIRLPOOL 469e00097a99ff9cd121681fea0490477f5e7f28e1eff25acbd407fe6a812f7ce00c0d322cc412a5c29670e40fd69b9e004fa355abcd5a7ad47dd2dcbf05ec14
 EBUILD pykde4-4.9.1.ebuild 4225 SHA256 183f96dcc3cdee9018bdf8c25a13b1fd6dff53785de2919e06b67ba2dc5f5275 SHA512 198de9b912ef26dec5ee90828a7d22e3a9eabf5ee2a6e245ed846b5cce0d7e07d074a1cb1feb09fcb059499b26af779031305cb52be0221d0c299141de09a2d4 WHIRLPOOL 4737ca0b77c4b850f163025b5a3353b468e19bd5903bf6d37b2d0cede057d7f7c1756775adbea0e6386e758a7cc44bdfd009f0b008cc42e9366e14a920cf6aa8
+EBUILD pykde4-4.9.2-r1.ebuild 4280 SHA256 324858409580ea4ea2e6fa6ef6628dfb980b4d5fe052c171c314c670935d2251 SHA512 43d5bb79730decb10ff24e9ccd2344963d33970e8aeb7fb9b070e8e3d2c464026e8c07107d9b9b202781dc6f1a255df6b39f7e258c3deccd3d787e13fa000c5e WHIRLPOOL 48ea3c560e658c6e58880de9fa481894012bd5d1fd8bf576f2cbd51b21109f084e5260e15475684cee0996f7fc073214e69e756f8bab9fb332fbb258efb2dc2a
 EBUILD pykde4-4.9.2.ebuild 4225 SHA256 9a03b40e76355a6ac4cb35726508ae3ede4b92795e2bb3f6ad956ec2cc38f16a SHA512 141bd3a149ce99ea322de8784d1671aef1aec613132eb904bfd96308399d909ae3979c2090c6d49c1cbcdcf79989570d5d80473bb0578a40434c1026bba3660b WHIRLPOOL 221b16a0285169aecf6a3bdee622fb047471a52d7b868d93e4b24c2534e68852ece92a48adbd41a44b3f934d8f7e4795f6d6e91793f270821b616ee3571b9201
-MISC ChangeLog 23541 SHA256 3591236afa5621773a9d091906519ca26965100fa2439e650256e21d071c633f SHA512 10f1f0a2cc878708051454f7c5d058b4df6e1c8117afca0841b8d0f563e129c12b1fd5b2f931a7fb22cece762770ca505221ae26188dc7a152ccc9194e4ca0a8 WHIRLPOOL 8f7c1d1a45dd3cb787f6460a8233085dd160dd37ae7dd5f80903e02516f0ff6fbcd430638e4ae1b950a79f120ad84b46494161d7b29a8711b33185df5a6ba71f
+MISC ChangeLog 23748 SHA256 1aa3f89dd33d84f1ccc6fc350152af0215ddd05167eb6c675f8e59e52fc754d1 SHA512 1073c61515057c61c3a035319c87c8a4501b0584e163965ae2325fd92235dda6e41cb96c41562f0acaa2523d74b60d18d0367be3aae6532e43ebe8b5e585f3e6 WHIRLPOOL 326feafc21233e96d26a8b2e9b98113294ca85d4837510d5a93b00324d5d5266bac89065a5c52def70b6e19c7cffa41dbbb56d989c147dfb9b5020c67e248ac3
 MISC metadata.xml 260 SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369 SHA512 2371a6075a0873610a53d4337fab9e368d607cb63cb924520c02149612934e7d1d8a5131f8d1c8ae01cac380e3a17f01b0105acda382ebb6da058fc2a561e1aa WHIRLPOOL 097f71b3d076f2c2a7091f0f89b05d8bc7f24d453d2e3c876fd95f91068b634ace21a5f53afc14be9f061f5b2e996aa18c3ef827eb16ad23f9c260a950a0eae8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQay8KAAoJEO+t9ga+3I3aqkwH/1sv5SC4Y7VfOufH746kWICs
-QlbeRkpIvpdl+7Tjx2/QiFCMNzq7GczgWDOKa5hHktWdqRRdmGlOmDSq8eZ1tDr4
-m1eFfJzlWY7DOsz3E2BKmX42ALmmNxzRnmTyek42fVoTLqVphzLf5s7Lxz79jZLp
-zXfyYXoBnd3Jf44vJJjtsYT+BAFHzjo7MZhguIo9SqqkXnmad707gANoOpbUZu64
-iqKWP1TIhg8E4C3Cxe48tdvKC6Hl4L/Yx5AXE6ly2hKevt2PbSZJ6R6GDiwlqML8
-zFbO6AssR4GHN4MfWqYxJjMoRGNrFb+DdqfBn/FaBmk7FRv92JzmzJIs6fm9764=
-=kVAW
+iQIcBAEBCAAGBQJQb0J7AAoJEPqDWhW0r/LC6RkP/0iYsJvAKnRyEQEBfYfiI3vS
+PNra5Ee444HQly8bcIhUpL/qqjVrebi8HXM5CjCvCjBWw4J7QmIQJWXEphxHku4G
+uPXOXcm0zGLgg4IJRqJUPamFn6BxPu5Dk+68NBqbSQbvSZAPZztgtM9kiRihR/4w
+ToZFQ8lPMTeMLCQLVEDMBr7fP+Sroe8eKdqJKeSJcUyegEDrPT3lUWn90RPzqNey
+DFNR9qkJjIBLfH52NqDpzsT70+I+szyUtp/np5Gg34CzQs4bltnEc4EP3WE5nudz
+7lVkKQ9ZasX8fKeT5/XYUtU3AfqYnOZ3WfTwTXH36GdZRrVRjOfMWzA89LFC7DlS
+RTc9k0g4zVwIhyRLfdXLKcV7bQ3t5ezT2dalStKuXCte0QVRe1S6NpTN2GSMMBEa
+lc9QtfhRnXBU6CV9KBIJIjHUkIDuCKfubbui74kayWOn9QMYkVnw3Arum6Sksj5c
+1NHxkljsUJxf0etkJlgJe1aR+dF5q5PCif9nDt8NcYAQcj7seFrF97FqGkzXmXpL
+CqyGjEyAVs5EIG0sIlRW4bGCoIRraHfyKe6FwrhhMMlvAA+kDze/KERfCBWFohVQ
+EJEAbfJ9ces3vBBCMV4Ur+M7n5aRkUiwXzOi25QAwAuNmjjlyjWQuRiFuXjLjPhe
+PqSAPw9iO3qJ8+15+yRJ
+=VgbM
 -----END PGP SIGNATURE-----
diff --git a/kde-base/pykde4/files/pykde4-4.9.2-pyqt45.patch b/kde-base/pykde4/files/pykde4-4.9.2-pyqt45.patch
new file mode 100644
index 000000000000..9fcced59fcb4
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.9.2-pyqt45.patch
@@ -0,0 +1,54 @@
+Index: pykde4-4.9.2/CMakeLists.txt
+===================================================================
+--- pykde4-4.9.2.orig/CMakeLists.txt
++++ pykde4-4.9.2/CMakeLists.txt
+@@ -33,7 +33,7 @@ INCLUDE(SIPMacros)
+ 
+ FIND_PACKAGE(PyQt4 REQUIRED)
+ IF(PYQT4_VERSION STRLESS "040900")  # These version numbers also appear in ../CMakeLists.txt
+-    MESSAGE(FATAL_ERROR "The version of PyQt found is too old. 4.9 or later is required.")
++    MESSAGE(FATAL_ERROR "The version of PyQt found is too old. 4.9.5 or later is required.")
+ ENDIF(PYQT4_VERSION STRLESS "040900")
+ 
+ 
+@@ -95,9 +95,19 @@ SET(SIP_DISABLE_FEATURES VendorID PyQt_N
+ 
+ # Use an extra option when compiling on Python 3.
+ IF (PYTHON_3)
+-    SET(SIP_EXTRA_OPTIONS -g -x Py_v3)
++    IF(PYQT4_VERSION STRGREATER "040904")
++	    #Disable for newer PyQt
++	    SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3)
++    ELSE(PYQT4_VERSION STRGREATER "040904")
++	    SET(SIP_EXTRA_OPTIONS -g -x Py_v3)
++    ENDIF(PYQT4_VERSION STRGREATER "040904")
+ ELSE (PYTHON_3)
+-    SET(SIP_EXTRA_OPTIONS -g)
++    IF(PYQT4_VERSION STRGREATER "040904")
++	    #Disable for newer PyQt
++	    SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector)
++    ELSE(PYQT4_VERSION STRGREATER "040904")
++	    SET(SIP_EXTRA_OPTIONS -g -x Py_v3)
++    ENDIF(PYQT4_VERSION STRGREATER "040904")
+ ENDIF (PYTHON_3)
+ 
+ ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
+Index: pykde4-4.9.2/sip/kdecore/typedefs.sip
+===================================================================
+--- pykde4-4.9.2.orig/sip/kdecore/typedefs.sip
++++ pykde4-4.9.2/sip/kdecore/typedefs.sip
+@@ -951,6 +951,9 @@ template <TYPE1>
+ %End
+ };
+ 
++%Feature PyKDE_QVector
++
++%If(PyKDE_QVector)
+ %MappedType QVector<int>
+ {
+ %TypeHeaderCode
+@@ -1025,3 +1028,4 @@ template <TYPE1>
+     return sipGetState(sipTransferObj);
+ %End
+ };
++%End
diff --git a/kde-base/pykde4/pykde4-4.9.2-r1.ebuild b/kde-base/pykde4/pykde4-4.9.2-r1.ebuild
new file mode 100644
index 000000000000..8cad5458b81d
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.9.2-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.9.2-r1.ebuild,v 1.1 2012/10/05 20:26:35 hwoarang Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="*:2.5"
+RESTRICT_PYTHON_ABIS="*-jython 2.4 2.7-pypy-*"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+
+OPENGL_REQUIRED="always"
+inherit python portability kde4-base multilib
+
+DESCRIPTION="Python bindings for KDE4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples semantic-desktop"
+REQUIRED_USE="test? ( semantic-desktop )"
+
+# blocker added due to compatibility issues and error during compile time
+RDEPEND="
+	>=dev-python/sip-4.14
+	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
+	semantic-desktop? (
+		$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+		>=dev-libs/soprano-2.8.0
+	)
+	aqua? ( >=dev-python/PyQt4-4.9.5[dbus,declarative,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.9.5[dbus,declarative,sql,svg,webkit,X] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pyqt45.patch
+)
+
+pkg_setup() {
+	python_pkg_setup
+	kde4-base_pkg_setup
+
+	have_python2=false
+
+	scan_python_versions() {
+		[[ ${PYTHON_ABI} == 2.* ]] && have_python2=true
+		:
+	}
+	python_execute_function -q scan_python_versions
+	if ! ${have_python2}; then
+		ewarn "You do not have a Python 2 version selected."
+		ewarn "kpythonpluginfactory will not be built"
+	fi
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	if ! use examples; then
+		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i CMakeLists.txt \
+			|| die "Failed to disable examples"
+	fi
+
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+
+	sed -i -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' kpythonpluginfactory/CMakeLists.txt
+
+	if ${have_python2}; then
+		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c-r1" "${WORKDIR}/wrapper/kpythonpluginfactorywrapper.c" || die "failed to copy wrapper"
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local mycmakeargs=(
+			-DWITH_PolkitQt=OFF
+			-DWITH_QScintilla=OFF
+			$(cmake-utils_use_with semantic-desktop Soprano)
+			$(cmake-utils_use_with semantic-desktop Nepomuk)
+			$(cmake-utils_use_with semantic-desktop KdepimLibs)
+			-DPYTHON_EXECUTABLE=$(PYTHON -a)
+		)
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_configure
+	}
+
+	python_execute_function configuration
+}
+
+echo_and_run() {
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	compilation() {
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_compile
+	}
+	python_execute_function compilation
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \
+			-shared \
+			${CFLAGS} ${CPPFLAGS} \
+			-DEPREFIX="\"${EPREFIX}\"" \
+			-DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \
+			-o kpythonpluginfactorywrapper.lo \
+			kpythonpluginfactorywrapper.c
+		echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \
+			-shared -module -avoid-version \
+			${CFLAGS} ${LDFLAGS} \
+			-o kpythonpluginfactory.la \
+			-rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \
+			kpythonpluginfactorywrapper.lo \
+			$(dlopen_lib)
+	fi
+}
+
+src_install() {
+	installation() {
+		cd "${S}_build-${PYTHON_ABI}"
+		emake DESTDIR="${T}/images/${PYTHON_ABI}" install
+	}
+	python_execute_function installation
+
+	python_merge_intermediate_installation_images "${T}/images"
+
+	# As we don't call the eclass's src_install, we have to install the docs manually
+	DOCS=("${S}"/{AUTHORS,NEWS,README})
+	use doc && HTML_DOCS=("${S}/docs/html/")
+	base_src_install_docs
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+	fi
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	python_mod_optimize PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
+
+	if use examples; then
+		echo
+		elog "PyKDE4 examples have been installed to"
+		elog "${EPREFIX}/usr/share/apps/${PN}/examples"
+		echo
+	fi
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+
+	python_mod_cleanup PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
+}