Version bump to 0.17.2. Drop older. Fix live ebuild.

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

10 files changed, 145 insertions, 213 deletions

diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index 22545fa3dcb2..c41a2fc952ce 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-geosciences/merkaartor
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.17 2010/03/09 13:08:42 abcd Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.18 2011/06/09 20:25:12 scarabeus Exp $
+
+*merkaartor-0.17.2 (09 Jun 2011)
+
+  09 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.17.2-includes.patch, -merkaartor-0.11.ebuild,
+  -merkaartor-0.12.ebuild, -merkaartor-0.13.1.ebuild,
+  -merkaartor-0.13.2.ebuild, +merkaartor-0.17.2.ebuild, merkaartor-9999.ebuild,
+  metadata.xml:
+  Version bump to 0.17.2. Drop older. Fix live ebuild.
 
   09 Mar 2010; Jonathan Callen <abcd@gentoo.org> merkaartor-0.12.ebuild,
   merkaartor-0.13.1.ebuild:
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 65ef719b8420..e37a174fb012 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,21 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
-DIST merkaartor-0.13.2.tar.bz2 3010664 RMD160 809139ef9a9361882802a813b0a90ba1988e2eac SHA1 e8e0d006ba6a4859425cccefacbf2bfc4352d883 SHA256 bc216c1785f84f1e554e0f457203f6ccb4f675c5871221f8b906b2cf79a0fd54
-EBUILD merkaartor-0.11.ebuild 876 RMD160 aa790c571a6765db408b9b0348d4e9e3e9060662 SHA1 2b80544aa5301a14c98f00f206c2aae5c487958a SHA256 98b75da6bab732f739365d96b489e818b28d37761bcfe9a1326615f39ad28f23
-EBUILD merkaartor-0.12.ebuild 1059 RMD160 f867a2e919ae949bea6778e204c2f0788f121308 SHA1 8868d68a0099a10364fb0a332b3aae230417a525 SHA256 9b73e2a805de0969f808df5e28498875908aa24d8e7d2ad43da4bb34b8dedbed
-EBUILD merkaartor-0.13.1.ebuild 1438 RMD160 31f9ab7d277b674fbcf815554035292995389c67 SHA1 3d375be983d70c9642ac4c1a8195fe54c5a66c7a SHA256 ca3493974d16fc9f0771cc2238dfb359d64e8e6f206bbe8d6cf7cc63f2d56c5b
-EBUILD merkaartor-0.13.2.ebuild 1443 RMD160 316da80d0453b68fc49d2f3fd54ba198f2377d4e SHA1 f18b7f87592544f0f3dee9ad0ddbc198d50f03ab SHA256 71dfae3120702232df6a19d5e95007c5697d32562f000177f070bd633f45304e
-EBUILD merkaartor-9999.ebuild 1487 RMD160 fe660af67aed1e435e8802d24b4223b5ae31a8b7 SHA1 03b40885ca998a24909ed9254fd6b91ce8cf9638 SHA256 4fb75cea8339b9ce79f26a5df877aa328e421203a2ef979184ab90a3e4fde6d4
-MISC ChangeLog 2562 RMD160 d0cefc06d275507bc5e9a76771ef0a645b59c77e SHA1 e53aaa59191677606a83df7083a7f4115116e0c9 SHA256 5644220e19e98cf444f0873833b29ad67246a29cd90c723609efe097c1eb22d6
-MISC metadata.xml 493 RMD160 e56e8b24007c8df757dbee8882cb4edfeab4b57b SHA1 a62f7c4c88d80ea1f672f1378d8932f2edaec07d SHA256 3c714874940a146868396f51b16aa95424de5fb8a5278d6b374253c7534d0fe7
+AUX 0.17.2-includes.patch 452 RMD160 9a6dbda2ff06503945221f732fd568f269ed37e8 SHA1 2d2cdc05704933df08bebfe3b90dc709aa895dac SHA256 69e257bc8eca02c18313502d4fdf9729e2eaa51e5bd04da8f2115e28d9b675cb
+DIST merkaartor-0.17.2.tar.bz2 7138991 RMD160 c5c8944872828ba5ada6003cd5821f33899da3cb SHA1 f789141db427bf25bb3b61801fefc98ab0430012 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a
+EBUILD merkaartor-0.17.2.ebuild 1752 RMD160 17bee3726a1b1599506c65951aa44696e2b833f9 SHA1 3bcd8cab9fa5fa5bc8085969dcf6fb7c2807e47a SHA256 8bf5f1798bcea4e30ad58ed5ad2e8d02d610abc6b44242c9a6d5c83b463e93db
+EBUILD merkaartor-9999.ebuild 1739 RMD160 81ae4e685010e3bd29a071319dab6d949e485e76 SHA1 539206c5a5f037edb3cc5df01a29703d6d2355e5 SHA256 34b2d8fd513eb7956a0e3cd3aea3a4b249801fb823ba98d635ee18dae2d5d54f
+MISC ChangeLog 2919 RMD160 5c1db646ac7f8d67af3d030a642c89e3606db878 SHA1 09912e43875a583cdbe9471f22db3b236e50f7c9 SHA256 1a550ed5a0f82dba36c7f25c04ac595b4f3a6e278511cc8026e44e467c022411
+MISC metadata.xml 467 RMD160 35303c7ae1f239e15845d3b01417f0f2d04ebf3a SHA1 1361600e4014ce1cc840cbc1d3adec1640903a7b SHA256 b107951b4352a6a1c5ce816735d5dc45306cbf8da2e80adc6d63d8b04bb3d838
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkuWSGAACgkQOypDUo0oQOqrkACgh4sn1DsVdPBvIAHaIWNGYIrE
-MKAAoI43Y/xnVygyODYiV9AQm2MUJJJM
-=90Cc
+iEYEARECAAYFAk3xLC4ACgkQHB6c3gNBRYeVywCgzSMCDpDJRVWXXZv7npImrBFc
+fjkAoMolmoFZApm9AlOyzMWgIj9Lzj1d
+=ZmjX
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/merkaartor/files/0.17.2-includes.patch b/sci-geosciences/merkaartor/files/0.17.2-includes.patch
new file mode 100644
index 000000000000..2458aec201f6
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/0.17.2-includes.patch
@@ -0,0 +1,11 @@
+diff -urN merkaartor-0.17.2.old/src/MainWindow.cpp merkaartor-0.17.2/src/MainWindow.cpp
+--- merkaartor-0.17.2.old/src/MainWindow.cpp	2011-06-09 22:01:46.624543619 +0200
++++ merkaartor-0.17.2/src/MainWindow.cpp	2011-06-09 22:02:27.891027716 +0200
+@@ -92,6 +92,7 @@
+ #include <QtGui/QFileDialog>
+ #include <QtGui/QMessageBox>
+ #include <QtGui/QMouseEvent>
++#include <QtNetwork>
+ #include <QInputDialog>
+ #include <QClipboard>
+ #include <QProgressDialog>
diff --git a/sci-geosciences/merkaartor/merkaartor-0.11.ebuild b/sci-geosciences/merkaartor/merkaartor-0.11.ebuild
deleted file mode 100644
index d19c8ae260c1..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.11.ebuild
+++ /dev/null
@@ -1,31 +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.11.ebuild,v 1.3 2008/11/24 17:59:25 hanno 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/pipe/Merkaartor-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-DEPEND="x11-libs/qt-webkit:4
-	x11-libs/qt-gui:4"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	if use nls; then
-		lrelease Merkaartor.pro || die "lrelease failed"
-	fi
-	eqmake4 Merkaartor.pro PREFIX=/usr || die "qmake failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "install failed"
-	dodoc AUTHORS CHANGELOG HACKING || die "dodoc failed"
-}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.12.ebuild b/sci-geosciences/merkaartor/merkaartor-0.12.ebuild
deleted file mode 100644
index 10e6a61d4f8f..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.12.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 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.5 2010/03/09 13:08:42 abcd 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"
-DEPEND="x11-libs/qt-webkit:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	media-gfx/exiv2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	if use nls; then
-		lrelease Merkaartor.pro || die "lrelease failed"
-	fi
-	eqmake4 Merkaartor.pro PREFIX=/usr GEOIMAGE=1 || die "qmake 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" Mercator_100x100 "Science;Geoscience"
-}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild
deleted file mode 100644
index c7ce472e0493..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 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.2 2010/03/09 13:08:42 abcd 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" Mercator_100x100 "Science;Geoscience"
-}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.13.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.13.2.ebuild
deleted file mode 100644
index 8cb4e606df09..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.13.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.2.ebuild,v 1.1 2009/05/04 21:44:56 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}"
-
-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"
-
-	newicon Icons/Mercator_100x100.png "${PN}".png || die "newicon failed"
-	make_desktop_entry "${PN}" "Merkaartor" "${PN}" "Science;Geoscience"
-}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
new file mode 100644
index 000000000000..9351f88eac0f
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.1 2011/06/09 20:25:12 scarabeus Exp $
+
+EAPI=4
+
+REDMINE_HASH="253"
+[[ ${PV} == 9999 ]] && SCM_ECLASS=git-2
+EGIT_REPO_URI="git://gitorious.org/merkaartor/main.git"
+EGIT_PROJECT=${PN}
+inherit qt4-r2 ${SCM_ECLASS}
+
+DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be"
+[[ ${PV} == 9999 ]] || SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
+IUSE="debug exif gps nls libproxy"
+
+QT_MINIMAL="4.7.2"
+DEPEND="
+	>=sci-libs/gdal-1.6.0
+	>=sci-libs/proj-4.6
+	>=x11-libs/qt-gui-${QT_MINIMAL}:4
+	>=x11-libs/qt-svg-${QT_MINIMAL}:4
+	>=x11-libs/qt-webkit-${QT_MINIMAL}:4
+	exif? ( media-gfx/exiv2 )
+	gps? ( >=sci-geosciences/gpsd-2.92 )
+	libproxy? ( net-libs/libproxy )
+"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS CHANGELOG HACKING"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-includes.patch"
+)
+
+merkaartor_use() {
+	local useflag=${1}
+	[[ -z ${useflag} ]] && die "No useflag specified"
+	if use ${useflag}; then
+		echo "1"
+	else
+		echo "0"
+	fi
+}
+
+src_configure() {
+	local myconf
+	myconf+=" RELEASE=1 ZBAR=0" # deps not in main tree so hard-disable
+	myconf+=" GEOIMAGE=$(${PN}_use exif)"
+	myconf+=" GPSDLIB=$(${PN}_use gps)"
+	myconf+=" LIBPROXY=$(${PN}_use libproxy)"
+	myconf+=" NODEBUG=$(use debug && echo "0" || echo "1")" # inverse logic
+	myconf+=" NOUSEWEBKIT=0" # fails to link if disabled, upstream needs to fix
+
+	if use nls; then
+		lrelease src/src.pro || die "lrelease failed"
+	fi
+
+	eqmake4 Merkaartor.pro ${myconf}
+}
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 5238d2e465e0..d97b68dd4658 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,49 +1,63 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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.7 2009/05/04 22:04:23 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.8 2011/06/09 20:25:12 scarabeus Exp $
 
-EAPI="1"
+EAPI=4
 
-inherit eutils qt4 subversion
-
-ESVN_REPO_URI="http://svn.openstreetmap.org/applications/editors/merkaartor/"
+REDMINE_HASH="253"
+[[ ${PV} == 9999 ]] && SCM_ECLASS=git-2
+EGIT_REPO_URI="git://gitorious.org/merkaartor/main.git"
+EGIT_PROJECT=${PN}
+inherit qt4-r2 ${SCM_ECLASS}
 
 DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.org"
-SRC_URI=""
+HOMEPAGE="http://www.merkaartor.be"
+[[ ${PV} == 9999 ]] || SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-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 )
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
+IUSE="debug exif gps nls libproxy webkit"
+
+QT_MINIMAL="4.7.2"
+DEPEND="
+	>=sci-libs/gdal-1.6.0
+	>=sci-libs/proj-4.6
+	>=x11-libs/qt-gui-${QT_MINIMAL}:4
+	>=x11-libs/qt-svg-${QT_MINIMAL}:4
 	exif? ( media-gfx/exiv2 )
-	proj? ( sci-libs/proj )
-	gdal? ( sci-libs/gdal )"
+	gps? ( >=sci-geosciences/gpsd-2.92 )
+	libproxy? ( net-libs/libproxy )
+	webkit? ( >=x11-libs/qt-webkit-${QT_MINIMAL}:4 )
+"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
+DOCS="AUTHORS CHANGELOG HACKING"
 
-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"
+MAKEOPTS+=" -j1"
 
-	if use nls; then
-		lrelease Merkaartor.pro || die "lrelease failed"
+merkaartor_use() {
+	local useflag=${1}
+	[[ -z ${useflag} ]] && die "No useflag specified"
+	if use ${useflag}; then
+		echo "1"
+	else
+		echo "0"
 	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"
+src_configure() {
+	local myconf
+	myconf+=" RELEASE=1 ZBAR=0" # deps not in main tree so hard-disable
+	myconf+=" GEOIMAGE=$(${PN}_use exif)"
+	myconf+=" GPSDLIB=$(${PN}_use gps)"
+	myconf+=" LIBPROXY=$(${PN}_use libproxy)"
+	myconf+=" NODEBUG=$(use debug && echo "0" || echo "1")" # inverse logic
+	myconf+=" NOUSEWEBKIT=$(use webkit && echo "0" || echo "1")" # inverse logic
+
+	if use nls; then
+		lrelease src/src.pro || die "lrelease failed"
+	fi
 
-	newicon Icons/Mercator_100x100.png "${PN}".png || die "newicon failed"
-	make_desktop_entry "${PN}" "Merkaartor" "${PN}" "Science;Geoscience"
+	eqmake4 Merkaartor.pro ${myconf}
 }
diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index 5cc9b09d86a1..147387d5b261 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -6,8 +6,7 @@
     <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>
+	  <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
+	  <flag name="webkit">Enable Webkit browser plugin using <pkg>x11-libs/qt-webkit</pkg></flag>
   </use>
 </pkgmetadata>