merkaartor bump and more useflags

(Portage version: 2.2_rc28/cvs/Linux x86_64)

4 files changed, 74 insertions, 7 deletions

diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index 88eb5b5352f8..aa33ae3212d1 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2009/03/08 20:26:06 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.14 2009/04/03 10:37:40 hanno Exp $
+
+*merkaartor-0.13.1 (03 Apr 2009)
+
+  03 Apr 2009; Hanno Boeck <hanno@gentoo.org> metadata.xml,
+  +merkaartor-0.13.1.ebuild, merkaartor-9999.ebuild:
+  Version bump, add more use-flags, sync with live svn ebuild.
 
   08 Mar 2009; Hanno Boeck <hanno@gentoo.org> merkaartor-9999.ebuild:
   Sync live with versioned ebuild.
diff --git a/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild
new file mode 100644
index 000000000000..c727650f2266
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild
@@ -0,0 +1,47 @@
+# 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.13.1.ebuild,v 1.1 2009/04/03 10:37:40 hanno Exp $
+
+EAPI="1"
+
+inherit eutils qt4
+
+DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.org"
+SRC_URI="http://www.merkaartor.org/downloads/source/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls webkit exif proj gdal"
+DEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-svg:4
+	webkit? ( >=x11-libs/qt-webkit-4.3.3 )
+	exif? ( media-gfx/exiv2 )
+	proj? ( sci-libs/proj )
+	gdal? ( sci-libs/gdal )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+src_compile() {
+	local myconf
+	use webkit || myconf="${myconf} NOUSEWEBKIT=1"
+	use exif && myconf="${myconf} GEOIMAGE=1" || myconf="${myconf} GEOIMAGE=0"
+	use proj && myconf="${myconf} PROJ=1" || myconf="${myconf} PROJ=0"
+	use gdal && myconf="${myconf} GDAL=1" || myconf="${myconf} GDAL=0"
+
+	if use nls; then
+		lrelease Merkaartor.pro || die "lrelease failed"
+	fi
+
+	eqmake4 Merkaartor.pro PREFIX=/usr ${myconf} || die "eqmake4 failed"
+	emake || die "make failed"
+}
+
+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"
+}
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 1ce987d10baf..534c1b4c546e 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.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-9999.ebuild,v 1.5 2009/03/08 20:26:06 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.6 2009/04/03 10:37:40 hanno Exp $
 
 EAPI="1"
 
@@ -14,20 +14,29 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="nls"
-DEPEND="x11-libs/qt-webkit:4
-	x11-libs/qt-gui:4
+IUSE="nls webkit exif proj gdal"
+DEPEND="x11-libs/qt-gui:4
 	x11-libs/qt-svg:4
-	media-gfx/exiv2"
+	webkit? ( >=x11-libs/qt-webkit-4.3.3 )
+	exif? ( media-gfx/exiv2 )
+	proj? ( sci-libs/proj )
+	gdal? ( sci-libs/gdal )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
 src_compile() {
+	local myconf
+	use webkit || myconf="${myconf} NOUSEWEBKIT=1"
+	use exif && myconf="${myconf} GEOIMAGE=1" || myconf="${myconf} GEOIMAGE=0"
+	use proj && myconf="${myconf} PROJ=1" || myconf="${myconf} PROJ=0"
+	use gdal && myconf="${myconf} GDAL=1" || myconf="${myconf} GDAL=0"
+
 	if use nls; then
 		lrelease Merkaartor.pro || die "lrelease failed"
 	fi
-	eqmake4 Merkaartor.pro PREFIX=/usr GEOIMAGE=1 || die "qmake failed"
+
+	eqmake4 Merkaartor.pro PREFIX=/usr ${myconf} || die "eqmake4 failed"
 	emake || die "make failed"
 }
 
diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index 3beda91ba209..5cc9b09d86a1 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -5,4 +5,9 @@
   <maintainer>
     <email>hanno@gentoo.org</email>
   </maintainer>
+  <use>
+    <flag name='gdal'>Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+    <flag name='proj'>Enable <pkg>sci-libs/proj</pkg> library support</flag>
+    <flag name='webkit'>Enable <pkg>net-libs/webkit-gtk</pkg> library support</flag>
+  </use>
 </pkgmetadata>