gentoo resync : 25.11.2020

4 files changed, 2 insertions, 90 deletions

diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 2db9772bdbb8..c7581cb4cd9f 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,6 +1,3 @@
-AUX qtlocation-5.14.2-gcc-10.patch 1117 BLAKE2B ff43e3d2fa1b4accb03fc5dd1d1e3fa81797dec88c6c5c487a881c4d487d4d4888989087069cac7eb189b61362b8b0cba2b0eae207621e5627f3785a0df6ffe3 SHA512 ef27c87ff3d2092f9a9d115a93ab12e75da7e8cdb857c3acaae6175a3ce758c1c25b99719007b51ef6c1a6ac4d96915a2e89c9b9e733c164fd49a41433ab8d12
-DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
 DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106
-EBUILD qtlocation-5.14.2.ebuild 1138 BLAKE2B 2e74a03c7a99f819b46fc898dfc6bbc109dad43d9edb3aed326fa9d64ffc58b0d1d6c88d74f875be0eef2bffd6ff2a7edc6be6acc034507e02e90792ec8a7da9 SHA512 ada2afffe3a94ebfc2911944fbdf5e14b7d7889a5836306e80455472f041b5883590b70e06e757cc7598bdfd2229f0d5be27cc4b8a569637e8be763ac1c8ae9e
-EBUILD qtlocation-5.15.1.ebuild 1091 BLAKE2B 8e0032857e92c0d94afc73f4a89c94b3832920840b23f48b5f6af730e5134f8e26736bdcd8ea2eab943908169d618392fb22381affae0d6495548b2702408100 SHA512 c0b1507d3967a523533a437ba45276624d0c68aa23c4ad55b0c25539f5877fa6c474b41cfbef958bd43cb991d98b26ca6cd0e2cd5c4523224906f21365c8c234
+EBUILD qtlocation-5.15.1.ebuild 1087 BLAKE2B 92b7aa503e1da750e4cff065776abe307d1c21e20b84632278399c9a797ddc67ca03f37fa1beec60ba067963988c01a92a87786ca0c767d974799ef2f012e36b SHA512 b61600143e58eb713433a1293ce6f16ee54d51263e7472df94548ecc3a851fb04cd17082f56ca74538d9529bfcecc13c0abe2dd6e61c4412a8289565ded3df7d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch b/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
deleted file mode 100644
index e7cc6f70d055..000000000000
--- a/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0853378b2f2de82c59501e31d18906694ec6e27e Mon Sep 17 00:00:00 2001
-From: Bruno de Oliveira Abinader <bruno@mapbox.com>
-Date: Wed, 22 Apr 2020 19:54:53 +0300
-Subject: Fix compilation issues on GCC 9
-
----
- platform/default/bidi.cpp | 1 +
- src/mbgl/util/convert.cpp | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
-index d475c387b..c1710a6f1 100644
---- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
-+++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
-@@ -5,6 +5,7 @@
- #include <unicode/ushape.h>
- 
- #include <memory>
-+#include <stdexcept>
- 
- namespace mbgl {
- 
-diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
-index 97bfe9108..510ff2386 100644
---- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
-+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
-@@ -1,5 +1,7 @@
- #include <mbgl/util/convert.hpp>
- 
-+#include <cstdint>
-+
- namespace mbgl {
- namespace util {
- 
--- 
-cgit v1.2.1
diff --git a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
deleted file mode 100644
index 6aa228fb575a..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	dev-libs/icu:=
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}[qml]
-	~dev-qt/qtsql-${PV}
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	~dev-qt/qtconcurrent-${PV}
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/3rdparty/mapbox-gl-native
-	src/location
-	src/imports/location
-	src/imports/locationlabs
-	src/plugins/geoservices
-)
-
-PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" ) # bug 722102
-
-src_configure() {
-	# src/plugins/geoservices requires files that are only generated when
-	# qmake is run in the root directory. Bug 633776.
-	mkdir -p "${QT5_BUILD_DIR}"/src/location || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/qtlocation-5.15.1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.1.ebuild
index 0772e510f28e..b8c3658beb8a 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.1.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 IUSE=""