gentoo resync : 14.05.2020

3 files changed, 2 insertions, 49 deletions

diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index c9cfb10de20f..e4aa1f038cae 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,5 @@
-DIST qtlocation-everywhere-src-5.13.2.tar.xz 6050044 BLAKE2B 912810dea36652b96b0f93b4e69755f86b0f12b3659420b3771649f00afc4909387768832989e2a7808db90467502bb8eb8f23734d41636c4eefb48c4ea534b4 SHA512 6ec28fd3add9db5758d38b964649c6e1e687e853192539c4e46386eac28378540167ec0abbf6312ecc1d2f3d33d19eaed4c4485f0c2d94a93f401dde3b9ddf6f
 DIST qtlocation-everywhere-src-5.14.1.tar.xz 6119236 BLAKE2B 8ea66354f17e67d02c3e0a2a6369b55af006f6aa3f7d8b3c0c914df7d01db852a63d3e6a24f11516aea6667dbc9888a361fe9a030b903720f77456ffdaa96710 SHA512 5ccba22c27beb0bbde4b84e510e322445d98f99d87046d463bd054d0a09f0b24af978cf372006aa2cfca0a0ca0fcbb067525a6dc103d2d89592afec0600efcd8
 DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
-EBUILD qtlocation-5.13.2.ebuild 956 BLAKE2B 53ae5634589994c34caa57632bb35c042e6e14cc5f49cc13091f93410cdf0e290a4e596c24494049dd6a47c11aaf9bcc1187d012508710f018f433b2d20cab62 SHA512 dacf644d78b338c399521fbe0429bcd3cff26cdfe05f5c89e8429a864889ec221c38d2830744f87a0296f3d70deba66e4aff5aa1262cbff10f77d449d923492b
 EBUILD qtlocation-5.14.1.ebuild 973 BLAKE2B f301061d398d1a0670544c41babb551c02a738ce60ecbbafcc039092ec6bb2696dd02348c70d9444ea251e0d31e6567f701dccb3bab478bbcfa8e924717fa1e5 SHA512 768f565dda4866f4f6f7d700dc85b7d136a2720688416360362447f61937faf420afa92edbfc99f368ab06ef588fab20448bc4545400dad83076fa03da23ac7c
-EBUILD qtlocation-5.14.2.ebuild 1084 BLAKE2B 30812ce7ba958e733b0227da567b553939e703309bdba38704fb3517142ad39560f4ee9c2ddf0db01b80024dbbb10b1bdcfd78fbc8b3f3975853ae289e7b7e45 SHA512 c99e06cb810af75332d5cb70294504304d76937655b95bc6f8f9fc09608d59b0376f60f9cb315cc93b2cc722d47bf2a9b731890e2ab0c830ba64c65e3b5e7d2e
+EBUILD qtlocation-5.14.2.ebuild 1083 BLAKE2B 7366e3d73b577380d6fc2fbacf821bb3e33bbf7698acd4e403a02d3d55fd7aa286ed0974105e0077c59e1802225d6c224d0022f38c6a6d8c1d85d80e299e39cc SHA512 3898fb0fc06316d76a02f4fe31ca0f086cf09e07b1a2239f3ff7b1ed681186ad59af679713eeb6f3a630b1bad65ff843b02bda61c5f9a0c3ae2b8dd2f47c7853
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild b/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
deleted file mode 100644
index a373712510ce..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
+++ /dev/null
@@ -1,45 +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="arm"
-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/imports/locationlabs
-	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.2.ebuild b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
index 07669c361d64..d7e1e290a78a 100644
--- a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.14.2.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=""