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

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 15 insertions, 27 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/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)"
+}