Removing qt3 support, dropping qt4 useflag as it is now the only option.

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

3 files changed, 20 insertions, 24 deletions

diff --git a/dev-python/qscintilla-python/ChangeLog b/dev-python/qscintilla-python/ChangeLog
index e03380826e6a..ce6a038f76b6 100644
--- a/dev-python/qscintilla-python/ChangeLog
+++ b/dev-python/qscintilla-python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/qscintilla-python
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.45 2009/10/18 14:47:12 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.46 2010/01/02 16:45:07 yngwin Exp $
+
+  02 Jan 2010; Ben de Groot <yngwin@gentoo.org>
+  qscintilla-python-2.3.2-r2.ebuild, qscintilla-python-2.4.ebuild:
+  Removing qt3 support, dropping qt4 useflag as it is now the only option.
 
   18 Oct 2009; Raúl Porcel <armin76@gentoo.org>
   qscintilla-python-2.4.ebuild:
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild
index 5647d8e1fb10..c1c93e103854 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.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/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild,v 1.8 2009/08/29 18:02:21 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.3.2-r2.ebuild,v 1.9 2010/01/02 16:45:07 yngwin Exp $
 
 EAPI="2"
 
@@ -16,12 +16,11 @@ SRC_URI="http://www.riverbankcomputing.com/static/Downloads/QScintilla2/${MY_P}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="qt4"
+IUSE=""
 
-DEPEND=">=dev-python/sip-4.4
-	=x11-libs/qscintilla-${PV}*[qt4=]
-	qt4? ( >=dev-python/PyQt4-4.4 )
-	!qt4? ( >=dev-python/PyQt-3.17.6  )"
+DEPEND="dev-python/sip
+	~x11-libs/qscintilla-${PV}[qt4]
+	dev-python/PyQt4"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}/Python
@@ -32,13 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="-o /usr/lib -n /usr/include"
-	if use qt4; then
-		myconf="${myconf} -p 4"
-	else
-		myconf="${myconf} -p 3"
-	fi
-
+	local myconf="-o /usr/lib -n /usr/include -p 4"
 	python_version
 	${python} configure.py ${myconf} || die "configure.py failed"
 }
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild
index 0cf675945ace..f2f66496d362 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-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/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild,v 1.13 2009/10/18 14:47:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild,v 1.14 2010/01/02 16:45:07 yngwin Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -16,12 +16,11 @@ SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug +qt4"
+IUSE="debug"
 
 DEPEND=">=dev-python/sip-4.8
-	~x11-libs/qscintilla-${PV}[qt4=]
-	qt4? ( >=dev-python/PyQt4-4.5[X] )
-	!qt4? ( >=dev-python/PyQt-3.18 )"
+	~x11-libs/qscintilla-${PV}[qt4]
+	dev-python/PyQt4[X]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}/Python"
@@ -35,10 +34,10 @@ src_prepare() {
 src_configure() {
 	configuration() {
 		local myconf="$(PYTHON) configure.py
-				--destdir=$(python_get_sitedir)/PyQt$(use qt4 && echo 4)
+				--destdir=$(python_get_sitedir)/PyQt4
 				-n /usr/include
 				-o /usr/$(get_libdir)
-				-p $(use qt4 && echo 4 || echo 3)
+				-p 4
 				$(use debug && echo '--debug')"
 		echo ${myconf}
 		${myconf}