[gentoo-commits] proj/kde:master commit in: kde-base/pykde4/

["Maciej Mrozowski" <reavertm@gentoo.org>]

commit:     8df83ce4cba8291e2f34530dcf41f1b210f8a516
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 17:18:51 2011 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 17:20:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8df83ce4

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

---
 kde-base/pykde4/metadata.xml           |    1 -
 kde-base/pykde4/pykde4-4.6.1-r1.ebuild |   87 --------------------------------
 kde-base/pykde4/pykde4-4.6.9999.ebuild |    8 ++-
 kde-base/pykde4/pykde4-9999.ebuild     |    8 ++-
 4 files changed, 10 insertions(+), 94 deletions(-)

diff --git a/kde-base/pykde4/metadata.xml b/kde-base/pykde4/metadata.xml
index 8f572af..9015e18 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 c3d2b0d..0000000
--- 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 9b3eea3..439c597 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 9b3eea3..439c597 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)