merkaartor bump and more useflags

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

5 files changed, 83 insertions, 14 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/Manifest b/sci-geosciences/merkaartor/Manifest
index de212cf46f9d..3eb36f3a57e7 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -3,15 +3,17 @@ Hash: SHA1
 
 DIST Merkaartor-0.11.tar.bz2 8812029 RMD160 c4382d285ba7c53613154f29779d6952278aa218 SHA1 46066665656196fe2f8fc0c94585a089dff1fc79 SHA256 8c1c14c5fce34189152aa1cf221cc3998e303390d0be658c91f560bcaa082d8f
 DIST merkaartor-0.12.tar.bz2 1266076 RMD160 4f37ec0789948adca299813500d067b15c590aa4 SHA1 ada16de44fd2c1193d1ba9e38f5ea2d10787edc0 SHA256 56de6a19ab7ad703b50f18ea8935e042a1728449040ba62b1efcd57fbffafb58
+DIST merkaartor-0.13.1.tar.bz2 3011810 RMD160 c617fbf7001f0ba37d5117e3d101ba4e40f54df9 SHA1 ff92d31c7705c6c9b1d1963370ec930c5822e79b SHA256 1577d63cc6fd37ff548ea3836f1242755fbbdf8c2b5b1034b7d3b440b0532ef7
 EBUILD merkaartor-0.11.ebuild 876 RMD160 aa790c571a6765db408b9b0348d4e9e3e9060662 SHA1 2b80544aa5301a14c98f00f206c2aae5c487958a SHA256 98b75da6bab732f739365d96b489e818b28d37761bcfe9a1326615f39ad28f23
 EBUILD merkaartor-0.12.ebuild 1083 RMD160 02d446a222c6222f50d69eeebd20a7b165bc36c0 SHA1 21e04059dc1f0a1ffba49355fb38ef9a225fcaf7 SHA256 b8249feeedd91f2055ba0b7ff1d25d8c9dac5cb9b4ace0fb5285ee1856112c3a
-EBUILD merkaartor-9999.ebuild 1108 RMD160 abbacf31a0de2aaa97077a35a184dc9dae6cf898 SHA1 e87e58023798849378e911788b72f52799fe7e0f SHA256 d58ca38c7d35c75860e16a1217c1fb688c6a0bc1931315d1c8a549b8181ea1f6
-MISC ChangeLog 1934 RMD160 1dfd6cdd298a3d6279e33879e5ade61cd5ea3332 SHA1 8534179112b082f69672c301b57f9556aced5c23 SHA256 4d48646c9e09decc879994c6a488fac837c57808a99c6aebdee01648e05181f6
-MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
+EBUILD merkaartor-0.13.1.ebuild 1462 RMD160 b9147946bf51c8c27c5dc5eb0919cdc5e464bdc7 SHA1 098136edfa3751f872784351cecf77f395e18ac8 SHA256 6fc448d2c6e4ac9d7a142ffd73316379e2f995e4e7eba9f95833b7c4938817e0
+EBUILD merkaartor-9999.ebuild 1485 RMD160 ba332cc5a11f1d535ab0644f6c5017f3bba4c045 SHA1 6272d1936fbfd85f267fa340fa8c5bfac1b61d63 SHA256 7fbca1fdcf020546eb66421f0a4fc7b9835f7b6c55220bf158314f87fa90c6eb
+MISC ChangeLog 2145 RMD160 cad6c4b2520915c40b4f05b9a1813d8e420836e1 SHA1 cc7a1648815acdd4603870de4ac815879742fb1e SHA256 71dc12e92226bf9156af81d9796badade0cd59628b6bef8d5fe800b28789b8f4
+MISC metadata.xml 493 RMD160 e56e8b24007c8df757dbee8882cb4edfeab4b57b SHA1 a62f7c4c88d80ea1f672f1378d8932f2edaec07d SHA256 3c714874940a146868396f51b16aa95424de5fb8a5278d6b374253c7534d0fe7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkm0KdwACgkQr2QksT29OyDfyQCfdnKvONvKoCXhzaRXdB54YdMS
-ProAn3TUsQ1MClh/jUdvDk0BJ6Z3eCHv
-=ERaW
+iEYEARECAAYFAknV5vkACgkQr2QksT29OyAKTgCcCldG8AgIF5qp7ngfcrUGmsXr
+8CcAnjxzeYT2Z1hY6SNSutR7N2SNX2sy
+=siAK
 -----END PGP SIGNATURE-----
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>