sci-geosciences/qlandkartegt: Backport patch for OSM useragent restrictions, drop old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

9 files changed, 52 insertions, 292 deletions

diff --git a/sci-geosciences/qlandkartegt/ChangeLog b/sci-geosciences/qlandkartegt/ChangeLog
index 08dc6eeabf64..00b9bcefea2f 100644
--- a/sci-geosciences/qlandkartegt/ChangeLog
+++ b/sci-geosciences/qlandkartegt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-geosciences/qlandkartegt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/ChangeLog,v 1.26 2014/02/16 15:11:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/ChangeLog,v 1.27 2014/02/17 17:37:20 jlec Exp $
+
+*qlandkartegt-1.7.6-r1 (17 Feb 2014)
+
+  17 Feb 2014; Justin Lecher <jlec@gentoo.org> -qlandkartegt-1.4.2.ebuild,
+  -qlandkartegt-1.5.1.ebuild, -qlandkartegt-1.6.0.ebuild,
+  -qlandkartegt-1.7.0.ebuild, -qlandkartegt-1.7.5.ebuild,
+  -qlandkartegt-1.7.6.ebuild, +qlandkartegt-1.7.6-r1.ebuild,
+  +files/qlandkartegt-1.7.6-openstreetmaps.patch:
+  Backport patch for OSM useragent restrictions, drop old
 
 *qlandkartegt-1.7.6 (16 Feb 2014)
 
diff --git a/sci-geosciences/qlandkartegt/Manifest b/sci-geosciences/qlandkartegt/Manifest
index 0b8b00c791aa..ded5d184cfaa 100644
--- a/sci-geosciences/qlandkartegt/Manifest
+++ b/sci-geosciences/qlandkartegt/Manifest
@@ -1,34 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST qlandkartegt-1.4.2.tar.gz 6347471 SHA256 89f1021bda2bba054cb6d4363bb04fd5002fc34ccd01c73aa2513e99cfd65535 SHA512 86756f1bf81a65da0c74c5dfb60c20abdd6e905b2b75c725c1e8aa63d2d9de9aad73a90b2ffcde473685a4b4b44de92f9cd6e8d4be854ff3aa55687abcde7626 WHIRLPOOL c66a7a5f13be97656a1d6644c8acb49a79e6504a6d4f8c20de0d23d6987cea5755a7184d196663abb67f535c45e0f32e1fda03013cbb366e62141971e2ed0f64
-DIST qlandkartegt-1.5.1.tar.gz 7113881 SHA256 095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd SHA512 28078f5c36dad271b49d377eea26ac1fd45a75b7376c4e73310114c153d1512ec47f5457293f00e7cf9263350380e92261e786735bb0b2fede0416cf3ca5a13a WHIRLPOOL ecc9025aa0936187766d02b1023aad2d4d9d2f51b62126ba39e2029686eb659d676938eebb1ede1f97493498957e08938d1cdb2d75ae2443f1fa24c7cbb7d4d7
-DIST qlandkartegt-1.6.0.tar.gz 7221049 SHA256 995a55cf45acba67aa0144b64782566187c3ed3240652f22d4002127f6f2fcb4 SHA512 c4736f9ca21d7002184c563a488f8c1ae194ab6f73675d3f7c947baeda82c6b655aeadd8402f05ac792f9986879b7b73f49fffa0a3c15b76bb90c6d6b6af0ee2 WHIRLPOOL f17cb0828d2eb99f9a50370acc77bc63ff2d31b60c4e4d954f75807db05c8bae74042186e6164807c2c75beaf3c55779995a15126a7385fdeff0c253a844dafe
-DIST qlandkartegt-1.7.0.tar.gz 8136806 SHA256 4dbab9ed00824647a9afd315619e7974e176a3b47e50f3754441e69f1dbee72d SHA512 c5e5aabb0c44558ce639b3e70df045011c3b2080bddfa2c0685a3b6d171e9e4cc44abd4804f9e0a7f2d62ea6e6a997b8d041374f23eeb2b43accc6b9d4d48802 WHIRLPOOL 27003f9d87efb555567f1f53af1e930107d6c90c6aeaafc684cfed485cd294cbf9b0f401b95c62b6fd4304fab0209b2bc505a7e5cede37fff78f10ebc3ca84b6
-DIST qlandkartegt-1.7.5.tar.gz 8351098 SHA256 a8b571ba838568ed258c61fa0ab18b370c7d22d2539a632a0028b78f4a22aa2c SHA512 c68e98b5cbba0fa535e3a2e32566a2451ad602da651a0dade2ba61c040f1c91f9dabad23bdac0d0fcd5cc3ef71394743a5fa10fdd9dd5865b9a32650e808c2f2 WHIRLPOOL bbedd041c8cfc8824ec809b4b30d5c9d5f69a7acc993fe1f12c11a5775b96708815eac2fc5a9b845223767d38c4454a581d648d44012121c9270fc0b26a13f12
+AUX qlandkartegt-1.7.6-openstreetmaps.patch 639 SHA256 b0a6dc1fd3daaef7799dd085cd7502ce17d1d31bee6c2f4c566bbf8de8a0cc6d SHA512 292d8e22def231f796dc0b2110168cd91a41ae2532d18dfb840126a0355b7da1502e77cc3662e2d45cd677e6dc5bb3e7ae4a1f10be3c876386254be68ae72919 WHIRLPOOL 7f56d537f77275e986101011d17d72c154b99ce0b765c266623bee7f68e0c2aa929337a358b0e694738f12e39a2fbe35bb354af2994dcccf753a69a951f03539
 DIST qlandkartegt-1.7.6.tar.gz 8315692 SHA256 ff1e352d07fd136e75a80035d888efe095f1f44ca15d46262169e98e5a14e1c3 SHA512 15c96a04979666ccafe9badeed5a6973fdeb49339a707adf20b06d76292d5f23042f541276bc7fc1b390d70a3f5db033f749d2bed30e348c472196622dd3c275 WHIRLPOOL abac8e9ed2fbd63d47913184605fc787a2bcff002717436e61303cb14609aefe9369538010a4aa2c86f243d7d0fa5a173876de98ae9274b761967bf227309ac4
-EBUILD qlandkartegt-1.4.2.ebuild 1345 SHA256 f3ffef7bc7f444cea590f38cc62a069f9036e2db2f7e2944659d761985b32d0f SHA512 bc876de6845d8c076c8eaedb645b0e03cded3c63eef814a7f899cea75fb41524d4ddbc3019c113bf6013aa4143988d1fbf864f88cefe4f0a994a419dd3918249 WHIRLPOOL a57adf8e11acd43c6e5a0273be8c5be642c917eda43776cfcf9dac4ed64cb7cc2da416087dc57fc482ae916ed320aa6daa03fa231b39d235422a90d7ea65e3cd
-EBUILD qlandkartegt-1.5.1.ebuild 1472 SHA256 aee0e981c11585444a681b18951c5d1ed519bdc2b68e26f0cce69e571f59e4a9 SHA512 dd771427f8c842c221ff28f78c29187be4bdefc89ad7bf1d008953d0b946d6f6ebdb7dde479d49cfaa04a24f5f1f762bd1e657ef185b85f51c9a4537ed29c9e4 WHIRLPOOL 87e2184dcd4d7ce57a40482ae74a89c7c25bcfb36ba60f537b759e9dca0cacda59ddf691f0a9b541b75e48ad0cecd9fc1738a2a33cca80f52bbe28725bab9557
-EBUILD qlandkartegt-1.6.0.ebuild 1390 SHA256 82dc005263d556683867b30c22cc199eb819faae7755d677727f1f1c3c2db74c SHA512 9eb22f4c2c1b782875e6c1313cda3aebcfec57639be6d028afc36d565ddee0370dec56575c77ba5ba5b68bc753f14f40202e3567526def27ab3df7a45c027ddd WHIRLPOOL d674b6b0f4f61a1e0b6346b1fec8f1918d4122a822092168f37cd1d675d5e71265e72b5969c8d5b9011f6f71fe50377c3f0ad940b9d871346efef8b1138a1472
-EBUILD qlandkartegt-1.7.0.ebuild 1396 SHA256 d36f5a3f95136031c0ba9ea49b53897202e6c9573f1bcfc36eb669bcda511c6a SHA512 44f4384b88e734115a31fc1f7f415cfe90b392e0f8bac2e098f00250a82772a2c78fe7b25b34e13c77e0f56ebbe0dbe4fd4bc6a03ee5b2d8c6604edc178b057c WHIRLPOOL f95941bb7d01e80f1e4a261b509f29bf8d5711d24c31124c0a318f5e4c865148a29f7c8869034ad9cd8e7440996d40f5abf1640c0989fabf7e2aedfd0f7496f6
-EBUILD qlandkartegt-1.7.5.ebuild 1391 SHA256 262763d16cac96dd35d4e07ad114a30f5291006a3528087087b1e8e79b9ae5b6 SHA512 d6e98346c7873a29e02ad55c49d3b45b488d9a0c1f1cc01fdde692690abbd9f7db632b422606bbf6b76cc203fb6d93a16fcb8da0f0f60bafa30f76412d45f1bf WHIRLPOOL 5d9ba75ca1de8704a13d0324d8402b5ed7b0a71fce2c3a463dc06b88738e14e06256d871053b6cfc46034a661a4e14f2deaa991587e1671b147ef2ed25125a6b
-EBUILD qlandkartegt-1.7.6.ebuild 1391 SHA256 f9ea22849de9f75d19b084b78c4d90a657d764621640c13788d483bb0cce1e9a SHA512 4d9928aaef2f8a86e9625735d7c73c64e3c293b60623b5230984b5c7d3e311f6af24f82462ff03d89d78ea1b67a973a60f8da7e69ecdf1e6f226c94b8b39743c WHIRLPOOL 6d341133e5b5a240fa3daf5cd10c3910ba48374ecfc9c6833798e926b175e94476c617ee0e619ad5fde4de67c3b13fc7af24ab036343cb13319449cc31086fd5
-MISC ChangeLog 4486 SHA256 06e3e9b44380788cdeee5ec46da89c6520643bc158bab8b97e2c2c10cf555813 SHA512 fd96b17005083eb22c829e540becd8a4f94c501f07b96dc567ca85b67c725f3b84b57e74edcb268ca6814856e8e18b133bae763e6742af5a76dac769dc1b7518 WHIRLPOOL a1b71cd6e2e987646602d82f0eb7527025dea5559d5e77585c5abdf892ba0660a4c1b886939f60d26e91f0c9d9342939685ec4bf8d71ee884193db42b5e8aff8
+EBUILD qlandkartegt-1.7.6-r1.ebuild 1447 SHA256 918ff1aa366dcbc1ae9f79c07b9647e8121be2b69a537eab0705a88ad729ee49 SHA512 d951d3f6629c7cc8c7cfcaec118e35fa058cfbb3e5c035f926705664c820f327191e69856c944c136ca6ea3867743ee97866f502ff005ef710162b0b4a4f5dc0 WHIRLPOOL c8b1f9eb5d032728a811c656ad12b7bd5a3c29d4af8141db55fa9a0bc6c178b073512ff882e266c18dbf48ed58e7339345778baad66923e161d32a1ae9a32c4a
+MISC ChangeLog 4885 SHA256 65e0767f604228e465f314f9f53877db18e98e335195e23413c41bbb215f5618 SHA512 0d1115014a545fe03c19d5fe8abefb3148f4146480d0599e77c4c106dcc9dd2a374127900bf6b1418f63bd4c69a00b445a5fdcb51006a59b567b1b77b8c1f311 WHIRLPOOL 2e5a3b41963e0fb314ee6ee40c16d00281da8aa37a8f8dae2fe9f7de90e65274d9ed2dad878c7ecf6666d9076ca6881337632ceb103f45e94549e5a66b43453b
 MISC metadata.xml 583 SHA256 27a636d88230b43ded52d53eded0534c81ad438ac06e2dda86dc8cb7ced1e62a SHA512 9a17df292610932b42d23552514ff6a4e39f087bcfd3b50648ed1239aa79af447690b15f5ccda4a23c008707e74cb1ae18415d9e12646347fceae0c88ec3435e WHIRLPOOL a68f27bf30ab63eeee60ce4a44311daf7c3ebbf83e935c19a2c83436a38c9f35006ef6272270490bb4d9e997c0b2356a69c960b7dc7adda1422e6f20c9f2d327
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJTANUnAAoJELnU8jG9FVirgpMP/0JlGoGYnXoae6O5kmsdogiz
-MiNIskm+HbH3tuUf5kiD5nbTCK/SVC8fQmxdUciTiE0kBySLwjspWeaw6UqKS6Si
-iP4HVt+e6Etao+Urfirgo5DHiJxtm8/EEhWPhdN3nu+QPVPtngmNRGVUW8U/Hwyo
-2yKEgupMtQruz9p2+eGvYUQupWA6hHrFON5IFOciU+RjlsneZIXxb9nRlB3NEXXa
-covsUkTfiwEYsFVA5EPP1MWurkNrnCdVuPrmLc/0ncrtm/FrALEL9ediG+Fg6VOS
-oZ00THOLvI1Te7dSavq/a0mGUSF+ZAW+SiZwaybRtq7zWljETpixvIXwDMPV2Nsi
-ed0jS8ekT1rWKUYeWyvqdYm933gvaukIJUNP4WVoVoeZRxHgkVOH3Jjhmkhkh9ji
-/pMtD4CubzZPKzqJ4Bu398Ngb8jB4aXbdJQsz/A0v3kfvhT2CS6i/ZeNjzV4BA5J
-uDmsYu1/IoMlxrS23lF2/kFh/i8i7OqjIbn83jW2UeczV0SHvyy811xHFBWGEFkJ
-NKzDJRboNFsyj2fbdqETMsITtPW/sdQrc/Dc+kKMYbR8LzQY/iG2OjVRqgIvZSkF
-H+lQNdiaS/ohsHShmIiKZO046AacLOvkr1tzqqYDnH2E1d4ainLuJ15oA8C5oZSi
-p8S7MxeQkBJo7UxLv4LE
-=mJDO
+iQIcBAEBCgAGBQJTAkjUAAoJELnU8jG9FVirgIUQAKIOSdQ9wrY4aVYtAds0V8Q1
+2I/+Nvl8LKUV+XUVUPY5eIx7fZUE8lYi+x+WIF2v/Yas1SmRNdf1mYkA3IJ3E+3c
+15rj4ZdUOaJ+x3+65VzU+BOZhjnUJYO4shH1J046LT97XeUn5TWuo+uncLDy1SVL
+TUgSDjw9+OxIOQK1MdbtX7KfEzDkkhTDbeSz7edL3U2N62YVLDn2uTq2kDeYqTfc
+VvSPYn4uPcYMsr0Gku4NlsNQoIbAd2yAfy+r2aUeOI6cEBUiQpCXlgom6JVPB503
+OLTDXf3keoqgEzS7UXvXb4LEVcty4vgogAKE5vVc9qQ4jJcDcBB5sg3ZeHcutbr3
+w7rAptFxUI52rrblIuwY1cxmXnHa0ebG39iXyuiOqoXFbsIbX5Pg5+sn3X6N1CEK
+K8kYrAiXWiIMlfoDLeZQLWVmSWHC82rOGP+hv6jUB2VqMBX9Xm1fK25N3RGTVztu
++nfBmA84gvljhsv5UHOc/79nly/f7tkb61dmBqdh4GsIuAQNNUMSmjE1IjPXYlVl
+mIw6MYwt9UeltUB6DK8+yDzBxXjfCF7aCAnIgmJwT2reXjJKMp6hHHbUvormXbuy
+mOC9Deg8UipFXsYrVfjY5SONuaefeZOBtaTBzfumEKaZGkB662GNWnaS0uDWiMGT
+Fxoy0g3yWB+qkVX5XyTd
+=hIn6
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/qlandkartegt/files/qlandkartegt-1.7.6-openstreetmaps.patch b/sci-geosciences/qlandkartegt/files/qlandkartegt-1.7.6-openstreetmaps.patch
new file mode 100644
index 000000000000..17309ec3b005
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/files/qlandkartegt-1.7.6-openstreetmaps.patch
@@ -0,0 +1,23 @@
+ src/CMapTms.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/CMapTms.cpp b/src/CMapTms.cpp
+index 71ee5ff..035fcae 100644
+--- a/src/CMapTms.cpp
++++ b/src/CMapTms.cpp
+@@ -26,6 +26,7 @@
+ #include "CDlgMapTmsConfig.h"
+ #include "CMapSelectionRaster.h"
+ #include "CSettings.h"
++#include "version.h"
+ 
+ #include <QtGui>
+ #include <QtNetwork>
+@@ -598,6 +599,7 @@ void CMapTms::checkQueue()
+         QNetworkRequest request;
+ 
+         request.setUrl(req.url);
++        request.setRawHeader("User-Agent" , "QLandkarteGT/" VER_STR);
+         req.reply = accessManager->get(request);
+ 
+         pendRequests[req.url.toString()] = req;
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.4.2.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.4.2.ebuild
deleted file mode 100644
index 61342721addb..000000000000
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.4.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.4.2.ebuild,v 1.5 2013/10/01 21:41:23 pesa Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS device"
-HOMEPAGE="http://www.qlandkarte.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus dmtx exif gps +gpsbabel +gpx-extensions mikrokopter opengl +rmap"
-
-RDEPEND="
-	>=sci-libs/gdal-1.8
-	>=sci-libs/proj-4.7
-	sys-libs/zlib
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtwebkit:4
-	dbus? ( dev-qt/qtdbus:4 )
-	dmtx? ( media-libs/libdmtx )
-	exif? ( media-libs/libexif )
-	gps? ( >=sci-geosciences/gpsd-2.90 )
-	gpsbabel? ( sci-geosciences/gpsbabel )
-	opengl? ( dev-qt/qtopengl:4 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use dbus DBUS)
-		$(cmake-utils_use dmtx WITH_DMTX)
-		$(cmake-utils_use exif WITH_EXIF)
-		$(cmake-utils_use gps WITH_GPSD)
-		$(cmake-utils_use gpx-extensions GPX_EXTENSIONS)
-		$(cmake-utils_use mikrokopter MIKROKOPTER)
-		$(cmake-utils_use opengl WITH_OPENGL)
-		$(cmake-utils_use opengl PLOT_3D)
-		$(cmake-utils_use rmap RMAP)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.5.1.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.5.1.ebuild
deleted file mode 100644
index 5d667ccaaf6c..000000000000
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.5.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.5.1.ebuild,v 1.4 2013/10/01 21:41:23 pesa Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS device"
-HOMEPAGE="http://www.qlandkarte.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus dmtx exif gps +gpsbabel +gpx-extensions mikrokopter opengl +rmap"
-
-RDEPEND="
-	>=sci-libs/gdal-1.8
-	>=sci-libs/proj-4.7
-	sys-libs/zlib
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtwebkit:4
-	dbus? ( dev-qt/qtdbus:4 )
-	dmtx? ( media-libs/libdmtx )
-	exif? ( media-libs/libexif )
-	gps? ( >=sci-geosciences/gpsd-2.90 )
-	gpsbabel? ( sci-geosciences/gpsbabel )
-	opengl? ( dev-qt/qtopengl:4 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use dbus DBUS)
-		$(cmake-utils_use dmtx WITH_DMTX)
-		$(cmake-utils_use exif WITH_EXIF)
-		$(cmake-utils_use gps WITH_GPSD)
-		$(cmake-utils_use gpx-extensions GPX_EXTENSIONS)
-		$(cmake-utils_use mikrokopter MIKROKOPTER)
-		$(cmake-utils_use opengl WITH_OPENGL)
-		$(cmake-utils_use opengl PLOT_3D)
-		$(cmake-utils_use rmap RMAP)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	sed \
-		-e 's:\(Geography;\):\1Education;:g' \
-		-i ./qlandkartegt.desktop || die
-}
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.6.0.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.6.0.ebuild
deleted file mode 100644
index cf1e9e618fb5..000000000000
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.6.0.ebuild,v 1.4 2013/10/01 21:41:23 pesa Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS device"
-HOMEPAGE="http://www.qlandkarte.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus dmtx exif gps +gpsbabel +gpx-extensions mikrokopter +rmap"
-
-RDEPEND="
-	>=sci-libs/gdal-1.8
-	>=sci-libs/proj-4.7
-	sys-libs/zlib
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtwebkit:4
-	dbus? ( dev-qt/qtdbus:4 )
-	dmtx? ( media-libs/libdmtx )
-	exif? ( media-libs/libexif )
-	gps? ( >=sci-geosciences/gpsd-2.90 )
-	gpsbabel? ( sci-geosciences/gpsbabel )
-	dev-qt/qtopengl:4
-	virtual/glu
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use dbus DBUS)
-		$(cmake-utils_use dmtx WITH_DMTX)
-		$(cmake-utils_use exif WITH_EXIF)
-		$(cmake-utils_use gps WITH_GPSD)
-		$(cmake-utils_use gpx-extensions GPX_EXTENSIONS)
-		$(cmake-utils_use mikrokopter MIKROKOPTER)
-		$(cmake-utils_use rmap RMAP)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	sed \
-		-e 's:\(Geography;\):\1Education;:g' \
-		-i ./qlandkartegt.desktop || die
-}
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.0.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.0.ebuild
deleted file mode 100644
index fe76eb55f7ec..000000000000
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.7.0.ebuild,v 1.3 2013/10/01 21:41:23 pesa Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS device"
-HOMEPAGE="http://www.qlandkarte.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus dmtx exif gps +gpsbabel +gpx-extensions mikrokopter +rmap"
-
-RDEPEND="
-	>=sci-libs/gdal-1.8
-	>=sci-libs/proj-4.7
-	sys-libs/zlib
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtwebkit:4
-	dbus? ( dev-qt/qtdbus:4 )
-	dmtx? ( media-libs/libdmtx )
-	exif? ( media-libs/libexif )
-	gps? ( >=sci-geosciences/gpsd-2.90 )
-	gpsbabel? ( sci-geosciences/gpsbabel )
-	dev-qt/qtopengl:4
-	virtual/glu
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use dbus DBUS)
-		$(cmake-utils_use dmtx WITH_DMTX)
-		$(cmake-utils_use exif WITH_EXIF)
-		$(cmake-utils_use gps WITH_GPSD)
-		$(cmake-utils_use gpx-extensions GPX_EXTENSIONS)
-		$(cmake-utils_use mikrokopter MIKROKOPTER)
-		$(cmake-utils_use rmap RMAP)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	sed \
-		-e 's:\(Geography;\):\1Education;:g' \
-		-i ./qlandkartegt.desktop || die
-}
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.5.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.5.ebuild
deleted file mode 100644
index 772db29c4c19..000000000000
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.7.5.ebuild,v 1.2 2013/10/23 11:24:55 jlec Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS device"
-HOMEPAGE="http://www.qlandkarte.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus dmtx exif gps +gpsbabel +gpx-extensions mikrokopter +rmap"
-
-RDEPEND="
-	>=sci-libs/gdal-1.8
-	>=sci-libs/proj-4.7
-	sys-libs/zlib
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtwebkit:4
-	dbus? ( dev-qt/qtdbus:4 )
-	dmtx? ( media-libs/libdmtx )
-	exif? ( media-libs/libexif )
-	gps? ( >=sci-geosciences/gpsd-2.90 )
-	gpsbabel? ( sci-geosciences/gpsbabel )
-	dev-qt/qtopengl:4
-	virtual/glu
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use dbus DBUS)
-		$(cmake-utils_use dmtx WITH_DMTX)
-		$(cmake-utils_use exif WITH_EXIF)
-		$(cmake-utils_use gps WITH_GPSD)
-		$(cmake-utils_use gpx-extensions GPX_EXTENSIONS)
-		$(cmake-utils_use mikrokopter MIKROKOPTER)
-		$(cmake-utils_use rmap RMAP)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	sed \
-		-e 's:\(Geography;\):\1Education;:g' \
-		-i ./qlandkartegt.desktop || die
-}
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r1.ebuild
index 45cc24555067..bb4ef1c19f0c 100644
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6.ebuild
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6.ebuild,v 1.1 2014/02/16 15:11:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r1.ebuild,v 1.1 2014/02/17 17:37:20 jlec Exp $
 
 EAPI=5
 
@@ -33,6 +33,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-openstreetmaps.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use dbus DBUS)