gentoo resync : 14.05.2020

3 files changed, 2 insertions, 44 deletions

diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index afab9cb802df..7fd680d72a6b 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/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 qtpositioning-5.13.2.ebuild 808 BLAKE2B 66ee8fff52d7461176679e37b276d985ba96755bf46d43de0029ecd00c977bc1e2f4d509b89f72f42e11db02216cfad02ea49e86f5ee8ef413d50c250121d527 SHA512 eef30456efa2ca96147e6dcb54385b540e2d44a1a910b40ba5793afa1f1af8c563b4bc57b44195184de1c040f0001eba40dde0955fb3c69595729e6c6f20b548
 EBUILD qtpositioning-5.14.1.ebuild 848 BLAKE2B a0ba1aa4e8514dee1fcb277aace29e1bc2b7b05bf77c5eed295b055841f634ed35013dd68a941e7b19467151222b5821a40981f158aae9c14cd22eeaa487a0e5 SHA512 78438e834906f1b53bb82947c62fdc963bb02f638300d4f3091194729cc885fbe597d550a2940cb1dc2c2b9b8d4620c48ff1668209bc4315ace46543c242f1ce
-EBUILD qtpositioning-5.14.2.ebuild 853 BLAKE2B d89c06e274722250787fc29a1bf8106cd84b18015872482efc8b00439a02cf45ca5d612d167b9f21e934ea971eb7a44ce541e12794d4bbae4acf42cc58239ab4 SHA512 629a2deda3ab8b945e72062d4f9b5de8f24881ab0f401a429b34358243a43828b72e0ba46d4d1b691f85b3e5f8e3b69053e22afce9544ec862566914b049d766
+EBUILD qtpositioning-5.14.2.ebuild 851 BLAKE2B aae762c52d936cabac03b3bd59fd94b6ff9dbb9fc578fb7bdd3ef1c83a7af8f1d46b97411e0e42abd984060afb8538ed1ea6736e2dc6d18386d350e65e5f7798 SHA512 c96e22988e78d46a883e67e4490e59b1cff2e44ffe79a1e6787cb5a8cbc3444e0ef5237a4f0e45972cb79acddfd04840443793f3e69f138b66d178d44635da73
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.13.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.13.2.ebuild
deleted file mode 100644
index 794f37d118ea..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.13.2.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="arm"
-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.14.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild
index 0db24b237f92..b6fad4a01fd2 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild
@@ -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"