gentoo resync : 05.02.2020

4 files changed, 6 insertions, 52 deletions

diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 0b5dc36895b2..ed63fe8b127b 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,9 +1,7 @@
 DIST qtlocation-everywhere-src-5.12.3.tar.xz 5905856 BLAKE2B b52b9eaea77b4b429db90768d97c7f4d1319c7a860e864acb5afc5c35c0b2c7425afe64909751b2063bad747fe3aa6d899b39532a72065d4cd87935219a196f1 SHA512 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082
-DIST qtlocation-everywhere-src-5.12.5.tar.xz 5905880 BLAKE2B 67cbe02ad42cfde9bdff9285bc7b8e4d4edb8d4c295cb5e1ca9bbeb077d017762d93d1bf31da67b29506f634bd6f9f909aaf9ecbdc20c480e59bafb3ff539380 SHA512 fe82194e4e6bc2a2e6e3c55e3360afdfd56a6495a8d87bfbdceb29255430954d4c1adc62f1f82e63b23778f0bf03b0a50d6f5d2a963bd786f2cf2fbed7450ccc
 DIST qtlocation-everywhere-src-5.13.2.tar.xz 6050044 BLAKE2B 912810dea36652b96b0f93b4e69755f86b0f12b3659420b3771649f00afc4909387768832989e2a7808db90467502bb8eb8f23734d41636c4eefb48c4ea534b4 SHA512 6ec28fd3add9db5758d38b964649c6e1e687e853192539c4e46386eac28378540167ec0abbf6312ecc1d2f3d33d19eaed4c4485f0c2d94a93f401dde3b9ddf6f
-DIST qtlocation-everywhere-src-5.14.0.tar.xz 6116428 BLAKE2B 5e01196f4c5bdb605cf924ad316e9eba023da964a1e68ad5f564037a5fbf51791d82cb761ee8aef8225b8e84456a7344a8fbfeac8c67288b48ecfd4ea8f6c8dd SHA512 6d9915a7fba561353df6b0e1983a333af1ed85d22761c4022b7bb4ebf56a4ad2f895d1d7f0996cc93254346fc86718c654e1837c2d79358a04cd1e30c70c39ca
-EBUILD qtlocation-5.12.3.ebuild 946 BLAKE2B ea775efcc0c87f91b3b7f012d46073a2a68a3afb7e07ebe8ca55a8bd581f10d8e828d156aafb47b64c8cf014be16d6b9d37738d47e5b6720680f0270fca47469 SHA512 147bf6f4a777e62f0ea7b10b9133b9cad45a00883a64c96dec22623e60b173f1f70aa5e6c0d286e7fd848c656483c63546aaf3126c8072a8425afcd9a5c46b0c
-EBUILD qtlocation-5.12.5.ebuild 948 BLAKE2B 1de862270dc2ce10e164853aad60786e9c21f83b01c55cc7efdad93a988d1511d9d4117c21804e382eb7a214c64b4e57e97c5c755ae4b3171c66452bbd850b5a SHA512 bf8aa0d9185432fa842cee371565c2994acff674be2fd438ce2d7dae013ee92b13205e4d64f3d273c56bf419607a1019b6186e3c14bf9dab590fca7c9b634bf3
+DIST qtlocation-everywhere-src-5.14.1.tar.xz 6119236 BLAKE2B 8ea66354f17e67d02c3e0a2a6369b55af006f6aa3f7d8b3c0c914df7d01db852a63d3e6a24f11516aea6667dbc9888a361fe9a030b903720f77456ffdaa96710 SHA512 5ccba22c27beb0bbde4b84e510e322445d98f99d87046d463bd054d0a09f0b24af978cf372006aa2cfca0a0ca0fcbb067525a6dc103d2d89592afec0600efcd8
+EBUILD qtlocation-5.12.3.ebuild 934 BLAKE2B 99340b886e0e0e347ef69b489b2384e9f8daaa21080e022dd735ec3db84d315115c203078bc855c5a2306f069706e69b132c8afa7029aa9e9c393c8420f59d25 SHA512 e033320a1ad3c6813a0d5da2538830f66a1553dde680933bf6494901d65c4349a6234246af835f56793bd37e20d1468d614725486491fe3526099e764539d6bb
 EBUILD qtlocation-5.13.2.ebuild 974 BLAKE2B 403fdeef8781b2cea0c4f15af0a1046baee65425907d520d5dbe720a934f9ae3eede91f12cd129c11ff88ab635878db3548c1a5885549758cb75a27c68c65c81 SHA512 36235cba65fe5921e5143c684a0fb121f9c993ace627f55e4e3c50e911c86cdcbd419194bb346ec412af45e27d29b2a5680cbaa9c05febcaba1e9a1df82b3936
-EBUILD qtlocation-5.14.0.ebuild 976 BLAKE2B a03eb12d024b2d9ba7ec1ff29be04b12cbbb4c585945f005a1613b2c81d411eced0a160739c92fbc90c067531f20738423466dd63e8e2b1b0b12dd2c11a6a515 SHA512 6a462aacf435f033093fb5616fada4bd2c89765bcd636322a2e6c0ca3a6bb6a97a273518335b884ec1f33b30429866289d922f544a3e7bbce6b58b27d6b8cd84
+EBUILD qtlocation-5.14.1.ebuild 976 BLAKE2B bb519b8f83a00319f1e0d89c115243193cc1b3826f017922d6718abb5ff631ea4ef20cda10ebe9ddbff6adbe131ad84af34592cb4410f9a67bc51ff398b546c9 SHA512 b2810195c3f4cd7949ad1d4d519cafdbb845cb18695811de97e081f5a18b8d32dcc45c534ea25a52494d75508d86f26badc359dd6ea26fc358bfdd4631a5f8bb
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild b/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
index d2a7145dd2ef..56f8b9b18171 100644
--- a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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="arm x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtlocation/qtlocation-5.12.5.ebuild b/dev-qt/qtlocation/qtlocation-5.12.5.ebuild
deleted file mode 100644
index 341530146c33..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.12.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 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-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/plugins/geoservices
-)
-
-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}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/qtlocation-5.14.0.ebuild b/dev-qt/qtlocation/qtlocation-5.14.1.ebuild
index ff48cdc6401b..e8da2d154da0 100644
--- a/dev-qt/qtlocation/qtlocation-5.14.0.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7