Version Bump; add QT5 support

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

5 files changed, 152 insertions, 17 deletions

diff --git a/sci-geosciences/qlandkartegt/ChangeLog b/sci-geosciences/qlandkartegt/ChangeLog
index 22b871c9f643..1ae02302bc18 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.29 2014/12/04 09:35:08 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/ChangeLog,v 1.30 2015/02/10 10:46:10 jlec Exp $
+
+*qlandkartegt-1.8.0 (10 Feb 2015)
+
+  10 Feb 2015; Justin Lecher <jlec@gentoo.org>
+  +files/qlandkartegt-1.8.0-deprecated.patch,
+  +files/qlandkartegt-1.8.0-includes.patch, +qlandkartegt-1.8.0.ebuild:
+  Version Bump; add QT5 support
 
 *qlandkartegt-1.7.7 (04 Dec 2014)
 
diff --git a/sci-geosciences/qlandkartegt/Manifest b/sci-geosciences/qlandkartegt/Manifest
index d39eb77e2659..db99f6b122aa 100644
--- a/sci-geosciences/qlandkartegt/Manifest
+++ b/sci-geosciences/qlandkartegt/Manifest
@@ -1,28 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX qlandkartegt-1.8.0-deprecated.patch 1688 SHA256 d63d730f4bf4d0e9fdf78da64cd1ad7aa4ad49b775f21aa77d75361195b88c0c SHA512 2bd8415aab8808ab683f0f8180414f36ef4c35d30c9c894f971d385dc7d8c125fbc35ebb2b18806f9f8b7a605950493eb4c0e792e58e8ee33e08c0d27fe8a107 WHIRLPOOL 88f8e6e076ebb344deee3d848d6059bcd299bf0d445a37ec493f7c44038a7d05a83eb6aadd27c2c8f099c7e658e842883013666382e8b2dbea60b4d09c586e04
+AUX qlandkartegt-1.8.0-includes.patch 378 SHA256 6cd2f1691169c4a40b4fa2bf2c48361178a28452fa78de1f91b9fbf143009019 SHA512 01d9bf7ebd4cc3c09e1f5513bfcffd504e4b0ea1d457bb5546cf2d28047bd51886fcc52a7dde486b9d873ef2e319210241c1646be66697a3be9ea9dfe9da4a7f WHIRLPOOL 2f61a5a55d85b8f691a62ad299dbc233ee52dc82fdb4aec45e623241cf481f472b137aec225c05e0007ced453998b2c9b3f4621d1c60846d2cc98c726ee280cc
 DIST qlandkartegt-1.7.6.tar.gz 8315692 SHA256 ff1e352d07fd136e75a80035d888efe095f1f44ca15d46262169e98e5a14e1c3 SHA512 15c96a04979666ccafe9badeed5a6973fdeb49339a707adf20b06d76292d5f23042f541276bc7fc1b390d70a3f5db033f749d2bed30e348c472196622dd3c275 WHIRLPOOL abac8e9ed2fbd63d47913184605fc787a2bcff002717436e61303cb14609aefe9369538010a4aa2c86f243d7d0fa5a173876de98ae9274b761967bf227309ac4
 DIST qlandkartegt-1.7.7.tar.gz 6723780 SHA256 0b0d659bef580bff7c6aabd563ad9bf0cf2d32467fe11e613ceaab58be7363d0 SHA512 c55885703821ae835cbf4b914da2510aa377fe6d6a4cec79266408806ceb17d3316e520daf062bb3390f42b148751e0d9feb06258ca47ad9cda8c6e9311ad6f3 WHIRLPOOL 41fe01c96536531ed1886ebbbd8556a3fec27ba4c5eb583cf629aa2b78524bd6bac927f77e3d90dc005ea35a6cc03b0471c41aa8716da2f6e3688d66a212ba7c
+DIST qlandkartegt-1.8.0.tar.gz 6720301 SHA256 e747d2e1a78c1884ce00b4606525d2be3b309089a3b5cafbc8f2b7aa94959b14 SHA512 bc585d76d93ff87ca529d03810c81a31ff2a7ef6661015e4e25cc798907f2c349bead4b1c29f954d77cc98e92e51fa3bb7bcaa3571a533aa43e886403d1c9526 WHIRLPOOL 83bec7a97f3a18392fb5041fd961a15a270cd88300295abca88f8ad3d79db61055943ef4afb4345e993c594ffe6c2960e11d1d1d17bfcc5867de14fb1f0f02df
 EBUILD qlandkartegt-1.7.6-r2.ebuild 1621 SHA256 14e2e901c2fbd63b647144afe5f0804005556832bbce7870249b0b8fe6c97a91 SHA512 c0979441a0cceffafab4d031e147b661e7f28b107efb3021ea9797a7db6606ab03011acb6d08a26c422ee16be7190e5b9d226df637cb280f5615e55289c8d7ed WHIRLPOOL e08aa38f1445a957202f17440f761bd967d8500ac631af72ae0979c169c4714b29ae8f3255b6b6a531df78b7f138aae9c1dd6b652e6dc10d6cb2414b5589fd23
 EBUILD qlandkartegt-1.7.7.ebuild 1638 SHA256 96bd05182ce13e3c8669803a0cec5ea697e895444aa5a32cb0ad024cadeb3a2f SHA512 64aa846e17b6c28585e149eb44777fe7f797a0ff1acc43817ea69188b6c54d2d11809d1b344d623fa28db0030e3f3f24ff22e0bdbe3248f66314a2347d35d6a1 WHIRLPOOL 7361d89ee11dc832891ec9008133bf57916d738dd7c98edf747c937a6aaffea0ddace660913d0802dc173f019cca0a793f7a3e6c68ba714597973b6296db6ffc
-MISC ChangeLog 5271 SHA256 e2243d1e102fde59d83d2f0b5d143fac10010a6ca7bdfe10b05215f5ea7a11ae SHA512 cac2b7b4beafff89f8777aa15cf18591f440d2fb2a83e9079d076e696768d248616e33542e7c222a0c9a13b6949db6569d928333967cbf3c926c40004a95f9e6 WHIRLPOOL c2648230bbc10f283680d0e478e675adbb24126573a061e5c87ee7325eda4fcc9e2fef10a4371b84414f7cf6af44406bd251a656de0f65d7d1bc0f72161fd766
+EBUILD qlandkartegt-1.8.0.ebuild 1985 SHA256 ffc07df786a39482eb69d6800cb80f792d58978feee0ca013ac08f51eda58339 SHA512 920859fae1dac54f6fefd234dd65dc6de7f66676f97685913337941147fcbbf63775908868b7ca59f89d785e44df10e12d4d5fdbebd2b8b9aa8cffb3b774fc72 WHIRLPOOL 2e992ace0d999ccbd3afaef8450323e4a4cc71fcb981e85ae29d26840da08cbb7642dc79955cb893eaf40c215a937761da1984f81f572f738eac10e6a06d21dd
+MISC ChangeLog 5504 SHA256 7630d41bdc5f2d3f6f7e48b0454df990366f3861530a2c42863b7d4c3a99c49d SHA512 332485d7cc1e8c2bb8c02d7684c0cd2687f1a7a86f3ba3a3833a78f5e167b31749ac291838c0374c8bc80bfba35d0cf0503f3e4f762a46d9c9e0f24bdc36e9ce WHIRLPOOL a61eec17a3c2b973a46976138ced6be17c822e9c398aa8d20962ad2ffacde0aac6e4b6786cb319d73cc7020e50c590d940dca03e5c1e839d9963faaacdce6970
 MISC metadata.xml 583 SHA256 27a636d88230b43ded52d53eded0534c81ad438ac06e2dda86dc8cb7ced1e62a SHA512 9a17df292610932b42d23552514ff6a4e39f087bcfd3b50648ed1239aa79af447690b15f5ccda4a23c008707e74cb1ae18415d9e12646347fceae0c88ec3435e WHIRLPOOL a68f27bf30ab63eeee60ce4a44311daf7c3ebbf83e935c19a2c83436a38c9f35006ef6272270490bb4d9e997c0b2356a69c960b7dc7adda1422e6f20c9f2d327
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUgCrNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU2eFzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirtCQP/0O8wxbPieiqGw6wrtFx/0Z7
-u0VDuDXwjGRqrqEA3s5MDky+LQtQM7W3OLUwqkh4ovELzKDVBD9jUllJw+ovrk1Y
-eKWd0MCdv6BJpttlcB7ZoX1W2dvQafMpv1CthoiwI4uun3pv8PDAPIulZ7rQZbA1
-Euy0IGVLXg6sY4bDcYdFl5TouIubtYcKWdP+qKM+ePXp5WHwVU5qfxaocxy9LGpY
-30CjCfm3+Nhp6pBorNUvNH/QXyUoiczF3fQ4tFdT1DCxs3n+9ABcHw+Z/zYWbhGm
-tJM7PKSo/z8nC8xalub9imwvxHNvKeHmfYc67WkNZAPftZ24dNPnPESL7N+bhqzh
-ZSOew558w0HPbl3bM5Bk8q99P4fES58wj1X/W715ACyltkcTOJWPQoPalwD3T97i
-D/s8/eWmiaiFdTboH0tSys4eHBNLtdoZ5/MNxpxLhQl7IQYkNeJySNlp+6weHGV4
-GLx1HQGQ4X+l27/Cd7fvU7u8nfvqc0wT9fiZ/WYCW8csLurlJEwzH6r1lEXlqhdI
-Q5lz0FGuQ2yt1SwR+FACJAstKa/wQYulV3YgHjwagje7RrLLSQv4njISrFOUj0aE
-zFnIbpm6WOH5iELUe17elNKjx7GR7PnJc7RB26J60FErkB153cT/CDtny+rbXRf7
-jLlvOn91eQXekImR2TrR
-=LqKb
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirGEkP+wVS7lQaEUmwzknN8LGZTHB9
+aZq7p7ZXVsrXcuiNQBnPrGfNvewJn67iLsOURjHD0OnOPkwO69oR3KaVa/FUGEii
+f1PnTxqa+kgc+zyVGjmMsWfNK6u9H16JFQ27w9/k7yS6b7M8IsAZHI9NBpYmLJ8E
+Jezdz8aGrBcXi+IszFqXkbbHyidQPR8X2Tvar5KolUQFc4coKTR1a1LIcuzt5vwE
+kwTjq3PfoVj5gUroLGbk02jMGt/c3xkBFDtU+GkdODcRLD0VMAZIgxSVg/f+bRgq
+vCyL+NuRS827d43ZjqZBENlISAhm1G6CD4s0ud0pzmeG/ejrPkcHc7nEZgrSymCP
+LVZhcjPqY6TwbeQiWvLfUlFfP9aURV6TFiIjfwL2tQquXxZT++Cl9ePGLPy+HSNK
+vPoTT1G+2gdPkeMLW8wdat5dxMDCgcm47qvv97wcf4sFIJMVsXkQal/T22xN5MLz
+lczHmlLdRmzxk+KV5IOvLhqGGhmIBb5Xp8oZHuZjPMrmGY1q+epZlKMd9HnXYKDA
+Bnc4Yf6nmkfNLgcNOWr1B2j+czCbQAGx3nuIXQBu+IGbYdgdJu97YcG+nAx9acRP
+uPeSIs6YYi+dmixM+V8YPASmET+Anyaijxo5TGEaYMzvu7VJDyVXtFjcubaOan2f
+fCNZ46kP558NaA+EDCWx
+=MBFg
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-deprecated.patch b/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-deprecated.patch
new file mode 100644
index 000000000000..91230d8c08fd
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-deprecated.patch
@@ -0,0 +1,32 @@
+diff --git a/src/CRouteToolWidget.cpp b/src/CRouteToolWidget.cpp
+index 659d193..ebd4208 100644
+--- a/src/CRouteToolWidget.cpp
++++ b/src/CRouteToolWidget.cpp
+@@ -1015,14 +1015,25 @@ void CRouteToolWidget::startBRouterService(CRoute& rte)
+             isNext = true;
+         }
+     }
+-
++#ifdef QK_QT5_PORT
++    QList< QPair<QString, QString> > queryItems;
++    queryItems << QPair<QString, QString>("lonlats", lonlats.toLatin1());
++    queryItems << QPair<QString, QString>("nogos", "");
++    queryItems << QPair<QString, QString>("profile", comboBRPreference->itemData(comboBRPreference->currentIndex()).toByteArray());
++    queryItems << QPair<QString, QString>("alternativeidx", QVariant(rte.getRouteIdx()).toByteArray());
++    queryItems << QPair<QString, QString>("format", "gpx");
++    QUrlQuery urlQuery;
++    urlQuery.setQueryItems(queryItems);
++    url.setQuery(urlQuery);
++#else
+     QList< QPair<QByteArray, QByteArray> > queryItems;
+-    queryItems << QPair<QByteArray, QByteArray>(QByteArray("lonlats"),QByteArray(lonlats.toAscii()));
++    queryItems << QPair<QByteArray, QByteArray>(QByteArray("lonlats"),QByteArray(lonlats.toLatin1()));
+     queryItems << QPair<QByteArray, QByteArray>(QByteArray("nogos"), QByteArray(""));
+     queryItems << QPair<QByteArray, QByteArray>(QByteArray("profile"), comboBRPreference->itemData(comboBRPreference->currentIndex()).toByteArray());
+     queryItems << QPair<QByteArray, QByteArray>(QByteArray("alternativeidx"), QVariant(rte.getRouteIdx()).toByteArray());
+     queryItems << QPair<QByteArray, QByteArray>(QByteArray("format"), QByteArray("gpx"));
+     url.setEncodedQueryItems(queryItems);
++#endif
+ 
+     QNetworkRequest request;
+ 
diff --git a/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-includes.patch b/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-includes.patch
new file mode 100644
index 000000000000..aab0288efb70
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-includes.patch
@@ -0,0 +1,12 @@
+diff --git a/src/CExchangeGarmin.cpp b/src/CExchangeGarmin.cpp
+index 1d0a118..236e4ad 100644
+--- a/src/CExchangeGarmin.cpp
++++ b/src/CExchangeGarmin.cpp
+@@ -21,6 +21,7 @@
+ #include <QtDBus>
+ #include <QtXml>
+ #include <QtGui>
++#include <QMessageBox>
+ 
+ CGarminTreeWidgetItem::CGarminTreeWidgetItem(const QString& id, QTreeWidget *parent)
+     : IDeviceTreeWidgetItem(id,parent)
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.8.0.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.8.0.ebuild
new file mode 100644
index 000000000000..827483b6a490
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.8.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.8.0.ebuild,v 1.1 2015/02/10 10:46:10 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 qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+	>=sci-libs/gdal-1.8
+	>=sci-libs/proj-4.7
+	sys-libs/zlib
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+		dev-qt/qtscript:4
+		dev-qt/qtsql:4[sqlite]
+		dev-qt/qtwebkit:4
+		dbus? ( dev-qt/qtdbus:4 )
+	)
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtopengl:5
+		dev-qt/qtserialport:5
+		dev-qt/qtscript:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwebkit:5
+		dbus? ( dev-qt/qtdbus:5 )
+	)
+	dmtx? ( media-libs/libdmtx )
+	exif? ( media-libs/libexif )
+	gps? ( >=sci-geosciences/gpsd-2.90 )
+	gpsbabel? ( sci-geosciences/gpsbabel )
+	virtual/glu
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-deprecated.patch
+	"${FILESDIR}"/${P}-includes.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use qt5 QK_QT5_PORT)
+		$(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() {
+	sed \
+		-e 's:\(Geography;\):\1Education;:g' \
+		-i ./qlandkartegt.desktop || die
+	cmake-utils_src_install
+}
+
+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)"
+}