[kde-base/pykde4] Remove bogus scintilla support. Add -DKDE3_SUPPORT in order to build KTabWidget::label deprecated bindings

5 files changed, 13 insertions, 99 deletions

diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 2b7b167fe80..43f975f755a 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,8 +1,6 @@
 AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
 AUX pykde4-4.5.5-typedefs-fix.patch 3309 RMD160 c81c29abdd9adaa73ffbf899fd722b861ba95a10 SHA1 f0e0318e996ccd82eaa9304c184b8d4cda4d7a50 SHA256 5a94419ae8edc80b7231ed3d3afb23d497fc47adf798b6e18bca9060788f87d7
 AUX pykde4-4.5.90-typedefs-fix.patch 2110 RMD160 93a7e6b0a23fda700342ac4178a33fbe457c8244 SHA1 59b3992de8def0e415a055246d2d3d0a2934d8d9 SHA256 4b441ad05c553383a94e4856462c0c747b81acc5fe44782cdcb4371715b7ddf3
-DIST kdebindings-4.6.1.tar.bz2 7078534 RMD160 65963f9e061958371daaea42c17cdff5fd1dca07 SHA1 1a71e656df19a4b132546242aa344778554693ff SHA256 8de1bb23ea7af16a69176be948038557fe40e20fcdadff14c91d7843708ee3c7
-EBUILD pykde4-4.6.1-r1.ebuild 2029 RMD160 76c68633a01963b636dffcd1cf76b3a33ca0b22e SHA1 76ed4de317a32527608c0ab57e4f20f460b2eb42 SHA256 4a5ab1a6a68586005a5d9444e753acbc05f941b611cd102459a4d9447b4d70ec
-EBUILD pykde4-4.6.9999.ebuild 2048 RMD160 aa8b920ed753e1ca25ca43db9cebcef3e7308375 SHA1 020622df3906292bc94a4b1618c92e5b63a4af88 SHA256 a81052c1d50997b547ff5e88a977f536cb074a48343cf052c732fe94d47858c4
-EBUILD pykde4-9999.ebuild 2048 RMD160 aa8b920ed753e1ca25ca43db9cebcef3e7308375 SHA1 020622df3906292bc94a4b1618c92e5b63a4af88 SHA256 a81052c1d50997b547ff5e88a977f536cb074a48343cf052c732fe94d47858c4
-MISC metadata.xml 336 RMD160 7c6178e23d8f17215cb3a49710683070b50bc8fb SHA1 4e68d07ed9b725ee6513d46342151453a99be3f7 SHA256 a5c389c756b3328167ea5d045eca62ef72e92794b8d0936bf955ec9e5d284815
+EBUILD pykde4-4.6.9999.ebuild 2054 RMD160 99e48ddac4fcc82c072a3ad4dd2a200b4be6fe0b SHA1 0c93dd5c1dcefac36b38dffafb122f1d054391a2 SHA256 7d20df8c60e49eaa2a6de9c54a6497a0697d49c40ff9fd20fc45375181e55d04
+EBUILD pykde4-9999.ebuild 2054 RMD160 99e48ddac4fcc82c072a3ad4dd2a200b4be6fe0b SHA1 0c93dd5c1dcefac36b38dffafb122f1d054391a2 SHA256 7d20df8c60e49eaa2a6de9c54a6497a0697d49c40ff9fd20fc45375181e55d04
+MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369
diff --git a/kde-base/pykde4/metadata.xml b/kde-base/pykde4/metadata.xml
index 8f572af7eef..9015e188a47 100644
--- a/kde-base/pykde4/metadata.xml
+++ b/kde-base/pykde4/metadata.xml
@@ -4,6 +4,5 @@
 <herd>kde</herd>
 <use>
 	<flag name="semantic-desktop">Enables Nepomuk and Soprano python language bindings</flag>
-	<flag name="qscintilla">Enables QScintilla python language bindings</flag>
 </use>
 </pkgmetadata>
diff --git a/kde-base/pykde4/pykde4-4.6.1-r1.ebuild b/kde-base/pykde4/pykde4-4.6.1-r1.ebuild
deleted file mode 100644
index c3d2b0deff1..00000000000
--- a/kde-base/pykde4/pykde4-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 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"
-KDE_SCM="git"
-EGIT_REPONAME="pykde4"
-inherit python kde4-meta
-
-DESCRIPTION="Python bindings for KDE4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples qscintilla 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?')
-	qscintilla? ( x11-libs/qscintilla )
-	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,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 ${KMMODULE}/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=(
-		$(cmake-utils_use_with qscintilla)
-		-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}/${KMMODULE}/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.6.9999.ebuild b/kde-base/pykde4/pykde4-4.6.9999.ebuild
index 9b3eea32dde..439c59778cf 100644
--- a/kde-base/pykde4/pykde4-4.6.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.6.9999.ebuild
@@ -20,14 +20,13 @@ inherit python kde4-meta
 
 DESCRIPTION="Python bindings for KDE4"
 KEYWORDS=""
-IUSE="debug doc examples qscintilla semantic-desktop"
+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?')
-	qscintilla? ( x11-libs/qscintilla )
 	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
 	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
 	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
@@ -52,9 +51,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# Required for KTabWidget::label
+	append-cxxflags -DKDE3_SUPPORT
+
 	mycmakeargs=(
-		$(cmake-utils_use_with qscintilla)
 		-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)
diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index 9b3eea32dde..439c59778cf 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -20,14 +20,13 @@ inherit python kde4-meta
 
 DESCRIPTION="Python bindings for KDE4"
 KEYWORDS=""
-IUSE="debug doc examples qscintilla semantic-desktop"
+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?')
-	qscintilla? ( x11-libs/qscintilla )
 	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
 	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
 	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
@@ -52,9 +51,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# Required for KTabWidget::label
+	append-cxxflags -DKDE3_SUPPORT
+
 	mycmakeargs=(
-		$(cmake-utils_use_with qscintilla)
 		-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)