gentoo resync : 24.12.2018

3 files changed, 3 insertions, 49 deletions

diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 1cc7459f4c9d..ba8215ffe086 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,5 @@
 DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
-DIST qtlocation-everywhere-src-5.11.2.tar.xz 5584420 BLAKE2B e7b0cd716edab33d19f1b9ef519a35ea8094ccc85ce015eb7f3e26c61f62bcc7ff9419dd79da5d8ebec9f3b0630cea7c125f237ed39b7ed1917a45408cf7dc51 SHA512 84a52aedac59f1bc4372538dc0810c742f87f04b2ee599e7ed3f8f0cfe0e13d652e80d3cf7de95395bbe1285a60cc15791760e17f0975cf8399527cdadbd7c1b
-DIST qtlocation-opensource-src-5.9.6.tar.xz 5405652 BLAKE2B 001bb5ea4d73ac67a1e1a70e3218c2cd0554b02f84001da88e3109531b8c0f51264a51276edae5c899aa68b5d1ba1bf6d55ef9e3d409b3676f60657cc8deb86c SHA512 63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a
+DIST qtlocation-everywhere-src-5.11.3.tar.xz 5589440 BLAKE2B 544d90151fcbaf8a75d374e4acec9bbd78b63c2dee0258f1e08e18ffb94a86c91f63dd8c9215af96e3648d50a40fe6b66c105abec0ab6dd4473903a06f2d0253 SHA512 880cd6983bc0b4c5ac5a1edb2b3ffbe89f133bd819e4bea4fb8e91ba8d847ab80572743e3994145ee6697cb2fc24c393ac3c4ead847a022d848799eaa4982716
 EBUILD qtlocation-5.11.1.ebuild 919 BLAKE2B 2cac5157ba1cd250468e115409174f7698e677b3155be082389d391b823fde5ca828d8eb92efe1e5337a91397068fdb427035247042ce6cc8cb5734583d34440 SHA512 088d1ddc83eadfc286b904b2e0177dfb1cf119bcfce3044de97a781c6639baa427c154caffaf11d2d44d7246b029b8fb1c4af5d8a9dda4fdeeffb0f4a702ee7a
-EBUILD qtlocation-5.11.2.ebuild 921 BLAKE2B f7c7aafa6a01234b6845e70cfb512e971deaf6c58ac278eb7eecd3bf348d0e44d6ba968848dcf936e44370ac1b102b0bf6b672f8a3a63f69105a366c92104fa2 SHA512 cc7316283c4fdf3e05d0069bf30d9436eb76bce8c8c21416b87760d7cbfe93bed07dfa043f4b980fe7cd2c187741530384585152f3c9649903d67b5cc3e4b9d2
-EBUILD qtlocation-5.9.6.ebuild 922 BLAKE2B cbcea33ab0f866d580839df171c7d85cb75aeeb6c9cfdd27d8983520e38d1757bbecc899123058b18bca2a444562eee62a48d8b111be6703aad90b23ab6c4624 SHA512 26a0f3b6f88c3aebcbfaabc1da94771726c8a3181920a4f78f48770aac9ff119137099ffdc480276beeaacfeb11b375e85112482e0584615cf5bdbb6c92abd88
+EBUILD qtlocation-5.11.3-r1.ebuild 926 BLAKE2B fefdaca7b335b060c6bbc98a60af6c29f468534d8b4f28dd23cd992fc8ec85f9387a0f6a1523f16b4beb517db8204097bb9785863cc4fee03ddf7ddc070ace56 SHA512 c767af68fd05173833241ee41e0fa4b9a801755fc1d6760907d9064baef1f5c71e100909e0a8eea7f09e454016532f95e27bb7fbd6caf1f84abc172279a2458c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.11.2.ebuild b/dev-qt/qtlocation/qtlocation-5.11.3-r1.ebuild
index b6f3af24dda4..78057b719907 100644
--- a/dev-qt/qtlocation/qtlocation-5.11.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.11.3-r1.ebuild
@@ -17,7 +17,7 @@ RDEPEND="
 	~dev-qt/qtdeclarative-${PV}
 	~dev-qt/qtgui-${PV}
 	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}
+	~dev-qt/qtpositioning-${PV}[qml]
 	~dev-qt/qtsql-${PV}
 	sys-libs/zlib
 "
diff --git a/dev-qt/qtlocation/qtlocation-5.9.6.ebuild b/dev-qt/qtlocation/qtlocation-5.9.6.ebuild
deleted file mode 100644
index f228e74b4fed..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.9.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="The Location module 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}
-	~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
-}