gentoo resync : 22.01.2021

3 files changed, 3 insertions, 45 deletions

diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 24966941fc56..36365ce9344b 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,5 +1,3 @@
-DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106
 DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f
-EBUILD qtpositioning-5.15.1.ebuild 847 BLAKE2B e8d6459712a242ca2b5af814787ba320db7655dc68408863f7a6b6b14d825d3510c9b70b992e359fdb27b925a433e311a6fd2ff38c6dc5bec11ad293d93f176f SHA512 fdce4556ef51773005d8e2b27bdb480ec2569704c95cb8e2ed898d8e874d3bd83df6d1c09df6f2514d18e1e0b7513b7180eb86aaa4309fdc11fc8ba1806c463c
-EBUILD qtpositioning-5.15.2.ebuild 853 BLAKE2B d89c06e274722250787fc29a1bf8106cd84b18015872482efc8b00439a02cf45ca5d612d167b9f21e934ea971eb7a44ce541e12794d4bbae4acf42cc58239ab4 SHA512 629a2deda3ab8b945e72062d4f9b5de8f24881ab0f401a429b34358243a43828b72e0ba46d4d1b691f85b3e5f8e3b69053e22afce9544ec862566914b049d766
+EBUILD qtpositioning-5.15.2.ebuild 847 BLAKE2B b3c32833707bff665a6a1581e7ada9fc06967dab97f292971ae6390e3d490a7bedbb89a029b50a777111474a7fcbe47ba5873bb611b2bfff543981fa7f0402e4 SHA512 e4cb660bc036623457248e887d85289febeb47b90b1c4a90f8035d547f05fe79bea2b39c0e16e429be7a9e1bed45550f73c4322d3bbb1ba744e1fa5dc32e08ec
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild
deleted file mode 100644
index 00e76ee9b7d5..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtlocation"
-inherit qt5-build
-
-DESCRIPTION="Physical position determination library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="geoclue +qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	geoclue? ( ~dev-qt/qtdbus-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	geoclue? ( app-misc/geoclue:2.0 )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/positioning
-	src/plugins/position/positionpoll
-)
-
-pkg_setup() {
-	use geoclue && QT5_TARGET_SUBDIRS+=( src/plugins/position/geoclue2 )
-	use qml && QT5_TARGET_SUBDIRS+=(
-		src/positioningquick
-		src/imports/positioning
-	)
-}
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.2.ebuild
index 0db24b237f92..a989534143b8 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.15.2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="geoclue +qml"