sci-geosciences/qlandkartegt: Drop user agent string patch and follow upstream

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

4 files changed, 30 insertions, 43 deletions

diff --git a/sci-geosciences/qlandkartegt/ChangeLog b/sci-geosciences/qlandkartegt/ChangeLog
index 00b9bcefea2f..c602ad0fabde 100644
--- a/sci-geosciences/qlandkartegt/ChangeLog
+++ b/sci-geosciences/qlandkartegt/ChangeLog
@@ -1,6 +1,13 @@
 # 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.27 2014/02/17 17:37:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/ChangeLog,v 1.28 2014/02/18 11:55:40 jlec Exp $
+
+*qlandkartegt-1.7.6-r2 (18 Feb 2014)
+
+  18 Feb 2014; Justin Lecher <jlec@gentoo.org> -qlandkartegt-1.7.6-r1.ebuild,
+  +qlandkartegt-1.7.6-r2.ebuild,
+  -files/qlandkartegt-1.7.6-openstreetmaps.patch:
+  Drop user agent string patch and follow upstream
 
 *qlandkartegt-1.7.6-r1 (17 Feb 2014)
 
diff --git a/sci-geosciences/qlandkartegt/Manifest b/sci-geosciences/qlandkartegt/Manifest
index ded5d184cfaa..e21f048697e3 100644
--- a/sci-geosciences/qlandkartegt/Manifest
+++ b/sci-geosciences/qlandkartegt/Manifest
@@ -1,25 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-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.7.6-r1.ebuild 1447 SHA256 918ff1aa366dcbc1ae9f79c07b9647e8121be2b69a537eab0705a88ad729ee49 SHA512 d951d3f6629c7cc8c7cfcaec118e35fa058cfbb3e5c035f926705664c820f327191e69856c944c136ca6ea3867743ee97866f502ff005ef710162b0b4a4f5dc0 WHIRLPOOL c8b1f9eb5d032728a811c656ad12b7bd5a3c29d4af8141db55fa9a0bc6c178b073512ff882e266c18dbf48ed58e7339345778baad66923e161d32a1ae9a32c4a
-MISC ChangeLog 4885 SHA256 65e0767f604228e465f314f9f53877db18e98e335195e23413c41bbb215f5618 SHA512 0d1115014a545fe03c19d5fe8abefb3148f4146480d0599e77c4c106dcc9dd2a374127900bf6b1418f63bd4c69a00b445a5fdcb51006a59b567b1b77b8c1f311 WHIRLPOOL 2e5a3b41963e0fb314ee6ee40c16d00281da8aa37a8f8dae2fe9f7de90e65274d9ed2dad878c7ecf6666d9076ca6881337632ceb103f45e94549e5a66b43453b
+EBUILD qlandkartegt-1.7.6-r2.ebuild 1621 SHA256 14e2e901c2fbd63b647144afe5f0804005556832bbce7870249b0b8fe6c97a91 SHA512 c0979441a0cceffafab4d031e147b661e7f28b107efb3021ea9797a7db6606ab03011acb6d08a26c422ee16be7190e5b9d226df637cb280f5615e55289c8d7ed WHIRLPOOL e08aa38f1445a957202f17440f761bd967d8500ac631af72ae0979c169c4714b29ae8f3255b6b6a531df78b7f138aae9c1dd6b652e6dc10d6cb2414b5589fd23
+MISC ChangeLog 5136 SHA256 cea0e9779a2bba79bcd8773afe7fd4b23162ae396ef18188523470b502a9252d SHA512 72be43fe5145fe6e41ff021576e31f90931023859fd69175bb3a97012413781255bb43536c3da3b3b207ab0dc2cab45d420d940f9e5ce554891788b971669757 WHIRLPOOL 397e12125b5c0881f300d3125371bd6e8a9a9db1716d9142d92e24cc1cf607405584975846e5e8d36633623b5666674bd34290190000b1370d6955bc0c8c90b6
 MISC metadata.xml 583 SHA256 27a636d88230b43ded52d53eded0534c81ad438ac06e2dda86dc8cb7ced1e62a SHA512 9a17df292610932b42d23552514ff6a4e39f087bcfd3b50648ed1239aa79af447690b15f5ccda4a23c008707e74cb1ae18415d9e12646347fceae0c88ec3435e WHIRLPOOL a68f27bf30ab63eeee60ce4a44311daf7c3ebbf83e935c19a2c83436a38c9f35006ef6272270490bb4d9e997c0b2356a69c960b7dc7adda1422e6f20c9f2d327
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-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
+iQIcBAEBCgAGBQJTA0o9AAoJELnU8jG9FVirbeYP/2K00E5rNNEoJC+25Igez5BZ
+iAp9rSh2zfpKiRDPoIVh8RHAbowcV7Gd698DkXJZDF4bvmT0foSHAptiz/G26gyY
+2GG5zy0z7SsZ+rvLxdfHnlgI09+vi6zVuIR67q5LoZHnz/b2TAlkI9Ujm6tpLdRi
+jBXOZ49Fyd3eLo+PFkdcnwuXKL1qmv5VHwfmo++AcMBGVW2qo5VZ9UDfZgkxFFHk
++3DFrF7VGfaNvTL4eoytUImRkxj/cadqJ7jXGu7Vg7/HhSPR+o5wh+km6Y4SZsK7
+/cDUIG44ZmwPiGiwTDpthItBvS1sg+vnx6T1M26Bcfhu72aMrHTSrJtAAncS/gXa
+AmtVMiMRcqDiGn7ayx4s5mZIQ9j2XvJFT8VNop2FKSGNkaOefd7tK4FIchCNr4Ne
+R+HunRqaNJ/aNDoR2unpFRExPaBGBEPzfR4PAzeJr55EJwmrb1VVEbxxBtoeFjjU
+gvNCM8MPdhXriT5qHGKn5M4K7Acnh0+cuTUddqrnw5IoYzkxV0gpY/M1srbaPGhH
+KeQ4xIxtI3lkQnl9XPKpXKxii6H/XuMap1KSeIVDfpfxzWb4u5jlyqrgS25YLzYg
+qZr5hvTdwXpue/b0FvAKuNqEjRbpfvcwrrH26Ly/eEDgKIDA/d4YV8XyD+mWhlw0
+A1M4/i/PqdyPND8o0Dpf
+=pUfa
 -----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
deleted file mode 100644
index 17309ec3b005..000000000000
--- a/sci-geosciences/qlandkartegt/files/qlandkartegt-1.7.6-openstreetmaps.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- 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.7.6-r1.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r2.ebuild
index bb4ef1c19f0c..59ed9a6d67b0 100644
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r1.ebuild
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r2.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-r1.ebuild,v 1.1 2014/02/17 17:37:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r2.ebuild,v 1.1 2014/02/18 11:55:40 jlec Exp $
 
 EAPI=5
 
@@ -33,8 +33,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-openstreetmaps.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use dbus DBUS)
@@ -54,3 +52,9 @@ src_install() {
 		-e 's:\(Geography;\):\1Education;:g' \
 		-i ./qlandkartegt.desktop || die
 }
+
+pkg_postinst() {
+	elog "OSM and Opencyclemap internal definitions were dropped upstream"
+	elog "Add it through File -> Load Online Map"
+	elog "or add a tsm definition (http://wiki.openstreetmap.org/wiki/MapQuest#Tile_URLs)"
+}