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

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

4 files changed, 34 insertions, 22 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/Manifest b/dev-util/qdevelop/Manifest
index e2c5e3f0115e..ec408b4be11f 100644
--- a/dev-util/qdevelop/Manifest
+++ b/dev-util/qdevelop/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qdevelop-0.25-gcc43.patch 364 RMD160 9bc204ab5c1c3eba0ddbcd597d835a520d7faf9c SHA1 9bc62128d12bb94d15845811c681db609a173095 SHA256 4df90bf945f9f09e781988255d6f471e0e2edbaa228d8ab837cfa9bd722f106f
 AUX qdevelop.desktop 335 RMD160 3b503ed6b08fa16249d1db396fefecb3fbde11c4 SHA1 ae205549fae9ef4fd9098926fa4f309dbe35537a SHA256 e1d31f3df7c0c31bf37e7cd483cc2cda002de7222f3e3d44bb11756fc980b1cd
 DIST qdevelop-0.26.1.tar.gz 1049318 RMD160 66b7f15ffe8c856a52b1aef7b2b69906455af483 SHA1 b237290b146f974221a2d938fc68334e605d2a73 SHA256 f8ce865b6396487756f1a34dcd058203c7490ff1dcc636bfe9fead539a21d2ce
 DIST qdevelop_0.25.zip 1094821 RMD160 b90eef791dd5ac5934fe12ee96073852a4a4aca2 SHA1 1a7186f8836aa8183dbed409ba8f282e8cf34835 SHA256 76a954e01a981066a4d680b831761284bb588a50f7cb18c6cf21680b5c5a2ecd
-EBUILD qdevelop-0.25-r1.ebuild 946 RMD160 f7b0b462c235c46f8742c6ae98dc7f2aeeb44eef SHA1 d544d70a12ce475f3c7a0dc8d13c5be123d34cd8 SHA256 f15e62689bf749f800b88b5271aaf49b94cc6d8df2fd50aa56503f9659eb4cab
-EBUILD qdevelop-0.26.1.ebuild 928 RMD160 bd4ba2400e59f2083639a4c0b8c8b97f8a06f465 SHA1 2f125a688694765879b6a8e1cc877387616b6441 SHA256 716026e48588e3ffe4e15a1589690a0b680ae160292423ba897bd3502ef38310
-MISC ChangeLog 2244 RMD160 451aaadbe25e36394b37eda326e5cb7c99be8af3 SHA1 e064afc0b48f17a2e0a7f0abb8558410dc74cda2 SHA256 3289d3c45129017785b22197f0b500043e55dbcb5c588d73e706c64d2bc3a596
+EBUILD qdevelop-0.25-r1.ebuild 900 RMD160 e72473545af2155c0e04e9c84f30f10830fd4296 SHA1 10aba7b771f5d0a858f98aa390b8a0f99a5e218b SHA256 163518f3c40e3d6fabcc72670f1b1cb1290287e7cc817e92a53a75f7d3362cd7
+EBUILD qdevelop-0.26.1.ebuild 881 RMD160 ca8d8ddcac0152c86a40c5fd739a869904f91908 SHA1 a924ce4a7d54faceb2467d14581718d03e3c984a SHA256 7eada480decdd1f274b181cd9483c2c6fc7cf02d3a72d5a2f5933f40adfe87d1
+MISC ChangeLog 2458 RMD160 54d55de1329458cf7beb71b46154285fc196abae SHA1 ce53c2bc20c51aa2c58abf69d93f728b7dbdea0e SHA256 87e96920aecbb3b5fc130dbbf98c1aacf819f836b901deb5232c74e9df7af27b
 MISC metadata.xml 250 RMD160 6c99386d30f0a994b5fdd33e9cb4c4834bf0b065 SHA1 65a7f9fe1611296a8097dae74e813da9443afe54 SHA256 25978734e7451145c61e67904310a3024287853960a33fabbe3b57cb4f5c1202
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrKT2MACgkQ+CZEqwt+F6aE8gCfTXDPGHCqAc6nSmm9/a/NhyIY
+14wAn1kSE14Hu5so/ywojwoQ+yEIvFHd
+=kZor
+-----END PGP SIGNATURE-----
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