gentoo resync 31.01.2019

6 files changed, 5 insertions, 67 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 3a41a32fc605..51c5481f63f5 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 680ca17f9442..5873e116df40 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,5 +1,5 @@
 DIST gpxsee-6.3.tar.gz 3861093 BLAKE2B bd6cd81b1f2c4fdd3b4b6c0bae72be1a48ad0f0d22203f653e325228974eaf0043eca41efd42e085bd5811a8d2a9cd2f51fe04c03d9e9d064e01cfc24d7a12e4 SHA512 7a4f23444517a0481490f8f1a0520634e63e0416dd5fd5bdb01942df138839595dffd4bced21e264552915c38e5653e927244ea5ca185ff3f93df56fad3e9c73
 DIST gpxsee-7.1.tar.gz 3868798 BLAKE2B 08bc30d77508429bec94bbdb255b76b79c21bd2e251b216743f49fa45f59ded5a02e730c4766fd9f15e2357d74a66750e3e7515a9d8bdd21a1f97dee77cbec02 SHA512 bb7dc14a3cf7ca87a4335383d6c4c380fcf1a0009161ec988b1b5cf964cf757bbe05ae2e51d726edcb97966918afe4d872172087988321222a65e3c27c276a5d
 EBUILD gpxsee-6.3.ebuild 1537 BLAKE2B 5868cebe01d8b5095eb92c5fbf43b87961b2b08a3d9afb1fed7d7f0e7dda58bb68aa1a7953f52f5d569c4722cfeaa7350f30391ba6b6738a92f6284782444660 SHA512 f25ad58786a05cbdf28e99aff7054281d0fcc199cae3e090a4db11ac42f4f5a802e9247a309396e25db884f58ce5e654ec5c590d80fd8d9429c444c6c5bab0b1
-EBUILD gpxsee-7.1.ebuild 1540 BLAKE2B 0ba94919b68048f8ffe4c898eb37053a648cbef4445c3eab1bb5c381b320e9e6d0c9c7ddec2e81f658ec262beecb892a20f46efc460e900b048aaa1dcda2ab47 SHA512 63c95ed59603f3b34c55d80a0ffcca9040d075b8952b388b6ad490c350d33956558dfafd97c66e4fd8735a63c2befddadb5f78266f2e2d022053345ba4c867d1
+EBUILD gpxsee-7.1-r1.ebuild 1595 BLAKE2B 56ee4fc1ae26a1b7df8d20ac9c5a6b05416693ff90b9c25d99c19d1573024e5e84eaad1bf0118d376646152608584311f6afb18925e3899a80e781414ff3bd35 SHA512 b3d634a0888de422e0b912913323142b9c02673d610d17036854102c6213cd599635a61f30937a0d9255d8f8ae669eef64ab02b5a9935af922251ca9a953c0a4
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-7.1.ebuild b/sci-geosciences/gpxsee/gpxsee-7.1-r1.ebuild
index f12eaf15a651..f37e65f5536a 100644
--- a/sci-geosciences/gpxsee/gpxsee-7.1.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,8 +18,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="dev-qt/qtwidgets:5
 	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 6f59f81207ed..d4437ca7a8cd 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,8 +1,5 @@
-AUX qmapshack-1.11.1-qt-5.11.patch 738 BLAKE2B f67a505ae4c63f7aac616c6dab7c6b0d96ac63a15267c1be50d5f45b6cc0c7f0c8ca98d0f6c92f6970758ba0a5fa062d9f32615dca4eb7ed26878965fd068198 SHA512 7793e38cea40c692893934fbd33d7f60a1f456ca80612a2ec00fc0144717f34fd8eab01ef66b697b1cec52ec56e69d1197932f574d03dbed707c1dfc686fa36d
-DIST qmapshack-1.11.1.tar.gz 11446871 BLAKE2B fa92b93787306d23110112fd851f0ee02418ac7b27316f57b4045efc4ae726e36c4014682d1ee32879f8894bab7dcac70852384f8b158e01026d7782f67b5ede SHA512 43e1b587bd3f4901b155ea6d1d520cf303681640c1bd521b30ef7f23aaf49b2fffe9b764e5dd3fcaef360b0d32b360b76eb8d737ec5e186aa75362ff2507956e
 DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5
 DIST qmapshack-1.12.1.tar.gz 12033026 BLAKE2B e898507bad42a141f02cf8fd0338cdf9f39344b249318be29d1e6eb500a9e810496c6a790745cf50aec0025b5547be8382ef0c9eab2d780cbf63f9d29eb064a9 SHA512 c9b6ad0c7372cc4d992cee07d20ee0ad5779014ce6336644e13be705ec0bbed22d5f83e27473c2813c5bf13e49558686546c50fd597eb9ef2692c64933f94713
-EBUILD qmapshack-1.11.1-r1.ebuild 937 BLAKE2B e85730518ec6b863e90db2b77a24f2a4def775338a7683e80f7040e61806e3f2d6e0bc823afd1acdeb25641743261ea2a0cf2470795de1a20d2edcaefb3c5998 SHA512 148bab65d8f829d89e84f1df532701085d378fc9bda4f51fc68c8b05c9c48874e9acbc7ae721044db7a56b907ca9fe417094281c5460f571e7ebddad6cfcc57b
 EBUILD qmapshack-1.12.0.ebuild 917 BLAKE2B ccad73881751fd4798d592def9b28fbbd3459045015bdd1a19f322d5a9bac452b370fe6d629eb5f894b7512d38481c0804de1819a429bca782e7cafba6eb5595 SHA512 e856b78e8fe4320e2134c7b0438ad467f609c2ad622b5bd4b8af41afa729c9323b1f5bab07ebe98b652d0fa133a338fe3e1d81f355257152f11ea0b43e25918d
 EBUILD qmapshack-1.12.1.ebuild 922 BLAKE2B 0648b29870c6882bb3e3e2e3f3b85e4e39788e517e93d16e52fe7a50822d7f57f4e07cd7146fc4f3960622cbb789848e603a12ddc4d16fab2a08c1f335befd38 SHA512 fdc7e4dd5c41f28a8b7186096435b817c03c2b5440733820981e2e167d2e13d9dbd034dce59dd8f4b1c85bbdb6f857641d5326e179771872bc4be2924a091f8b
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch b/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch
deleted file mode 100644
index 404f034176df..000000000000
--- a/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User kiozen
-# Date 1528899896 -7200
-# Node ID e9b47af61b0945acb74649bab30dec23ac42f375
-# Parent  f52eedfb8f94ea218eb1c55bb8f2fa0c0503238f
-[Issue #344 ] Building latest version of QMapShack fails after updating QT from 5.10.1 to 5.11.0
-
-diff --git a/src/qmapshack/helpers/CToolBarSetupDialog.cpp b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
---- a/src/qmapshack/helpers/CToolBarSetupDialog.cpp
-+++ b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
-@@ -20,6 +20,8 @@
- #include "helpers/CToolBarConfig.h"
- #include "helpers/CToolBarSetupDialog.h"
- 
-+#include <QAction>
-+
- bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item)
- {
-     CDialogItem * dialogItem = dynamic_cast<CDialogItem *>(item);
diff --git a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
deleted file mode 100644
index b3f1c55aef8f..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils gnome2-utils
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
-SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="dev-qt/qtwebkit:5
-	dev-qt/qtscript:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtdbus:5
-	dev-qt/qttest:5
-	dev-qt/designer:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-libs/quazip
-	>=sci-geosciences/routino-3.1.1
-	sci-libs/gdal
-	sci-libs/proj
-	sci-libs/alglib"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}