summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Boeck <hanno@gentoo.org>2009-03-08 20:26:06 +0000
committerHanno Boeck <hanno@gentoo.org>2009-03-08 20:26:06 +0000
commit0252d59f76884acfb322d1751c830a1b05d4c27c (patch)
tree72bc2364898c601a1d62f62cd1cd6bf87192341d /sci-geosciences
parentmkgmap bump (diff)
downloadhistorical-0252d59f76884acfb322d1751c830a1b05d4c27c.tar.gz
historical-0252d59f76884acfb322d1751c830a1b05d4c27c.tar.bz2
historical-0252d59f76884acfb322d1751c830a1b05d4c27c.zip
merkaartor: sync live with versioned ebuild
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/merkaartor/ChangeLog5
-rw-r--r--sci-geosciences/merkaartor/merkaartor-0.12.ebuild3
-rw-r--r--sci-geosciences/merkaartor/merkaartor-9999.ebuild13
3 files changed, 15 insertions, 6 deletions
diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index a43b2338ccb1..88eb5b5352f8 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-geosciences/merkaartor
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.12 2009/01/13 22:50:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.13 2009/03/08 20:26:06 hanno Exp $
+
+ 08 Mar 2009; Hanno Boeck <hanno@gentoo.org> merkaartor-9999.ebuild:
+ Sync live with versioned ebuild.
13 Jan 2009; Hanno Boeck <hanno@gentoo.org> merkaartor-0.12.ebuild:
Add dependency to qt-svg.
diff --git a/sci-geosciences/merkaartor/merkaartor-0.12.ebuild b/sci-geosciences/merkaartor/merkaartor-0.12.ebuild
index 235e6813575b..0efd9d8e46d0 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.12.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.12.ebuild,v 1.3 2009/01/13 22:50:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.12.ebuild,v 1.4 2009/03/08 20:26:06 hanno Exp $
EAPI="1"
@@ -17,6 +17,7 @@ DEPEND="x11-libs/qt-webkit:4
x11-libs/qt-gui:4
x11-libs/qt-svg:4
media-gfx/exiv2"
+RDEPEND="${DEPEND}"
S="${WORKDIR}/${P}"
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 8e4e472a2d62..1ce987d10baf 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,15 +1,15 @@
-# 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/merkaartor/merkaartor-9999.ebuild,v 1.4 2008/11/24 17:59:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.5 2009/03/08 20:26:06 hanno Exp $
EAPI="1"
-inherit qt4 subversion
+inherit eutils qt4 subversion
ESVN_REPO_URI="http://svn.openstreetmap.org/applications/editors/merkaartor/"
DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.irule.be/bvh/c++/merkaartor/"
+HOMEPAGE="http://www.merkaartor.org"
SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
@@ -17,7 +17,9 @@ KEYWORDS=""
IUSE="nls"
DEPEND="x11-libs/qt-webkit:4
x11-libs/qt-gui:4
+ x11-libs/qt-svg:4
media-gfx/exiv2"
+RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}"
@@ -32,4 +34,7 @@ src_compile() {
src_install() {
emake INSTALL_ROOT="${D}" install || die "install failed"
dodoc AUTHORS CHANGELOG HACKING || die "dodoc failed"
+
+ doicon Icons/Mercator_100x100.png
+ make_desktop_entry merkaartor "Merkaartor" /usr/share/pixmaps/Mercator_100x100.png "Science;Geoscience"
}