Adjust qscintilla-python dep which no longer has qt4 useflag (qt4 is always enabled).

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 21 insertions, 79 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 4c5f15490876..9d6cae4d9c37 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qscintilla
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.36 2009/11/09 10:53:36 abcd Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.37 2010/01/02 18:59:18 yngwin Exp $
+
+  02 Jan 2010; Ben de Groot <yngwin@gentoo.org> -qscintilla-1.5.1.ebuild,
+  qscintilla-2.3.2.ebuild, qscintilla-2.4.ebuild:
+  Adjust qscintilla-python dep which no longer has qt4 useflag (qt4 is
+  always enabled). Remove obsolete version.
 
   09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
   -files/qscintilla-2.1-qt.patch, -files/qscintilla-2.1-qt4.patch:
@@ -415,14 +420,14 @@
   Version bump
 
   09 May 2003; Luca Barbato <lu_zero@gentoo.org> qscintilla-1.52.ebuild :
-  Keyworded ~ppc 
+  Keyworded ~ppc
 
 *qscintilla-1.52 (29 Apr 2003)
 
   29 Apr 2003; Michele Balistreri <brain@gentoo.org> qscintilla-1.52.ebuild :
   Version bump
 
-*qscintilla-1.49-r1 (1 Feb 2003) 
+*qscintilla-1.49-r1 (1 Feb 2003)
 
   01 Feb 2003; Joachim Blaabjerg <styx@gentoo.org>
 
@@ -436,9 +441,9 @@
 
   Fixed the ebuild a little, sandbox violations etc.
 
-*qscintilla-1.49 (19 Dec 2002) 
+*qscintilla-1.49 (19 Dec 2002)
 
   19 Dec 2002; Bart Verwilst <verwilst@gentoo.org>
- 
+
   initial ebuild.
 
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 504b6fa80224..baeb3d1a926c 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -6,10 +6,8 @@ AUX qscintilla-2.4-designer.patch 1042 RMD160 cfb80962caed15e4bb6c290edcc35d1acf
 DIST QScintilla-1.71-gpl-1.7.1.tar.gz 1060119 RMD160 ba85db98e552b388510df5d1f7e0e78f52856ed2 SHA1 424415960e5cbcd58306e87d1d610bd8e72f3368 SHA256 437e5fc6e5905f9aa7d0f4ea8eb41c96fcddf7ce3cb9b786066a315c5b9ff70c
 DIST QScintilla-gpl-2.3.2.tar.gz 2146902 RMD160 de7828d4b965156771034eb622ee9614b2aea9be SHA1 d34ae9907e6221d221c5b5c1324e9b263553d2cb SHA256 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749
 DIST QScintilla-gpl-2.4.tar.gz 2304554 RMD160 19e5d5c331705c217c5192b1fcac5d298942db69 SHA1 17962bb64d2641f9e181b39fdca39228170488a3 SHA256 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
-DIST qscintilla-1.62-gpl-1.5.1.tar.gz 727606 RMD160 fe7fa31ec1ecbc7f4bbf887817830630dfbd5d88 SHA1 240bafd43f3f1f7c73f76daf98b23da3f071bc43 SHA256 5dfc860a8d91c15775ae03f40a57f0c26f51f90b8266236e457cb8cbb3f6e30e
-EBUILD qscintilla-1.5.1.ebuild 2056 RMD160 5b6eecfe28d4e20b9e477babb0bf119f05ffc7d6 SHA1 fc21b1bc30cb0c85b71b4b363b28a43d55f24c66 SHA256 b7263d9c3fdbbd5ef7af04ea09935f4477c1361798fe73f5a44a4cc1dec842e5
 EBUILD qscintilla-1.7.1.ebuild 2300 RMD160 96542d9c579ef2e81ea8ef1f893c0445a83fb136 SHA1 f0aa09572e6933dffd436c30547b4e4e68030154 SHA256 5d5a6b12c2dba8d784ddba803ada081312ccb144202fc6d18d80ca67a6213a23
-EBUILD qscintilla-2.3.2.ebuild 3805 RMD160 d6d41d1213cc5ba0873a0c63fb40ba272a990637 SHA1 b92f0e444fca0696d9b4d9067b785a8ece6b2fb1 SHA256 57d00e7cd62d83a35c62aca509fb396f80dd0ab97ddf17e33da4dcf4535dc1f9
-EBUILD qscintilla-2.4.ebuild 2414 RMD160 96af66677f51dee27f0ab965264327cbe19b7c5d SHA1 b909d75a5c93388b1e1b7d05efbb8de07875c291 SHA256 10bd9cbb7b670da9f2f3f84634fe3ce4f59981be25d0b232d3eb44bbe00e3ce4
-MISC ChangeLog 15433 RMD160 a667d01548295249ef80e909fd58b9c923fb64d2 SHA1 91e1826e2160b54d31d15dbb700b8b34d09b1fce SHA256 46013869299746b02444cbd63c6a599c88ce7de8e6ddded86c38b19571ea51fc
+EBUILD qscintilla-2.3.2.ebuild 3801 RMD160 fdbc9a0f1f800b2ee164c5a73c014d987bc007d6 SHA1 c79698d86d7304f193bd4a6e12662291598d8169 SHA256 81a3144c93534acbfab55064b6447da121609fbb8daee06948a041a2591e87fd
+EBUILD qscintilla-2.4.ebuild 2407 RMD160 6999797c225f8683c9eb5c3a8ea5e3047bbe795c SHA1 77692e5f30d11f6ed5e66a8db96af95078cd312b SHA256 cf24eca0878b177ff6d35ca0f04e9485f6136d5bce92a5919d722e82122738ef
+MISC ChangeLog 15671 RMD160 8f7ddc6bbecd27ebd3191cd44db51e84317c4615 SHA1 d88f809024608603b5e29069dc0400806dbe59a3 SHA256 962fdc76fcb21ba787f9faf1ed81693a86c346fb2310a2f6f3e37f4786832b63
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild b/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
deleted file mode 100644
index e770f9e18306..000000000000
--- a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-1.5.1.ebuild,v 1.4 2009/11/04 17:44:32 yngwin Exp $
-
-inherit eutils toolchain-funcs
-
-SCINTILLA_VER="1.62"
-MY_P="${PN}-${SCINTILLA_VER}-gpl-${PV}"
-MY_P=${MY_P/_pre/snapshot-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class."
-HOMEPAGE="http://www.riverbankcomputing.co.uk/qscintilla/"
-#SRC_URI="http://www.river-bank.demon.co.uk/download/snapshots/QScintilla/${MY_P}.tar.gz"
-#SRC_URI="http://www.river-bank.demon.co.uk/download/QScintilla/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="=x11-libs/qt-3*"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-LIBDIR="/usr/$(get_libdir)"
-
-src_unpack() {
-	unpack ${A} ; cd "${S}"/qt
-	sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = \${destdir}:" qscintilla.pro
-	echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
-
-	${QTDIR}/bin/qmake -o Makefile qscintilla.pro
-	epatch "${FILESDIR}"/${PN}-1.5-sandbox.patch
-}
-
-src_compile() {
-	cd "${S}"/qt
-	# It uses g++'s syntax while linking (-Wl,) so it can't use tc-getLD.
-	make destdir=${LIBDIR} all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "make failed"
-}
-
-src_install() {
-	dodoc ChangeLog NEWS README
-	dodir /usr/include ${LIBDIR} /usr/share/qscintilla/translations
-	cd "${S}"/qt
-	cp qextscintilla*.h "${D}/usr/include"
-	cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
-	cp libqscintilla.a* "${D}${LIBDIR}"
-	cp -d libqscintilla.so.* "${D}${LIBDIR}"
-	dodir ${QTDIR}/translations/
-	for I in $(ls -1 qscintilla*.qm) ; do
-		dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}"
-	done
-	if use doc ; then
-		dohtml "${S}"/doc/html/*
-		insinto /usr/share/doc/${PF}/Scintilla
-		doins "${S}"/doc/Scintilla/*
-	fi
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
index 6cafc95bfc22..ce0048e7cf41 100644
--- a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v 1.9 2009/06/01 22:28:49 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v 1.10 2010/01/02 18:59:18 yngwin Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs multilib
@@ -15,14 +15,14 @@ SRC_URI="http://www.riverbankcomputing.com/static/Downloads/QScintilla2/${MY_P}.
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="qt4 +python doc examples debug"
+IUSE="+qt4 +python doc examples debug"
 
 RDEPEND="qt4? ( x11-libs/qt-gui:4 )
 	!qt4? ( x11-libs/qt:3 )"
 DEPEND="${RDEPEND}"
 # dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
 # need dev-python/PyQt, bug 199543
-PDEPEND="python? ( dev-python/qscintilla-python[qt4=] )"
+PDEPEND="python? ( dev-python/qscintilla-python )"
 
 src_configure() {
 	local myqmake myqtdir
diff --git a/x11-libs/qscintilla/qscintilla-2.4.ebuild b/x11-libs/qscintilla/qscintilla-2.4.ebuild
index 14f8661cc63d..beab7dab9f61 100644
--- a/x11-libs/qscintilla/qscintilla-2.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.ebuild,v 1.6 2009/10/18 14:48:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.ebuild,v 1.7 2010/01/02 18:59:18 yngwin Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ RDEPEND="qt4? ( x11-libs/qt-gui:4 )
 DEPEND="${RDEPEND}"
 # dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
 # need dev-python/PyQt, bug 199543
-PDEPEND="python? ( ~dev-python/qscintilla-python-${PV}[qt4=] )"
+PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )"
 
 S="${WORKDIR}"/${MY_P}