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

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 26 insertions, 55 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/Manifest b/sci-geosciences/qlandkarte/Manifest
index e52401eab4bb..848d440d5bc6 100644
--- a/sci-geosciences/qlandkarte/Manifest
+++ b/sci-geosciences/qlandkarte/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST QLandkarte_0.7.3.tar.gz 2327171 RMD160 34e532fed41199aff94f88d9c3eedb8f67a4aef6 SHA1 8d4bd5729c827ed5e069d3f5030950ce735a7ec9 SHA256 a43b8f7ac793ea696d0908a187a872eaac6b934b5a435c906e520830dc70b51e
 DIST QLandkarte_final.tar.gz 2262229 RMD160 7461b170835dff7c71d3766c84dd21ec50935193 SHA1 a0bf7784e3de8d38b3b48d0f8fe1efd4b1f8afef SHA256 f483e8bc8e4dfb0ad387a2c6cfc45d5c5392b54508d6d4fd0c4e21221aff2674
-EBUILD qlandkarte-0.7.3.ebuild 699 RMD160 ed4ad35e48e7300af429b18fdedd317f8e34d552 SHA1 42ad6b03ed105b45af9038e916716c11e66b3ddc SHA256 ce36a12fd7fa4361df7963e1045e7a4b4101e4225b20b440fa2b79dab36b3a5d
-EBUILD qlandkarte-0.7.4.ebuild 891 RMD160 fa2e8672e213d39ab6a5d0f3605c1241df4d5cec SHA1 13496f417818f2c17afdf9cc457b17292fc29a32 SHA256 8ec8a1261082122db629463eb88f1d9957f9659e4aa3b0265d9a5d8e98231f89
-MISC ChangeLog 1652 RMD160 68ff3960749911194eb71e835516b6d453260fa4 SHA1 afc23edf6ef4a9cd4613476a5080592eb364e419 SHA256 abbc370f6efa5982bdaf65820e69e918a613ed88e28396fe66562a62b42d9c1a
-MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
+EBUILD qlandkarte-0.7.4.ebuild 739 RMD160 919c5374004a4051aec7c8267944fc83e37b34e1 SHA1 01710b98760d3519629fb7e359080f6b3e80c027 SHA256 f588794b053cfcfdf9d754437d64bb13e592959cfed9d82c3b439a694573f4bf
+MISC ChangeLog 1821 RMD160 028c3947c1c927699122a70d7903bb7811511c8a SHA1 ba75efd29985ba407cc4d15f7db368ccffd3afdb SHA256 553325e15238e87bc8d41926fb7fa8a28118d0ace7f4ef2eed62d1ee57a2daed
+MISC metadata.xml 232 RMD160 7a639cafa7de0af4ae7cb7167ff092cf858cb9e3 SHA1 c1186ab39174b82a122d6ccd4aa6f798a44aa1b8 SHA256 06d74b1fa39badfed0a9c02a114b9c8149b44d5500556310f35f419b4ff932be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk+YKNwACgkQgAnW8HDreRbe0gCgt+w+2kXZc2uFa7ZTZgYj1M1Y
-T+UAoLFFlPjfKBTvWUWsh/m18yZPud/t
-=Fkvt
+iEYEAREKAAYFAk+ePD4ACgkQgAnW8HDreRapuwCfXRikdfrcLu2GBAL9l7kLcpXZ
+IDcAn1regjYjgu4tYZ/GHzrAoZwIw9HG
+=rKGJ
 -----END PGP SIGNATURE-----
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
 }