Revert previous commit and apply the patch in revision bump for 4.5.5

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

4 files changed, 100 insertions, 5 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 7d53b81f0ca2..50013db12252 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.99 2011/01/17 19:31:13 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.100 2011/01/17 19:41:04 tampakrap Exp $
+
+*pykde4-4.5.5-r1 (17 Jan 2011)
+
+  17 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org> pykde4-4.5.5.ebuild,
+  +pykde4-4.5.5-r1.ebuild:
+  Revert previous commit and apply the patch in revision bump for 4.5.5
 
   17 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org> pykde4-4.5.5.ebuild:
   Fix compatibility with >=dev-python/PyQt4-4.7.5 (bug #349453) for pykde4
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index d7926a2959b6..2ea86e96fda4 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -8,6 +8,7 @@ DIST kdebindings-4.4.5.tar.bz2 5092007 RMD160 057cafc1922a5ab3999e6dcc532d656dd4
 DIST kdebindings-4.5.5.tar.bz2 7134992 RMD160 c69f387c8dd5e3205fa8a436cc63cecf9511f38e SHA1 5f754f0b6989df9557c5ccec18b4f96207fceb94 SHA256 7bfa2df7e8a01c7f1a9cfd2e79e544794b94490d3ca3576cbbedb2328ef257c5
 EBUILD pykde4-4.4.5-r1.ebuild 2236 RMD160 86b23385695d1da99fff57de44d9beb2fa99f242 SHA1 288c9e20c84f122e3e06b6f97b0afad8c307674f SHA256 2a9aa53ff609f0c00faeef087c35f5bbc4964fcce7c7e666112ac1f998d09eed
 EBUILD pykde4-4.4.5.ebuild 2220 RMD160 bb1b21a33cd2799f2b44e79138da1d995156f3b1 SHA1 b8164103e98cef32eb493c44b3368012482795ce SHA256 a3c9c65639c8c3b0c5e1eff6d895b3f8a3dc00421bd77cd0ad82d06c6b37e5b7
-EBUILD pykde4-4.5.5.ebuild 2109 RMD160 45383e548b573f2aee2aee1e5b5505979105735a SHA1 56be1d7133798435e6d24139fade812081261bad SHA256 8df96e93059068702e96e5cddfaad1a377a9ce311174ab440736756c85260aae
-MISC ChangeLog 13443 RMD160 1d7817ad404156d4cfd10729d3b763163706c564 SHA1 f0309511eb0c9ee3819b2dfa12a6b63b490d5234 SHA256 5fcea35daec87af94244ce56350de4b80c131e55fa624174d147da075db30945
+EBUILD pykde4-4.5.5-r1.ebuild 2112 RMD160 5420972a58918ffe3d1a16b77d55ad8bdda6b87d SHA1 be9c8609ec6a1db2617299c8472010ec9af26286 SHA256 3145d30c6bbaf5ed00c20a2dc980792fc7a144da97158e5c2870e99d4d1d6c64
+EBUILD pykde4-4.5.5.ebuild 2064 RMD160 05373fbc8e71cd61c04b18c52757f2964b0370e4 SHA1 54cb46c9167b9ca51fc531056a7536f9b48317e5 SHA256 b3cfbce371e9d2cc7327263150c7176f4cb7250f7e73fc3e14287bfcb8df6db2
+MISC ChangeLog 13653 RMD160 963084fc903ec5fbd73b38bb12d30e65077396b7 SHA1 3d9fd9602ca5c1d967dedcf3e58ed11214fb3999 SHA256 2ed53e1459502b4f7bab1457930b16adf9ef3e8d06ade6324a7df878a75f3175
 MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369
diff --git a/kde-base/pykde4/pykde4-4.5.5-r1.ebuild b/kde-base/pykde4/pykde4-4.5.5-r1.ebuild
new file mode 100644
index 000000000000..8f63c8d0d6c7
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.5.5-r1.ebuild
@@ -0,0 +1,89 @@
+# 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.5.5-r1.ebuild,v 1.1 2011/01/17 19:41:04 tampakrap 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
+	>=dev-python/sip-4.12
+	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,sql,svg,webkit,X] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-typedefs-fix.patch"
+	"${FILESDIR}/${PN}-4.4.5-PyQt4-4.7.5.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
+}
diff --git a/kde-base/pykde4/pykde4-4.5.5.ebuild b/kde-base/pykde4/pykde4-4.5.5.ebuild
index ea7f7b18b083..27a057828c0d 100644
--- a/kde-base/pykde4/pykde4-4.5.5.ebuild
+++ b/kde-base/pykde4/pykde4-4.5.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5.5.ebuild,v 1.2 2011/01/17 19:31:13 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.5.5.ebuild,v 1.3 2011/01/17 19:41:04 tampakrap Exp $
 
 EAPI="3"
 
@@ -28,7 +28,6 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-typedefs-fix.patch"
-	"${FILESDIR}/${PN}-4.4.5-PyQt4-4.7.5.patch"
 )
 
 pkg_setup() {