Remove bogus QScintilla support. Bug 354163.

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

4 files changed, 24 insertions, 9 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 130993961038..e89e970b2222 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,10 @@
 # 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.105 2011/04/06 14:18:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.106 2011/04/17 17:29:11 reavertm Exp $
+
+  17 Apr 2011; Maciej Mrozowski <reavertm@gentoo.org> pykde4-4.6.2.ebuild,
+  metadata.xml:
+  Remove bogus QScintilla support. Bug 354163.
 
 *pykde4-4.6.2 (06 Apr 2011)
 
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index c7a259be3501..5e6bf8fa08d3 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
 AUX pykde4-4.4.5-PyQt4-4.7.5.patch 1065 RMD160 09b431c53354628c3a692a5f9c72ccea1202fc56 SHA1 cf5f48219916ac14ac2a156c7807639c5fd253c5 SHA256 0410dc77dc73e7465619cd24eb60436bc5abd073365dd1c4c294b59c73d9ed46
 AUX pykde4-4.4.5-sip-4.12.patch 1988 RMD160 2d742d6d2d911a21ab8dbc3b3f938ac2096f8efe SHA1 ed5f74f9198e3e90c9fbb46c621d6e310a08fa0e SHA256 e15d7fda0dc0b2678bbd721601ee2581a00e6c478f5034c57877da394c9a14b2
@@ -8,6 +11,13 @@ DIST kdebindings-4.4.5.tar.bz2 5092007 RMD160 057cafc1922a5ab3999e6dcc532d656dd4
 DIST kdebindings-4.6.2.tar.bz2 7077784 RMD160 767de487f3c9836a94f5924d04c1af4bd8e26f1e SHA1 eff4b5785b09958fffe4e23583f5af75c796aa9e SHA256 b75a4ee71471547060294cef25adb4d884218d8c3fb60b7611e62d80fd25e1ce
 EBUILD pykde4-4.4.5-r1.ebuild 2230 RMD160 8ab741d71fa6e182ca74f1b54519e8a1b3ca5a53 SHA1 155cc7db3c51aa820e4139f202029090112b284b SHA256 93ca162cc69da98f723b6ee6b32924c910e60645b28e00ebe1513b159422ab7d
 EBUILD pykde4-4.4.5.ebuild 2218 RMD160 aa3f42d4c977904f3df7e95fb401d056ff99d1d6 SHA1 691e6e08dd31565e9f44c3f7b9ff9e0603608ebe SHA256 9cdf541e33d5cd4d3471b9b246b9a6d47a2a2d0c92ca0a48059f2c05009ce7cd
-EBUILD pykde4-4.6.2.ebuild 2129 RMD160 5700df78a5f7066c5eeac75bb2e6533e18ff4047 SHA1 b0f01baec6a001f994c52e5a705d4b76995552d5 SHA256 f5daaae643bad4df58305c7bf4fc4cc17c256fe27d2892a144adef9f15c15d14
-MISC ChangeLog 14388 RMD160 7793804d38f8a22d2d40a480ec0594132d460758 SHA1 b0d103d13c3218bcd7becb6fcad5440db3e19994 SHA256 6902750b34845a220763eebc7ae7200d21a462425be42401c840dbf6632b2ed2
-MISC metadata.xml 336 RMD160 7c6178e23d8f17215cb3a49710683070b50bc8fb SHA1 4e68d07ed9b725ee6513d46342151453a99be3f7 SHA256 a5c389c756b3328167ea5d045eca62ef72e92794b8d0936bf955ec9e5d284815
+EBUILD pykde4-4.6.2.ebuild 2134 RMD160 905fc843d4a15eec555144fd0fb0414c8edcd913 SHA1 e70dc835825c71d9c7d05ef1e4a30ae4323aa7c2 SHA256 d0e0cf21ad4fe0c33c37981acd70198181c4207ed28854bfbabf7d7d2c6b097f
+MISC ChangeLog 14526 RMD160 80773a736f06fd868b8c812d0558457115bdca9f SHA1 dd57588ba65b1ee4c3c90813bc42da13a448b299 SHA256 e31e4da1838488451f94fcbb0e9228131bd1071b12073ec3d364a518c6ca08e6
+MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2rI2wACgkQFuHa/bHpVduDqQCdFCRKUUHGjg+lHG3C7mqmSbxB
+kc0An168jOhmHaTkttN2Ih9YIlqkP7u3
+=2CgW
+-----END PGP SIGNATURE-----
diff --git a/kde-base/pykde4/metadata.xml b/kde-base/pykde4/metadata.xml
index 8f572af7eefd..9015e188a47d 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.2.ebuild b/kde-base/pykde4/pykde4-4.6.2.ebuild
index 5ddad66ea258..a4e4f17585a8 100644
--- a/kde-base/pykde4/pykde4-4.6.2.ebuild
+++ b/kde-base/pykde4/pykde4-4.6.2.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.6.2.ebuild,v 1.1 2011/04/06 14:18:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.6.2.ebuild,v 1.2 2011/04/17 17:29:11 reavertm Exp $
 
 EAPI=3
 
@@ -15,14 +15,13 @@ 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"
+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] )
@@ -47,9 +46,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)