[gentoo-commits] gentoo-x86 commit in sci-geosciences/merkaartor: metadata.xml ChangeLog merkaartor-9999.ebuild merkaartor-0.13.1.ebuild

[Hanno Boeck (hanno)]

hanno       09/04/03 10:37:40

  Modified:             metadata.xml ChangeLog merkaartor-9999.ebuild
  Added:                merkaartor-0.13.1.ebuild
  Log:
  merkaartor bump and more useflags
  (Portage version: 2.2_rc28/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-geosciences/merkaartor/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	29 Feb 2008 11:37:29 -0000	1.1
+++ metadata.xml	3 Apr 2009 10:37:40 -0000	1.2
@@ -5,4 +5,9 @@
   <maintainer>
     <email>hanno@g.o</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>



1.14                 sci-geosciences/merkaartor/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?r1=1.13&r2=1.14

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	8 Mar 2009 20:26:06 -0000	1.13
+++ ChangeLog	3 Apr 2009 10:37:40 -0000	1.14
@@ -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@g.o> 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@g.o> merkaartor-9999.ebuild:
   Sync live with versioned ebuild.



1.6                  sci-geosciences/merkaartor/merkaartor-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?r1=1.5&r2=1.6

Index: merkaartor-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- merkaartor-9999.ebuild	8 Mar 2009 20:26:06 -0000	1.5
+++ merkaartor-9999.ebuild	3 Apr 2009 10:37:40 -0000	1.6
@@ -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 @@
 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"
 }
 



1.1                  sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild?rev=1.1&content-type=text/plain

Index: merkaartor-0.13.1.ebuild
===================================================================
# 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"
}