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

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 18 insertions, 74 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/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}