merkaartor: remove old versions and change dep to qt 4.4

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 i686

5 files changed, 12 insertions, 68 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/Manifest b/sci-geosciences/merkaartor/Manifest
index 104c3d87b328..812506e8502a 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST Merkaartor-0.0.10.tgz 285502 RMD160 8523d04e3442e6276b9ef516e2dea22108c37d42 SHA1 c8bd77d8e85dbe084290909ffc73721a5b69a7fe SHA256 c23c15a6b9ea28cecaac89459bfff1cc7b5ed03a176d73bb252bb60d6076fdae
-DIST Merkaartor-0.0.9.tgz 238377 RMD160 b91737ae238d4aae7565f78a1136614e687aa5ff SHA1 9638439c0045edfc169368ea6dc67e4e7efc58a2 SHA256 22a1fabde53ed83f44f0c6f79116433f1998c11059efe49dffae1f7887402b4e
 DIST Merkaartor-0.11.tar.bz2 8812029 RMD160 c4382d285ba7c53613154f29779d6952278aa218 SHA1 46066665656196fe2f8fc0c94585a089dff1fc79 SHA256 8c1c14c5fce34189152aa1cf221cc3998e303390d0be658c91f560bcaa082d8f
-EBUILD merkaartor-0.0.10.ebuild 776 RMD160 1378a5f723a591b3ba428fdb0f2cc946d418bdf5 SHA1 8f8726116d9b7a0b9ced8936af070d85500622b9 SHA256 1781bde26286b1946249729debb6b58beec39abadca7247eebf1ee786ed20404
-EBUILD merkaartor-0.0.9.ebuild 775 RMD160 d344fa97082084ae8e738a5fd7a967f10ccc3108 SHA1 61a1b70ca500a18b732a5725366295f84230479a SHA256 55bf1abf6d00b8678aa5af10d82abba22457fcebf73c7058964f23693d3db8ee
-EBUILD merkaartor-0.11.ebuild 892 RMD160 a67f981a8dc0357853050811c87618a56ea71703 SHA1 97641f6783b8c1a6d6a1d773a8ec9f1e8130496e SHA256 8c500de15f2eea7a6ce03cabd6ba8115877e4919c2388a2f16294b3360372695
+EBUILD merkaartor-0.11.ebuild 864 RMD160 3269b1981f31662fb206c4fbd52eeccf83937052 SHA1 902d3022b1758027d99aba92d6f0f3279dc182a7 SHA256 a744d58b62992eedcc4cebd58cf1173995cbab5e9089e977a9db13341945fdac
 EBUILD merkaartor-9999.ebuild 881 RMD160 0006b7bbc003cea62942287ce90af98215fb8a22 SHA1 53a671b5b39161fc626dea5331cf8af7ecadb30b SHA256 ba7b3e4e5f1d4cfa75dcaa2b3cb79996b5bffc5c514e9a97a8bf410fc8596964
-MISC ChangeLog 1169 RMD160 e8e37491b96929f5ac53378ba7451ad1e582013c SHA1 380f8584703907f2560bdffa36f46f42f5c6d11e SHA256 204d19bec13f88fc9838fd350fc1f7e8a3138c79847bf279243e5cfae453adb7
+MISC ChangeLog 1271 RMD160 a7c0b77bf51dd9939ad0a39dac41dd815dd63278 SHA1 bb770185a20353a068a8ec045aeb637197b7ce77 SHA256 4420c7030f261fb1f9ac33beafe4b2c0d8437f4840a01ab66e2e568159d53039
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiaP/wACgkQr2QksT29OyDQlwCghrplekt60LTeWayrwKQrboJ6
-7XMAnjt5dKdqvq0gS4A1wn/NBx0bGn+3
-=nPI8
+iEYEARECAAYFAkjQHkAACgkQr2QksT29OyD6dACffkH3R8yP3VHCLxiipJ7IJ8XH
+GaMAn0ZEcwui8eJJw5p5HRoCoDieBShO
+=M9TU
 -----END PGP SIGNATURE-----
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() {