[kde-base/pykde] Move 4.4.4 to tree (with patch fixing bug 322351), rename patch.

8 files changed, 16 insertions, 107 deletions

diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 304de9c4c75..91f49ef7f00 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,11 +1,9 @@
-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
+AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
 DIST kdebindings-4.4.85.tar.bz2 6199742 RMD160 712a1979fafb47e48a601dbef83ea2c6f5151b04 SHA1 a46c3d549ba83a16614e8a412a5feece49a1cc98 SHA256 69afa95ea98b6bc7c48e0b552097f7b0378095c2c2c6f531cd5a949c23b35406
 DIST kdebindings-4.4.90.tar.bz2 6310097 RMD160 69dc507abf9a3ac040aad11e8423c974e1c849c0 SHA1 0cf8adcf881bbeecdeba37ac40527fd478a6debe SHA256 1d7a5a98ae1914bb3e83c7e1e097339930d6a99c6479e2d87eafe817b6f64349
-EBUILD pykde4-4.4.4.ebuild 1888 RMD160 dcbc9ec5c620fbf3649a1d711b964297a58cfdd9 SHA1 ea8b19e36b10d792fea8330b25d64bd08b6855c5 SHA256 47ed81909afc1a87c348eb20c2193c4c720496a3d94e0768b613bb9281af355a
-EBUILD pykde4-4.4.85.ebuild 1896 RMD160 262e25fe15003cf9cee268d37902d60618a88627 SHA1 dea0194694f9872075593bb157e35d9ae1550ad4 SHA256 21a94454248cac458d695e73a6559c1db3ab6573d333b80f53969c8bb50496a6
-EBUILD pykde4-4.4.90.ebuild 1896 RMD160 262e25fe15003cf9cee268d37902d60618a88627 SHA1 dea0194694f9872075593bb157e35d9ae1550ad4 SHA256 21a94454248cac458d695e73a6559c1db3ab6573d333b80f53969c8bb50496a6
-EBUILD pykde4-4.4.9999.ebuild 1824 RMD160 afab6212e7099e46b13be4bdc71c3bc741579f90 SHA1 d728e21b06f682c7a3927ec520eb78df58ef8cf0 SHA256 33621611cf76894260fb59fa9432357348ff0e9701eaf1ec00bd7dd0658c9bc3
-EBUILD pykde4-4.5.9999.ebuild 1824 RMD160 afab6212e7099e46b13be4bdc71c3bc741579f90 SHA1 d728e21b06f682c7a3927ec520eb78df58ef8cf0 SHA256 33621611cf76894260fb59fa9432357348ff0e9701eaf1ec00bd7dd0658c9bc3
-EBUILD pykde4-9999.ebuild 1824 RMD160 afab6212e7099e46b13be4bdc71c3bc741579f90 SHA1 d728e21b06f682c7a3927ec520eb78df58ef8cf0 SHA256 33621611cf76894260fb59fa9432357348ff0e9701eaf1ec00bd7dd0658c9bc3
+EBUILD pykde4-4.4.85.ebuild 1906 RMD160 8a0fed0be093d9dda8464163db849e1e26d7266f SHA1 1362efaed234e3814c11d6149a3e1b66f7e55c65 SHA256 6233ddd1352680af4726c8b344baaa32d940e0bd8ea1915288be565cadd72f66
+EBUILD pykde4-4.4.90.ebuild 1906 RMD160 8a0fed0be093d9dda8464163db849e1e26d7266f SHA1 1362efaed234e3814c11d6149a3e1b66f7e55c65 SHA256 6233ddd1352680af4726c8b344baaa32d940e0bd8ea1915288be565cadd72f66
+EBUILD pykde4-4.4.9999.ebuild 1834 RMD160 52e5f1c3110d7d1b7eaacaf3d9aef7d722b0b254 SHA1 5aa337f042fdfc1a95bea9abd1bbe0dfd9ac0263 SHA256 5dc88bc382b4bad226fca735299c0b639767f5acfedf30742b3904627f149d3a
+EBUILD pykde4-4.5.9999.ebuild 1834 RMD160 52e5f1c3110d7d1b7eaacaf3d9aef7d722b0b254 SHA1 5aa337f042fdfc1a95bea9abd1bbe0dfd9ac0263 SHA256 5dc88bc382b4bad226fca735299c0b639767f5acfedf30742b3904627f149d3a
+EBUILD pykde4-9999.ebuild 1834 RMD160 52e5f1c3110d7d1b7eaacaf3d9aef7d722b0b254 SHA1 5aa337f042fdfc1a95bea9abd1bbe0dfd9ac0263 SHA256 5dc88bc382b4bad226fca735299c0b639767f5acfedf30742b3904627f149d3a
 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-4.4.4-arm-sip.patch
index f967c451e7d..f967c451e7d 100644
--- a/kde-base/pykde4/files/pykde4-arm-sip.patch
+++ b/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch
diff --git a/kde-base/pykde4/pykde4-4.4.4.ebuild b/kde-base/pykde4/pykde4-4.4.4.ebuild
deleted file mode 100644
index a0a739e01c6..00000000000
--- a/kde-base/pykde4/pykde4-4.4.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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 ~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 0128b920b4a..7dfbe8c5e92 100644
--- a/kde-base/pykde4/pykde4-4.4.85.ebuild
+++ b/kde-base/pykde4/pykde4-4.4.85.ebuild
@@ -38,9 +38,8 @@ src_prepare() {
 			|| die "Failed to disable examples"
 	fi
 
-	if use arm; then
-		epatch "${FILESDIR}/pykde4-arm-sip.patch"
-	fi
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${P}-4.4.4-arm-sip.patch"
 }
 
 src_configure() {
diff --git a/kde-base/pykde4/pykde4-4.4.90.ebuild b/kde-base/pykde4/pykde4-4.4.90.ebuild
index 0128b920b4a..7dfbe8c5e92 100644
--- a/kde-base/pykde4/pykde4-4.4.90.ebuild
+++ b/kde-base/pykde4/pykde4-4.4.90.ebuild
@@ -38,9 +38,8 @@ src_prepare() {
 			|| die "Failed to disable examples"
 	fi
 
-	if use arm; then
-		epatch "${FILESDIR}/pykde4-arm-sip.patch"
-	fi
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${P}-4.4.4-arm-sip.patch"
 }
 
 src_configure() {
diff --git a/kde-base/pykde4/pykde4-4.4.9999.ebuild b/kde-base/pykde4/pykde4-4.4.9999.ebuild
index 4c4d1a632e9..306738ff0f5 100644
--- a/kde-base/pykde4/pykde4-4.4.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.4.9999.ebuild
@@ -38,9 +38,8 @@ src_prepare() {
 			|| die "Failed to disable examples"
 	fi
 
-	if use arm; then
-		epatch "${FILESDIR}/pykde4-arm-sip.patch"
-	fi
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${P}-4.4.4-arm-sip.patch"
 }
 
 src_configure() {
diff --git a/kde-base/pykde4/pykde4-4.5.9999.ebuild b/kde-base/pykde4/pykde4-4.5.9999.ebuild
index 4c4d1a632e9..306738ff0f5 100644
--- a/kde-base/pykde4/pykde4-4.5.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.5.9999.ebuild
@@ -38,9 +38,8 @@ src_prepare() {
 			|| die "Failed to disable examples"
 	fi
 
-	if use arm; then
-		epatch "${FILESDIR}/pykde4-arm-sip.patch"
-	fi
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${P}-4.4.4-arm-sip.patch"
 }
 
 src_configure() {
diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index 4c4d1a632e9..306738ff0f5 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -38,9 +38,8 @@ src_prepare() {
 			|| die "Failed to disable examples"
 	fi
 
-	if use arm; then
-		epatch "${FILESDIR}/pykde4-arm-sip.patch"
-	fi
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${P}-4.4.4-arm-sip.patch"
 }
 
 src_configure() {