Removed alternative dependency on Qt metapackage, switched to EAPI=2 for 0.25-r1 and fixed other minor issues

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

3 files changed, 21 insertions, 19 deletions

diff --git a/dev-util/qdevelop/ChangeLog b/dev-util/qdevelop/ChangeLog
index 02111da0ad90..e37bdf208227 100644
--- a/dev-util/qdevelop/ChangeLog
+++ b/dev-util/qdevelop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/qdevelop
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/ChangeLog,v 1.7 2009/01/31 21:45:26 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/ChangeLog,v 1.8 2009/10/05 19:56:10 ayoy Exp $
+
+  05 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> qdevelop-0.25-r1.ebuild,
+  qdevelop-0.26.1.ebuild:
+  Removed alternative dependency on Qt metapackage, switched to EAPI=2 for
+  0.25-r1 and fixed other minor issues
 
 *qdevelop-0.26.1 (31 Jan 2009)
 
diff --git a/dev-util/qdevelop/qdevelop-0.25-r1.ebuild b/dev-util/qdevelop/qdevelop-0.25-r1.ebuild
index bd43e8435079..99ef92b5f622 100644
--- a/dev-util/qdevelop/qdevelop-0.25-r1.ebuild
+++ b/dev-util/qdevelop/qdevelop-0.25-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/qdevelop-0.25-r1.ebuild,v 1.5 2008/07/23 13:08:32 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/qdevelop-0.25-r1.ebuild,v 1.6 2009/10/05 19:56:10 ayoy Exp $
+
+EAPI="2"
 
-EAPI="1"
 inherit base eutils qt4 toolchain-funcs
 
 DESCRIPTION="A development environment entirely dedicated to Qt4."
@@ -14,19 +15,18 @@ KEYWORDS="~amd64 x86"
 SLOT="0"
 IUSE=""
 
-RDEPEND="
-	|| ( ( x11-libs/qt-gui:4
-		x11-libs/qt-sql:4 )
-	>=x11-libs/qt-4.2:4 )"
+RDEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-sql:4[sqlite]"
 DEPEND="app-arch/unzip
-		${RDEPEND}"
-
-QT4_BUILT_WITH_USE_CHECK="sqlite3"
+	${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
 
-src_compile() {
+src_configure() {
 	eqmake4 QDevelop.pro
+}
+
+src_compile() {
 	emake CXX=$(tc-getCXX) || die "emake failed"
 }
 
diff --git a/dev-util/qdevelop/qdevelop-0.26.1.ebuild b/dev-util/qdevelop/qdevelop-0.26.1.ebuild
index 41b27589ef11..236c527e0d5e 100644
--- a/dev-util/qdevelop/qdevelop-0.26.1.ebuild
+++ b/dev-util/qdevelop/qdevelop-0.26.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/qdevelop-0.26.1.ebuild,v 1.2 2009/02/01 02:20:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/qdevelop-0.26.1.ebuild,v 1.3 2009/10/05 19:56:10 ayoy Exp $
 
 EAPI="2"
 
@@ -15,12 +15,9 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	|| (
-	( x11-libs/qt-gui:4 x11-libs/qt-sql:4 )
-	>=x11-libs/qt-4.2:4 )"
-
-QT4_BUILT_WITH_USE_CHECK="sqlite3"
+DEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-sql:4[sqlite]"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	eqmake4 QDevelop.pro