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

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

8 files changed, 36 insertions, 267 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/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)