gentoo Easter resync : 12.04.2020

4 files changed, 13 insertions, 10 deletions

diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index b9dfe5ca4954..c9cfb10de20f 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,7 @@
-DIST qtlocation-everywhere-src-5.12.3.tar.xz 5905856 BLAKE2B b52b9eaea77b4b429db90768d97c7f4d1319c7a860e864acb5afc5c35c0b2c7425afe64909751b2063bad747fe3aa6d899b39532a72065d4cd87935219a196f1 SHA512 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082
 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
-EBUILD qtlocation-5.12.3.ebuild 930 BLAKE2B e18d9652aef2863beedbfe7d21de8d456fe25369ff266951f6ae6b78dd9f61ddfba27222a942b977934c4933d256c1f438af0976851b09ee20af0c78f691cf44 SHA512 f1ed59901f204035783722631e437a311dc33bffcf942faab292b159ecb6d675cbd9d299c1d40962f15aa377c5328eefd4618e28329394633ff73611c1ebde43
-EBUILD qtlocation-5.13.2.ebuild 973 BLAKE2B 023a7d294542f76d6925c14b5c3a0036988f2d096030825f98f953b2d2c42636b2f14a5873ef2a7c45152e166f7e2695c37006178e8794518e36719d69e7c126 SHA512 1719046875e40350a5d7731347b4cdd7b17855519bc9d109a0ee8bee5406ce388651e8b98fc49a45a0e580868bd6b81669fc57d63e67b610682756fdcabc20ae
-EBUILD qtlocation-5.14.1.ebuild 976 BLAKE2B bb519b8f83a00319f1e0d89c115243193cc1b3826f017922d6718abb5ff631ea4ef20cda10ebe9ddbff6adbe131ad84af34592cb4410f9a67bc51ff398b546c9 SHA512 b2810195c3f4cd7949ad1d4d519cafdbb845cb18695811de97e081f5a18b8d32dcc45c534ea25a52494d75508d86f26badc359dd6ea26fc358bfdd4631a5f8bb
+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
 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
index 6258747f51ae..a373712510ce 100644
--- a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.13.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="arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtlocation/qtlocation-5.14.1.ebuild b/dev-qt/qtlocation/qtlocation-5.14.1.ebuild
index e8da2d154da0..59d483099531 100644
--- a/dev-qt/qtlocation/qtlocation-5.14.1.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.14.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=""
diff --git a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
index ec900f0cfb34..07669c361d64 100644
--- a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 IUSE=""
 
 RDEPEND="
+	dev-libs/icu:=
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtdeclarative-${PV}
 	~dev-qt/qtgui-${PV}
@@ -32,13 +33,15 @@ QT5_TARGET_SUBDIRS=(
 	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}"
+	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
 }