gentoo resync : 31.12.2018

12 files changed, 483 insertions, 30 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 917d5d1a9844..4b6691a0be58 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index ca1dbb1e5458..8d913aceb3db 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-maps-3.24.3.tar.xz 1145872 BLAKE2B bd6e9652c341def652beea966d3a171a050219f3bc83288bd83eacb069899cd94d154d53bcea081bdfefdeee9b74e56c158c703ed92c9fcb5e35ecd718900e4a SHA512 b4a4c278359803e11b1aa43fb522a84b95eecfc349a134322f45db7acfe93867a61f6bd48e55a07d5d602b8161cdf5949a6b5d4da1212659e133260063ab6198
 DIST gnome-maps-3.26.2.tar.xz 1175944 BLAKE2B abd8a592c10e31f4a05a6f3ef1167d111ab19a957e2fd3efa78f6999f60f98ff1767bcde18c6fb56bd6af580fd5e619106371214a92c4c450fe16df6fa4d8e23 SHA512 15548d834cf859b1d67111bdf81c3dc87c62c97574b89f41ae81bd5ce8bdccb10e705c7e91f5880d2528df88f85d6416302163d31c5b9d0f359451385168866b
-EBUILD gnome-maps-3.24.3.ebuild 1273 BLAKE2B f971aaab9df9b0e7da41eec1954456e71e4fa75daa69a7636e06ebd0c4fccc44a7577a6c9592f18ebba5db450a6ada2e0334cc9324a89dfc706a151708e1bdc5 SHA512 ea5f53871629920a4b2b8b90ef65c77943e6643c2630c2f0ecb9017d526b2d86e6500d13e0f2ff8681f641e7cd89b6912b1f7aae1dac73a11029f0a73ba38470
-EBUILD gnome-maps-3.26.2.ebuild 1272 BLAKE2B 36ad8436b6502067e758a834ce494a61c7454cdfc5dbd5b37e0bbc15eb042e32d72ed895f00e9d442d031a804e097f98eb76f724b100b4754dcab28659f2d24f SHA512 429760effd663df3e64d4e8fc8296f19d414ece62f2ec9bb5270795a49bcf2ff2e4d391ad7d10cdfa0fcd5befe896df565dbcf518f0ee5a8e373b842f8b4b17e
+DIST gnome-maps-3.30.3.tar.xz 2176712 BLAKE2B 8595643ddf3f6c419fdc053561e49e62d6bd6e3713d3d809d3fe73cd1aecf3361e3f6592fb53d6963cbdd5fc3edaf1dcb616059da9e5e506a3399d00a9a65de7 SHA512 f3481266c6cf792da71ef40ce489c13fdd807dab91238e02b815b25e29119ffb56212fb03078e14004cca27e24906af1b94f7f3c4325bbf4f332c782c79d8203
+EBUILD gnome-maps-3.24.3.ebuild 1270 BLAKE2B e2d7d77baed5a2aa7aa59e0a127b46a8a2e776260e4201780919fe42b122d066a089c5caac66b5103d7c52acf4a4ea33e52814e18502e80d8d08802f290d7050 SHA512 1cbd89a0b5621bebf8fd679adbb587a210bc45a77ad0cf162dac73f5440d765f510e0b066eeddda931053a5fc9cb574e5fffae8e6340c2f74b9aff97b1ffc827
+EBUILD gnome-maps-3.26.2.ebuild 1293 BLAKE2B 45fc678100dc7db48e1f96345c29b475171c8e77710ca329db19c9a102c3a4cf0bd5ad0e68d94366a64c25b626ae93c68d3a72306c8a875fa468137b1256a86c SHA512 26ab223d1a698659aed44090e2eb7c8c838ab7c6a8633bbbfc3adeb3c72cd00ed4c99f4006e2976c9ee8eca45524958c2312739e77df59ae6344dd0defc1fb97
+EBUILD gnome-maps-3.30.3.ebuild 1413 BLAKE2B a90a6bedf59c5da397dd732d003a62aa32e84dddbcf8026a0a6eb0621a1a575b0beb6f11a6fc804710ff48574fc2e2bc74c9ba08d523501df457de2d0caf4e38 SHA512 4b06e7453e820f817ad81ee758d967bde6a55f36fd94215bd7f7525879b06a1c3ca7ea43f02ed6a618a8a2942c8785f82795ec5225af1c298cff02c4ae138ae0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.24.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.24.3.ebuild
index 463e746e312d..fa520aa16463 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.24.3.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.24.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.26.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.26.2.ebuild
index 2e55a2c32c27..7a8281daf0e3 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.26.2.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.26.2.ebuild
@@ -39,6 +39,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-libs/gdk-pixbuf:2[introspection]
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 "
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild
new file mode 100644
index 000000000000..9d2b7e48e515
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+# Pure introspection dependencies found by grepping imports.gi in ${S}
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/gjs-1.50.0
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=dev-libs/libgee-0.16:0.8[introspection]
+	>=dev-libs/folks-0.10
+	>=sci-geosciences/geocode-glib-3.15.2[introspection]
+	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
+	dev-libs/libxml2:2
+	>=net-libs/rest-0.7.90:0.7[introspection]
+
+	app-crypt/libsecret[introspection]
+	dev-libs/libgweather[introspection]
+	media-libs/clutter-gtk:1.0[introspection]
+	media-libs/clutter:1.0[introspection]
+	net-libs/gnome-online-accounts[introspection]
+	net-libs/libgfbgraph[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-libs/webkit-gtk:4[introspection]
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 66d924ea4038..26a3cf2d5d46 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,6 +1,10 @@
+AUX merkaartor-0.18.3-desktopfile.patch 1256 BLAKE2B 56fb860fb21b4d2fea6c1eb1688680f214b084b6aa021beaaf77c7b3ea331c1c77836962cf354389fe5f41a70bef67cc267f86384e54eb622eaf0be25998d2aa SHA512 a720ace02cfbb6d51e844894ec319e9604c5e8ad92ee5db410bb9429c60157798c1ebf065dec7e7dfe32cc20fa33897ffc5541f988f0ba662896025d5e6c678b
 AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d441948fdcf2b642971bdb3ea5fa2649bbe9827fdc50ab72ca77ea6f2c80d690794a9ea539bda91eea1ec34fc98ec073d49cf933002df68747 SHA512 5e2b1d4a8d4294785b59ea3631e7f086c2d52ab8752574872088ae4cb26c5b11851ab1c597a53012797b6ec7c5d9c1012037baf9cfc4135b06542365c5eb60c9
+AUX merkaartor-0.18.3-webengine1.patch 6601 BLAKE2B efcb88f07abc23ff5221f42beb433a39f566f8f0433a1ecb7526700df787b17e2367b45b550b4672b4003f6342602dd60299c833b38cead09b3cf774f9b76eca SHA512 aa22c90c418eb175ba74f3d029b92640113a799005ca34fa6e08b4c3a68431d442589d8e80ec7aa721c1ef279bdfa78e67f9dd982e586fd7887122c54ed27794
+AUX merkaartor-0.18.3-webengine2.patch 1647 BLAKE2B eb11ac314da643a6db425b8c0f520e315218420be2a438995a9f9deaaebf48c9f5e1bb65fa59bb20aab0c269f8730e299aedbaa40152eba44ae2b7a8c0139885 SHA512 faf8a4b22da050a88278672a77029c87a2b30658efc424a4c046a8fcecd491f763278076aad32cb88d8bd254d3f5837e272f178ca97c88a55831199aff0a138a
+AUX merkaartor-0.18.3-webengine3.patch 4895 BLAKE2B 38a9a6a87774094a8a6b1104dc2f5a4156bb908799ae6388b6d90ad41d9ef1a288368e7854dcdeddcd1db6a316c3488c90d7760c8757787be605a5e3de0c9afc SHA512 8b7478f5d3342f288f368b22ccfae113c0358d81ddce31eb211671202ac97ac314d73e0762ab66f0f708edfbeef3dfd5a4a6a2da7a37bf8f93b2151cfa56def2
 DIST merkaartor-0.18.3.tar.gz 7104234 BLAKE2B e7d84297452ad20daf2ab18c4aef3736758d98e6f839be1152651aa0196ccee2983d89935f121d4436245d7fdd1fa6b97cd99e6a154158cad4751eba02819a74 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
-EBUILD merkaartor-0.18.3-r2.ebuild 2096 BLAKE2B 3d3cd7dccd7e89246e288b3df729fd7c21c7d0ce8126594e2e49ea6531c535248033f56f19df867efeec46605c33f8cd2d4506028632d630d0f9b0963d8e09d5 SHA512 8b993b269a2800e47cd86d29e0f91f3e6f98f1c2c52074b58f6bd2b64f0facb3584074612230d88c2d2ab134ac976a9a6c27d79dba20d9a06dcd19c8146e04ee
 EBUILD merkaartor-0.18.3-r3.ebuild 2257 BLAKE2B 54f02ae8d223a955d5e51f5675a25f0309e33cfa7e4118514ee2641b25c99eb60391a1e180c8e9f8cb9c0a9a191809c7f75cfcf804b85831cacb78844dc22d5f SHA512 b7dc364577288741999f114a5d8a1b39d57727b9ef062e27ad479fda9cf1e9393197ed785a3ad14f3117ba0708a8875cea714b1c64bff282d44e8695860313a7
-EBUILD merkaartor-9999.ebuild 2160 BLAKE2B 4fd3917aa1d03f235f79db008a33b056625e8e56232f614eb581924475eee67fe78d91882913868c57b2d0d07d20153c6574a0390052718ca1a65eb182404ebb SHA512 cc487da0ad47cbcea5b107d92fd17a8bc973292c1135ae590f456d99346adec5288dc8f53ce15b16ad4377e93ccce670a67c3bea455ea4c7402c23b2311f89e9
+EBUILD merkaartor-0.18.3-r4.ebuild 2396 BLAKE2B 67cee765fa25b9ac7bf20ca89e10f51152ace48710eec72399c8b2d28b9521b4878655318caf90345c2d549af0346a73c70d1b81c6acc3f6ee3d8074bf5f102d SHA512 3a10b813895d1e5526e2bd718c4d17185ac5205c5e0d20f5952681776f409990aff108e2645a704595561858d562f3fb0c9db9adde0776e3b81f535a1217a926
+EBUILD merkaartor-9999.ebuild 2293 BLAKE2B 3dc5a0124e7a40bdcc2adf52e55ab2dc5368057e7d7e4fbd8990ef67e5d986f2497f7dde191e882cf2a26542dfa5bf8c6d213a1b6a79f095e56184dbc49856b4 SHA512 1366d4dd45c937b73c2125e549bf7fb0a4e97d38c3a76bc737966440735dbe451cecec9db5958ee9455abff00409deda507207f3b39cf8b00b7abc2ca5a31b9e
 MISC metadata.xml 575 BLAKE2B d9a30a01f5b6c55e9a4865f6f1aa92ea610ad2f1aa9ab1bcb129dfbf03f9579fe7f3d8bdf604da0564b4d53b65d54b8c32f3628f1e8e389f6368d14cfca9997b SHA512 d9e5293c9bf7a3bfc7fd691d5a61c7de6c284941da73883590e4956bb4a7b26215e003a9096b9fdaa1f7590765aad583bec04ad6ec8778bc4a26a422a3e2da38
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
new file mode 100644
index 000000000000..6c844ea3cf7a
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
@@ -0,0 +1,30 @@
+From 85ee9b1855bf3256daf4decd1f25021c1a28abdc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
+Date: Sat, 19 May 2018 13:43:24 +0200
+Subject: [PATCH] Renamed merkaartor.desktop to 
+ org.merkaartor.merkaartor.desktop
+
+A possible solution for issue #150.
+---
+ src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} | 0
+ src/src.pro                                                   | 2 +-
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} (100%)
+
+diff --git a/src/merkaartor.desktop b/src/org.merkaartor.merkaartor.desktop
+similarity index 100%
+rename from src/merkaartor.desktop
+rename to src/org.merkaartor.merkaartor.desktop
+diff --git a/src/src.pro b/src/src.pro
+index 81a65f34..477c459e 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -289,7 +289,7 @@ contains(SANITIZE, 2) {
+ 
+ unix:!macx {
+     desktop.path = $${PREFIX}/share/applications
+-    desktop.files = merkaartor.desktop
++    desktop.files = org.merkaartor.merkaartor.desktop 
+     desktopicon8x8.path = $${PREFIX}/share/icons/hicolor/8x8/apps/
+     desktopicon8x8.files = $$PWD/../Icons/8x8/merkaartor.png
+     desktopicon16x16.path = $${PREFIX}/share/icons/hicolor/16x16/apps/
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch
new file mode 100644
index 000000000000..5f4f605ce5bb
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch
@@ -0,0 +1,186 @@
+From df515ecf4e6ce1a249af299840e82126c68fcf91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
+Date: Mon, 26 Sep 2016 13:02:57 +0200
+Subject: [PATCH] Updated QWeb to QWebView.
+
+---
+ src/Layers/LicenseDisplayDialog.ui      |  6 +++---
+ src/QMapControl/browserimagemanager.cpp | 20 +++++++++-----------
+ src/QMapControl/browserimagemanager.h   | 17 ++++++-----------
+ src/src.pro                             |  2 +-
+ 4 files changed, 19 insertions(+), 26 deletions(-)
+
+diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
+index 103816c6..3dabd130 100755
+--- a/src/Layers/LicenseDisplayDialog.ui
++++ b/src/Layers/LicenseDisplayDialog.ui
+@@ -15,7 +15,7 @@
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+-    <widget class="QWebView" name="webView">
++    <widget class="QWebEngineView" name="webView">
+      <property name="url">
+       <url>
+        <string>about:blank</string>
+@@ -41,9 +41,9 @@
+  </widget>
+  <customwidgets>
+   <customwidget>
+-   <class>QWebView</class>
++   <class>QWebEngineView</class>
+    <extends>QWidget</extends>
+-   <header>QtWebKit/QWebView</header>
++   <header>QWebEngineView</header>
+   </customwidget>
+  </customwidgets>
+  <resources/>
+diff --git a/src/QMapControl/browserimagemanager.cpp b/src/QMapControl/browserimagemanager.cpp
+index 468cf2b6..4021d40f 100644
+--- a/src/QMapControl/browserimagemanager.cpp
++++ b/src/QMapControl/browserimagemanager.cpp
+@@ -47,9 +47,8 @@ void BrowserWebPage::javaScriptConsoleMessage ( const QString & message, int lin
+     //printf("%s\n", s);
+ }
+ 
+-void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
++void BrowserWebPage::javaScriptAlert ( const QString & msg )
+ {
+-    Q_UNUSED(frame)
+     //QMessageBox::information(NULL, tr("Javascript alert"), msg);
+ 
+     if (msg.startsWith("Coord")) {
+@@ -105,8 +104,10 @@ void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
+ 
+ void BrowserWebPage::launchRequest ( const QUrl & url )
+ {
++    qDebug() << "Warning: you are using BrowserWebPage to render background imagery. "<<
++        "This code is not tested and may not work as expected. If you experience issues, please let us know.";
+     sw = sh = 0;
+-    mainFrame()->load(url);
++    load(url);
+ }
+ 
+ BrowserImageManager* BrowserImageManager::m_BrowserImageManagerInstance = 0;
+@@ -138,8 +139,6 @@ BrowserImageManager::BrowserImageManager(QObject* parent)
+     }
+ 
+     page = new BrowserWebPage();
+-    page->setNetworkAccessManager(m_networkManager);
+-    page->setViewportSize(QSize(1024, 1024));
+ 
+     connect(page, SIGNAL(loadFinished(bool)), this, SLOT(pageLoadFinished(bool)));
+ 
+@@ -220,7 +219,6 @@ void BrowserImageManager::launchRequest()
+ 
+     QUrl u = QUrl( R.url);
+ 
+-    page->networkAccessManager()->setProxy(M_PREFS->getProxy(u));
+     page->launchRequest(u);
+     requestActive = true;
+ #ifndef BROWSERIMAGEMANAGER_IS_THREADED
+@@ -246,7 +244,7 @@ void BrowserImageManager::pageLoadFinished(bool ok)
+         qDebug() << "BrowserImageManager::pageLoadFinished: " << " Hash: " << R.hash;
+         QPixmap pt(page->sw, page->sh);
+         QPainter P(&pt);
+-        page->mainFrame()->render(&P, QRegion(0,0,page->sw,page->sh));
++        page->view()->render(&P, QPoint(), QRegion(0,0,page->sw,page->sh));
+         P.end();
+ 
+ //        if (page->sw != BROWSER_TILE_SIZE || page->sh != BROWSER_TILE_SIZE) {
+@@ -319,7 +317,7 @@ void BrowserImageManager::loadingQueueEmpty()
+ void BrowserImageManager::abortLoading()
+ {
+     //qDebug() << "BrowserImageManager::abortLoading";
+-    page->triggerAction(QWebPage::Stop);
++    page->triggerAction(QWebEnginePage::Stop);
+     if (!loadingRequests.isEmpty()) {
+         LoadingRequest R = loadingRequests.dequeue();
+         loadingRequests.clear();
+@@ -331,7 +329,7 @@ void BrowserImageManager::abortLoading()
+ #ifdef BROWSERIMAGEMANAGER_IS_THREADED
+ void BrowserImageManager::run()
+ {
+-    page = new BrowserWebPage();
++    page = new BrowserWebEnginePage();
+     page->setViewportSize(QSize(1024, 1024));
+ 
+     QTimer theTimer;
+@@ -354,7 +352,7 @@ void BrowserImageManager::checkRequests()
+     } else {
+         if ((requestDuration++) > 100) {
+             requestDuration = 0;
+-            page->triggerAction(QWebPage::Stop);
++            page->triggerAction(QWebEnginePage::Stop);
+             qDebug() << "BrowserImageManager Timeout";
+         }
+     }
+@@ -365,7 +363,7 @@ void BrowserImageManager::checkRequests()
+ void BrowserImageManager::timeout()
+ {
+     qDebug() << "BrowserImageManager::timeout";
+-    page->triggerAction(QWebPage::Stop);
++    page->triggerAction(QWebEnginePage::Stop);
+     pageLoadFinished(false);
+ }
+ #endif // BROWSERIMAGEMANAGER_IS_THREADED
+diff --git a/src/QMapControl/browserimagemanager.h b/src/QMapControl/browserimagemanager.h
+index 10f8a477..ca846e31 100644
+--- a/src/QMapControl/browserimagemanager.h
++++ b/src/QMapControl/browserimagemanager.h
+@@ -24,14 +24,10 @@
+ #include <QPixmap>
+ 
+ #include <QtNetwork/QtNetwork>
+-#include <QWebFrame>
+-#include "qwebhistory.h"
+-#include "qwebhistoryinterface.h"
+-#include "qwebkitglobal.h"
+-#include "qwebpage.h"
+-#include "qwebpluginfactory.h"
+-#include "qwebsettings.h"
+-#include "qwebview.h"
++#include <QWebEnginePage>
++#include <QWebEngineHistory>
++#include <QWebEngineSettings>
++#include <QWebEngineView>
+ 
+ #include <QThread>
+ 
+@@ -41,13 +37,13 @@
+     @author Chris Browet <cbro@semperpax.com>
+ */
+ 
+-class BrowserWebPage : public QWebPage
++class BrowserWebPage : public QWebEnginePage
+ {
+     friend class BrowserImageManager;
+ 
+     protected:
+         virtual void javaScriptConsoleMessage ( const QString & message, int lineNumber, const QString & sourceID );
+-        virtual void javaScriptAlert ( QWebFrame * frame, const QString & msg ) ;
++        virtual void javaScriptAlert ( const QString & msg ) ;
+         void launchRequest ( const QUrl & url );
+ 
+     private:
+@@ -116,7 +112,6 @@ class BrowserImageManager : public QObject, public IImageManager
+         static BrowserImageManager* m_BrowserImageManagerInstance;
+ 
+         BrowserWebPage* page;
+-        QWebFrame *frame;
+         QNetworkAccessManager* qnam;
+ 
+     signals:
+diff --git a/src/src.pro b/src/src.pro
+index eb93b263..137d7e14 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -34,7 +34,7 @@ TEMPLATE = app
+ 
+ CONFIG += rtti stl exceptions
+ #CONFIG -= exceptions
+-QT += svg network xml core gui webkitwidgets concurrent printsupport
++QT += svg network xml core gui webenginewidgets concurrent printsupport
+ win32-msvc* {
+     LIBS += -lzlib
+ } else {
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch
new file mode 100644
index 000000000000..48c4af7b9c50
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch
@@ -0,0 +1,35 @@
+From 20edcc7e85413e60ff180bd9f20e5428e5729222 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
+Date: Mon, 26 Sep 2016 13:11:33 +0200
+Subject: [PATCH] Replaced missing QT += webkit, updated linux package list.
+
+---
+ ci/travis-linux-install.sh | 3 +--
+ src/QMapControl.pri        | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/ci/travis-linux-install.sh b/ci/travis-linux-install.sh
+index 79975d27..4e83c9bb 100755
+--- a/ci/travis-linux-install.sh
++++ b/ci/travis-linux-install.sh
+@@ -8,6 +8,5 @@ sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
+ sudo apt-get update -qq
+ sudo apt-cache search qt
+ sudo apt-get -qq install gdb libgdal-dev libproj-dev
+-sudo apt-get -qq install libqt4-xml libqt4-network libqt4-gui libqt4-svg libqt4-webkit libqt4-dev qt4-qmake
+-sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webkit5* libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
++sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webengine5{,-dev} libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
+ qtchooser -list-versions
+diff --git a/src/QMapControl.pri b/src/QMapControl.pri
+index bbfc09b5..92769565 100644
+--- a/src/QMapControl.pri
++++ b/src/QMapControl.pri
+@@ -26,7 +26,7 @@ QT += network
+         DEFINES += USE_WEBKIT
+         SOURCES += browserimagemanager.cpp
+         HEADERS += browserimagemanager.h
+-        QT += webkit
++        QT += webenginewidgets
+         contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
+     }
+ }
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch
new file mode 100644
index 000000000000..97d76a187641
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch
@@ -0,0 +1,135 @@
+From 3019f1d2c76a0ae0c51e70d34bc25a49cb030845 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
+Date: Wed, 28 Sep 2016 21:41:02 +0200
+Subject: [PATCH] Removed webengine from LicenseDisplayDialog and renamed
+ conditional.
+
+This removes the QWebEngine dependency for most build configurations.
+None of the code actually uses it, but there are some plugins that do.
+I expect they are all obsolete, but will keep it in until they are
+replaced/deemed not working.
+---
+ COMPILE.md                         |  2 +-
+ src/Layers/ImageMapLayer.cpp       |  2 +-
+ src/Layers/LicenseDisplayDialog.ui | 29 +++++++++++++++--------------
+ src/QMapControl.pri                | 14 ++++++--------
+ src/src.pro                        |  2 +-
+ 5 files changed, 24 insertions(+), 25 deletions(-)
+
+diff --git a/COMPILE.md b/COMPILE.md
+index 9324019d..108a2eee 100644
+--- a/COMPILE.md
++++ b/COMPILE.md
+@@ -151,7 +151,7 @@ There are some parameters you can pass to qmake to customize build:
+ | TRANSDIR_MERKAARTOR=<path>  | where will the Merkaartor translations be installed |
+ | TRANSDIR_SYSTEM=<path>      | where your global Qt translation directory is | 
+ | NODEBUG=1                   | release target |
+-| NOUSEWEBKIT                 | disable use of WebKit (Yahoo adapter) |
++| USEWEBENGINE=1              | enable use of WebEngine (required for some external plugins) |
+ | SYSTEM_QTSA                 | use system copy of qtsingleapplication instead of internal |
+ 
+ 
+diff --git a/src/Layers/ImageMapLayer.cpp b/src/Layers/ImageMapLayer.cpp
+index 31966b09..b46199b9 100644
+--- a/src/Layers/ImageMapLayer.cpp
++++ b/src/Layers/ImageMapLayer.cpp
+@@ -263,7 +263,7 @@ void ImageMapLayer::setMapAdapter(const QUuid& theAdapterUid, const QString& ser
+                     QDialog dlg;
+                     ui.setupUi(&dlg);
+                     dlg.setWindowTitle(tr("Licensing Terms: %1").arg(name()));
+-                    ui.webView->load(u);
++                    ui.urlLabel->setText(QString("<a href='%1'>%2</a>").arg(u.toString()).arg(u.toString()));
+ 
+                     bool OK = false;
+                     while (!OK) {
+diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
+index 3dabd130..dd748e41 100755
+--- a/src/Layers/LicenseDisplayDialog.ui
++++ b/src/Layers/LicenseDisplayDialog.ui
+@@ -6,8 +6,8 @@
+    <rect>
+     <x>0</x>
+     <y>0</y>
+-    <width>650</width>
+-    <height>400</height>
++    <width>786</width>
++    <height>171</height>
+    </rect>
+   </property>
+   <property name="windowTitle">
+@@ -15,11 +15,19 @@
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+-    <widget class="QWebEngineView" name="webView">
+-     <property name="url">
+-      <url>
+-       <string>about:blank</string>
+-      </url>
++    <widget class="QLabel" name="label">
++     <property name="text">
++      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The content selected is shared under a non-standard license agreement. The full text is available on the following URL. It is your reponsibility to read, understand and agree to the license.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
++     </property>
++     <property name="wordWrap">
++      <bool>true</bool>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <widget class="QLabel" name="urlLabel">
++     <property name="text">
++      <string>TextLabel</string>
+      </property>
+     </widget>
+    </item>
+@@ -39,13 +47,6 @@
+    </item>
+   </layout>
+  </widget>
+- <customwidgets>
+-  <customwidget>
+-   <class>QWebEngineView</class>
+-   <extends>QWidget</extends>
+-   <header>QWebEngineView</header>
+-  </customwidget>
+- </customwidgets>
+  <resources/>
+  <connections>
+   <connection>
+diff --git a/src/QMapControl.pri b/src/QMapControl.pri
+index 92769565..3491c8b1 100644
+--- a/src/QMapControl.pri
++++ b/src/QMapControl.pri
+@@ -21,13 +21,11 @@ SOURCES += \
+ 
+ QT += network
+ 
+-!contains(NOUSEWEBKIT,1) {
+-    greaterThan(QT_VER_MAJ, 3) : greaterThan(QT_VER_MIN, 3) {
+-        DEFINES += USE_WEBKIT
+-        SOURCES += browserimagemanager.cpp
+-        HEADERS += browserimagemanager.h
+-        QT += webenginewidgets
+-        contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
+-    }
++contains(USEWEBENGINE,1) {
++    DEFINES += USE_WEBKIT
++    SOURCES += browserimagemanager.cpp
++    HEADERS += browserimagemanager.h
++    QT += webenginewidgets
++    contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
+ }
+ 
+diff --git a/src/src.pro b/src/src.pro
+index 137d7e14..81a65f34 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -34,7 +34,7 @@ TEMPLATE = app
+ 
+ CONFIG += rtti stl exceptions
+ #CONFIG -= exceptions
+-QT += svg network xml core gui webenginewidgets concurrent printsupport
++QT += svg network xml core gui concurrent printsupport
+ win32-msvc* {
+     LIBS += -lzlib
+ } else {
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index 9470b88ad6f5..d3bb9dded76e 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,35 +14,42 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy"
+IUSE="debug exif gps libproxy webengine"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[X,qt5(+)]
 	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	>=sci-libs/gdal-1.6.0
-	>=sci-libs/proj-4.6
+	sci-libs/gdal
+	sci-libs/proj
 	sys-libs/zlib
 	exif? ( media-gfx/exiv2:= )
 	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
 	libproxy? ( net-libs/libproxy )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
+PATCHES=(
+	"${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826
+	"${FILESDIR}"/${P}-desktopfile.patch
+	"${FILESDIR}"/${P}-webengine{1,2,3}.patch
+)
 
 DOCS=( AUTHORS CHANGELOG )
 
 src_prepare() {
 	default
 
+	rm -r 3rdparty || die "Failed to remove bundled libs"
+
 	my_rm_loc() {
 		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
 		rm "translations/${PN}_${1}.ts" || die
@@ -60,24 +67,23 @@ src_prepare() {
 src_configure() {
 	# TRANSDIR_SYSTEM is for bug #385671
 	eqmake5 \
-		PREFIX="${ED}usr" \
-		LIBDIR="${ED}usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
+		PREFIX="${ED%/}/usr" \
+		LIBDIR="${ED%/}/usr/$(get_libdir)" \
+		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
+		SHARE_DIR_PATH="/usr/share/${PN}" \
+		TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
 		SYSTEM_QTSA=1 \
 		RELEASE=1 \
-		NODEBUG="$(usex debug '0' '1')" \
-		GEOIMAGE="$(usex exif '1' '0')" \
-		GPSDLIB="$(usex gps '1' '0')" \
-		LIBPROXY="$(usex libproxy '1' '0')" \
+		NODEBUG=$(usex debug 0 1) \
+		GEOIMAGE=$(usex exif 1 0) \
+		GPSDLIB=$(usex gps 1 0) \
+		LIBPROXY=$(usex libproxy 1 0) \
+		USEWEBENGINE=$(usex webengine 1 0) \
 		ZBAR=0 \
 		Merkaartor.pro
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	gnome2_icon_cache_update
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index fa01cf15ac09..4491ffa4a5cd 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${PN}-0.18.3-sharedir-pluginsdir.patch" ) # bug 621826
+
 DOCS=( AUTHORS CHANGELOG )
 
 src_unpack() {
@@ -67,9 +69,11 @@ src_prepare() {
 src_configure() {
 	# TRANSDIR_SYSTEM is for bug #385671
 	eqmake5 \
-		PREFIX="${ED}usr" \
-		LIBDIR="${ED}usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
+		PREFIX="${ED%/}/usr" \
+		LIBDIR="${ED%/}/usr/$(get_libdir)" \
+		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
+		SHARE_DIR_PATH="/usr/share/${PN}" \
+		TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
 		SYSTEM_QTSA=1 \
 		NODEBUG=$(usex debug 0 1) \
@@ -80,10 +84,6 @@ src_configure() {
 		Merkaartor.pro
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	gnome2_icon_cache_update