sci-geosciences/qlandkarte: Punt old, move to EPAI=4 and qt4-r2 eclass, #413553

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

4 files changed, 20 insertions, 47 deletions

diff --git a/sci-geosciences/qlandkarte/ChangeLog b/sci-geosciences/qlandkarte/ChangeLog
index 33827030f5df..eb3f7eca95df 100644
--- a/sci-geosciences/qlandkarte/ChangeLog
+++ b/sci-geosciences/qlandkarte/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/qlandkarte
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkarte/ChangeLog,v 1.10 2012/04/25 16:39:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkarte/ChangeLog,v 1.11 2012/04/30 07:16:08 jlec Exp $
+
+  30 Apr 2012; Justin Lecher <jlec@gentoo.org> -qlandkarte-0.7.3.ebuild,
+  qlandkarte-0.7.4.ebuild, metadata.xml:
+  Punt old, move to EPAI=4 and qt4-r2 eclass, #413553
 
   25 Apr 2012; Justin Lecher <jlec@gentoo.org> qlandkarte-0.7.4.ebuild:
   Drop unnessecary die
diff --git a/sci-geosciences/qlandkarte/metadata.xml b/sci-geosciences/qlandkarte/metadata.xml
index 3beda91ba209..b30f629d8572 100644
--- a/sci-geosciences/qlandkarte/metadata.xml
+++ b/sci-geosciences/qlandkarte/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
-  <maintainer>
-    <email>hanno@gentoo.org</email>
-  </maintainer>
+	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>hanno@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-geosciences/qlandkarte/qlandkarte-0.7.3.ebuild b/sci-geosciences/qlandkarte/qlandkarte-0.7.3.ebuild
deleted file mode 100644
index c6ac7e8bd1c5..000000000000
--- a/sci-geosciences/qlandkarte/qlandkarte-0.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkarte/qlandkarte-0.7.3.ebuild,v 1.3 2009/09/30 16:44:49 ayoy Exp $
-
-EAPI="1"
-
-DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS."
-HOMEPAGE="http://qlandkarte.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/QLandkarte_${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	sci-libs/proj
-	dev-libs/libusb"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/QLandkarte_${PV}"
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "install failed"
-}
diff --git a/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild b/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild
index cea467f9d24e..2e805d2d6534 100644
--- a/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild
+++ b/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild,v 1.3 2012/04/25 16:39:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild,v 1.4 2012/04/30 07:16:08 jlec Exp $
 
-EAPI="1"
+EAPI=4
 
-inherit autotools eutils qt4
+inherit autotools eutils qt4-r2
 
-DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS."
+DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS"
 HOMEPAGE="http://qlandkarte.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/QLandkarte_final.tar.gz"
 
@@ -16,26 +16,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
+	dev-libs/libusb
 	sci-libs/proj
-	dev-libs/libusb"
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/QLandkarte_final"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	eautoreconf
 }
 
-src_compile() {
-	econf
-	eqmake4 QLandkarte.pro || die "eqmake4 failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "install failed"
+src_configure() {
+	default
+	qt4-r2_src_configure
 }