[kde-base/pykde4-4.5.1-r1] Added ebuild back with the mapped type patch. Added explicit deps for >dev-python/PyQt4-4.7.3 and >dev-python/sip-4.10. Fixes bug 332503.

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

3 files changed, 97 insertions, 2 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 4deaaaafafbf..09d1525961b8 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.89 2010/09/07 12:58:27 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.90 2010/09/11 02:24:02 jmbsvicetto Exp $
+
+  11 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +pykde4-4.5.1-r1.ebuild:
+  [kde-base/pykde4-4.5.1-r1] Added ebuild back with the mapped type patch.
+  Added explicit deps for >dev-python/PyQt4-4.7.3 and >dev-python/sip-4.10.
+  Fixes bug 332503.
 
 *pykde4-4.5.1 (07 Sep 2010)
 
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 94035c05035b..6de5074723c3 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -4,6 +4,7 @@ AUX pykde4-mapped-type-fix.patch 1406 RMD160 7af64a0841d604fc695441524561142a0ad
 DIST kdebindings-4.4.5.tar.bz2 5092007 RMD160 057cafc1922a5ab3999e6dcc532d656dd4cf446c SHA1 2f041c5b050da879e8f5d09f668b56881f9f1bb2 SHA256 c443b59fc4b5fd480bc112c409ac2378147853a59292a8a8404c2243379a1451
 DIST kdebindings-4.5.1.tar.bz2 6325783 RMD160 8d5425cc973f3a73fa22f89badb437945f453d93 SHA1 0f75b9b787fd58ff5e36ce6ac87329ea31ad66b6 SHA256 5cb33f3cb2ea4d54f0bc851fe2f0eaf76df30333108a862a60129cc5e9710bc9
 EBUILD pykde4-4.4.5.ebuild 2050 RMD160 6cef6d284a9fb40410005e2cb1ec7a0990752385 SHA1 5c25bd112c50bf75a350420634386c02bb647394 SHA256 bb928da83f9dc072e4d71e012a9becc187f6d4c31ebad3e1aa7fe0fab90d934b
+EBUILD pykde4-4.5.1-r1.ebuild 2147 RMD160 4b11ac7759f644fbce431ef8b8c18ef009b6fe4b SHA1 d1067cdc3068f2e7f4a0efa1810c90c8463f1823 SHA256 14e64a562c610bb8f8595a3e636a931c192283ca7b0c649374be013c3c7411ab
 EBUILD pykde4-4.5.1.ebuild 1984 RMD160 a581e26bbe85e7089db41efdc690618fa180d8df SHA1 3c41668bb100b388e4a594d18dd13930addbc76b SHA256 4541e6477869b9833acae9f1cc400863adb932efb1244ba446ab835c55350594
-MISC ChangeLog 11736 RMD160 0dac48802daf4bcefae0bda05115c76ed045e76e SHA1 cb4225c71d2fa384777865840cbb0306af5fbb1f SHA256 9d8131b3db4f32f1ebf3505f1076c7b83edf8edd2c09e8a8cc614f2f6e5f55ba
+MISC ChangeLog 12005 RMD160 fffee938262d95125bfc5a8494af0f51e51a1bed SHA1 bfdb8d977edff489615c1912d127e0b8f8ab4348 SHA256 d42e5822f0859e44d039460dbcc0070320d37c4e4560d7c78aedca716c13c416
 MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369
diff --git a/kde-base/pykde4/pykde4-4.5.1-r1.ebuild b/kde-base/pykde4/pykde4-4.5.1-r1.ebuild
new file mode 100644
index 000000000000..ecb670215fa2
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.5.1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.5.1-r1.ebuild,v 1.4 2010/09/11 02:24:03 jmbsvicetto 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
+# Added specific PyQt4 and sip deps to fix bug 332503.
+DEPEND="
+	!dev-python/pykde
+	>dev-python/PyQt4-4.7.3
+	>dev-python/sip-4.10
+	$(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}"
+
+PATCHES=( "${FILESDIR}/${PN}-mapped-type-fix.patch" )
+
+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 322351
+	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.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 -q -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
+}