merkaartor: remove old versions and change dep to qt 4.4

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6 i686)

4 files changed, 7 insertions, 59 deletions

diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index 66dad0613cf9..5397179a9bd6 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-geosciences/merkaartor
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.6 2008/08/07 00:21:14 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.7 2008/09/16 20:59:45 hanno Exp $
+
+  16 Sep 2008; Hanno Boeck <hanno@gentoo.org> merkaartor-0.11.ebuild:
+  Change dependency to qt 4.4.
 
 *merkaartor-0.11 (07 Aug 2008)
 
diff --git a/sci-geosciences/merkaartor/merkaartor-0.0.10.ebuild b/sci-geosciences/merkaartor/merkaartor-0.0.10.ebuild
deleted file mode 100644
index 40e9562f1987..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.0.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.0.10.ebuild,v 1.2 2008/07/28 21:37:31 carlo Exp $
-
-EAPI=1
-
-inherit qt4
-
-DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.irule.be/bvh/c++/merkaartor/"
-SRC_URI="http://www.irule.be/bvh/c++/merkaartor//versions/Merkaartor-${PV}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="=x11-libs/qt-4.3*:4"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	eqmake4 Merkaartor.pro || die "qmake failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin release/merkaartor || die "dobin failed"
-	dodoc AUTHORS CHANGELOG HACKING || die "dodoc failed"
-}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.0.9.ebuild b/sci-geosciences/merkaartor/merkaartor-0.0.9.ebuild
deleted file mode 100644
index 65804a277045..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.0.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.0.9.ebuild,v 1.2 2008/07/28 21:37:31 carlo Exp $
-
-EAPI=1
-
-inherit qt4
-
-DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.irule.be/bvh/c++/merkaartor/"
-SRC_URI="http://www.irule.be/bvh/c++/merkaartor//versions/Merkaartor-${PV}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="=x11-libs/qt-4.3*:4"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	eqmake4 Merkaartor.pro || die "qmake failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin release/merkaartor || die "dobin failed"
-	dodoc AUTHORS CHANGELOG HACKING || die "dodoc failed"
-}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.11.ebuild b/sci-geosciences/merkaartor/merkaartor-0.11.ebuild
index 34cdc2376685..541ab1a047ec 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.11.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild,v 1.1 2008/08/07 00:21:14 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild,v 1.2 2008/09/16 20:59:45 hanno Exp $
 
 EAPI="1"
 
@@ -13,7 +13,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
-DEPEND="|| ( ( x11-libs/qt-webkit:4 x11-libs/qt-gui:4 ) =x11-libs/qt-4.3* )"
+DEPEND="x11-libs/qt-webkit:4
+	x11-libs/qt-gui:4"
 S="${WORKDIR}/${PN}"
 
 src_compile() {