Removed obsolete QT_BUILT_WITH_USE and the dependency on Qt metapackage, switched to EAPI=2 and fixed to make repoman happy

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

3 files changed, 34 insertions, 19 deletions

diff --git a/sci-geosciences/gebabbel/ChangeLog b/sci-geosciences/gebabbel/ChangeLog
index 962ed3b81738..46a0b3291adb 100644
--- a/sci-geosciences/gebabbel/ChangeLog
+++ b/sci-geosciences/gebabbel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gebabbel
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gebabbel/ChangeLog,v 1.3 2008/07/27 01:18:49 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gebabbel/ChangeLog,v 1.4 2009/09/30 16:39:13 ayoy Exp $
+
+  30 Sep 2009; Dominik Kapusta <ayoy@gentoo.org> gebabbel-0.3.ebuild:
+  Removed obsolete QT_BUILT_WITH_USE and the dependency on Qt metapackage,
+  switched to EAPI=2 and fixed to make repoman happy
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> gebabbel-0.3.ebuild:
   Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
diff --git a/sci-geosciences/gebabbel/Manifest b/sci-geosciences/gebabbel/Manifest
index 9f9890453a69..203b9c28dc2d 100644
--- a/sci-geosciences/gebabbel/Manifest
+++ b/sci-geosciences/gebabbel/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gebabbel-0.3-fix.diff 545 RMD160 663f72fc848bc76167c900d19aaa69dc3f863bfc SHA1 27694e44e2fa37394a96637c08c5ccd0e891f8b9 SHA256 8a2d0d7babe2c902c41622bd24626b74212427520f6c5f5843f3dca35a7f77ca
 DIST Gebabbel-0.3-Src.tar.gz 2316428 RMD160 7b9779122fc416ef7df8573565db168a21ed92c9 SHA1 5183b46e2803c05238de52be557f76095527e3f1 SHA256 85f80c936b5db07150c2d5431cce6c6272c0ae8d5eacc8a058fc08cfd5693d5e
-EBUILD gebabbel-0.3.ebuild 862 RMD160 2e370f21c9da7dc1d4b14a19697c64c3fa2f8945 SHA1 ef596e34589a1222db6e04eafe57489f00afa09d SHA256 02b351660011b7432e65907b387725b0c7935b8edc57e6caba1662a5c9000a87
-MISC ChangeLog 737 RMD160 c15293ef32e3cdabbfaa77f6ff0acc5d8cd88bee SHA1 781840fad3da081163cbc02f0f5ab73d6f0b1c9b SHA256 a68812a008f891d1a20424fc3dec8132bf57c62008126932c9d7326c084fbd5c
+EBUILD gebabbel-0.3.ebuild 845 RMD160 80a6dc99532703a1894dba22df88510f38e31267 SHA1 96df475772c9a06cab50e4a151e1873e66291d06 SHA256 b24a52b3130bcd354363168c89584af23b1b5fb14496c9f02010b8ed2e21a5c7
+MISC ChangeLog 935 RMD160 58fe313456698cd8c04a7c12bc008219ddfd4579 SHA1 2cbf8d304e399cad143972fd5fe0d13c01b33ec0 SHA256 1bc47886fcf9df092d905af4f3c728b77091532f4c0306beee71d88650ad3355
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrDibwACgkQ+CZEqwt+F6Y1zACfSIRPMT9V5LSHdZyJu5fhuqvR
+oVYAnR/NZDs8zAf6H3i9RASdoRZfjqMO
+=jkqv
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gebabbel/gebabbel-0.3.ebuild b/sci-geosciences/gebabbel/gebabbel-0.3.ebuild
index d2d97b6c56be..43bca68f87d9 100644
--- a/sci-geosciences/gebabbel/gebabbel-0.3.ebuild
+++ b/sci-geosciences/gebabbel/gebabbel-0.3.ebuild
@@ -1,35 +1,36 @@
-# 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/sci-geosciences/gebabbel/gebabbel-0.3.ebuild,v 1.3 2008/07/27 01:18:49 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gebabbel/gebabbel-0.3.ebuild,v 1.4 2009/09/30 16:39:13 ayoy Exp $
 
-EAPI="1"
+EAPI="2"
 inherit eutils qt4
 
+MY_PN=${PN/g/G}
+MY_P=${MY_PN}-${PV}
+
 DESCRIPTION="QT-Frontend to load and convert gps tracks with gpsbabel"
 HOMEPAGE="http://gebabbel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/Gebabbel-${PV}-Src.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-Src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND="|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) =x11-libs/qt-4.3*:4 )
+DEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4[accessibility]"
+RDEPEND="${DEPEND}
 	sci-geosciences/gpsbabel"
 
-S="${WORKDIR}/Gebabbel-${PV}"
+S="${WORKDIR}/${MY_P}"
 
-QT4_BUILT_WITH_USE_CHECK="guiaccessibility"
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-fix.diff"
 }
 
-src_compile() {
-	qmake || die
-	emake || die
+src_configure() {
+	eqmake4 ${MY_PN}.pro
 }
 
 src_install() {
-	dobin bin/gebabbel || die
-	dodoc CHANGELOG || die
+	dobin bin/${PN} || die "dobin failed"
+	dodoc CHANGELOG || die "dodoc failed"
 }