gentoo auto-resync : 29:12:2024 - 06:30:44

3 files changed, 2 insertions, 64 deletions

diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index f409db0d4103..892db6dec950 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,13 +1,10 @@
 DIST qtlocation-5.15.11-patchset.tar.xz 4796 BLAKE2B dcfa75bd3fb2e9069e1a530c27e2b4e9ac921fcf0ccb712f0894375b575ba25103948c6e5b85b56a8f9c9f2d7edf7df8e38501e93356e69f060b577a04c2d221 SHA512 14bd2864abc6f446dc4fbac03548cb42305685b46db757d856360780144095a021130bc0ebf1d07a516dc7991dc0cfbf733bd0ef6be58237bc15822c21af1d0b
-DIST qtlocation-everywhere-opensource-src-5.15.14.tar.xz 6549056 BLAKE2B 831c7091a7b9d1355121f7e1e89f62c8aaa8819bef98c80f90b1521eea9c11a35452557c97d1dd49d13e0e810bd70f5038f8682f6ac42b68622cd269664eadd3 SHA512 5a6271d61bb9ede80b8483e784d8cc15170cf3f7b019472b2362c742e1e1fd52d811c2132b751574dacee6f7274b81e6049b8a3dc934ba7612c0aef6643062dd
 DIST qtlocation-everywhere-opensource-src-5.15.16.tar.xz 6548480 BLAKE2B 9f6d66d22f4ad45935e3e76e275866b236cd842b7a17a3a9e6553f75dcf3048cd70e0b046d5d08c57d4c9d7ea73f723b210d044f44bf494cafbbff590b0703e5 SHA512 321a8e68f731a97c7ef0209d6db0ff4891dd14dc43e14f5c4c5ac763069c7f17298fbc6410326df9265ccd631372cdba662fc82e26a324936d371c8572e19a48
 DIST qtlocation-everywhere-src-6.7.2.tar.xz 3166188 BLAKE2B ca22bc51308b5f5b28f96bedd4190ad747bd335790ec0975e1dc381d8fdacf720907a9842ec01cdd1add3d56549d4c096021731ea3268423d3288e1b24c993a6 SHA512 d7b8d4b9c99247362747d2d8fcf9207e710bed70c320d5c38e6868760cfe5ae2a158d1c0496af939a3e0d74369a86673cddfb25096ff8dda8dc209fd0df94e21
 DIST qtlocation-everywhere-src-6.7.3.tar.xz 3166232 BLAKE2B be9833355f758c6a7ffc799c911262c841f3419691a37a3ec21d3a2f2ffead23e69fce09811a8071c9454070659f7ea8a81eeb7ee5d7cfd89e5d76889649d8f6 SHA512 e905001e5edd4aa6fc3e28e7d9e0461083706510ae652bb8329a3eb9d0ca6a8cbea75ded54538e35a1a9389d743a41a4d1834f29184d398bdbb1281c0f4f591a
 DIST qtlocation-everywhere-src-6.8.1.tar.xz 3164180 BLAKE2B 12544d071894925abbc4c8af6875fafa5bf628e8814ef96a85caa2a0135b2a30cb4c68a96feb21b3b6ae20e53343f8fb14684a27d86a08b6cc3803830f38d6c7 SHA512 0d002e99b1e7434814a58e560a0730f0b1f9cc81cfe7d01001b2a2bd213b5ceaa4deaf6693f210f8576d7e76ac32fe22e758bc9c03888e7acfd4440902d454ac
-DIST qtlocation-mapboxgl-5.15.14-35d56672.tar.gz 3726302 BLAKE2B f51c0589a06fab35ba85b3bf4ca8a1904cda5aec47b17fdf747da527d02be623a76b1af5883b33267fab825a4b5d0863ea0220f2907e98e286b40d4a0bbc82e5 SHA512 5c2ff6ab7e4382d87546a802c5603bdcec3deb7fbb836fc981292c67660514caaa6118e164d2e099d0304710035572706562ec84e4aba5ce36b01cade8b0993e
 DIST qtlocation-mapboxgl-5.15.16-35d56672.tar.gz 3726302 BLAKE2B f51c0589a06fab35ba85b3bf4ca8a1904cda5aec47b17fdf747da527d02be623a76b1af5883b33267fab825a4b5d0863ea0220f2907e98e286b40d4a0bbc82e5 SHA512 5c2ff6ab7e4382d87546a802c5603bdcec3deb7fbb836fc981292c67660514caaa6118e164d2e099d0304710035572706562ec84e4aba5ce36b01cade8b0993e
-EBUILD qtlocation-5.15.14-r1.ebuild 1629 BLAKE2B 93af70522115073f42fcc8b073cd515c547f4be99a98bd8352fee740690fbbd0c5cba351f54ec0038dfc0c21bacd78f7bcba0a8d9cb02145a2748d4a5f371de6 SHA512 b21a9278eac1accf942ae82bb066991d5aacf59e43412a47e68b88a6b9bb0abf59347c310ca8988e248242b701a496862108e489da00ad7b537b6e6459aa61d3
-EBUILD qtlocation-5.15.16-r1.ebuild 1632 BLAKE2B 4b1685c6c7c66688cf51a54b449c972c21ba402d0c8ea0430127b3636b6f151bfdea47a7b67a738c91402e18e4a751e2e18dab1165ff5e536b153e17cdaa981a SHA512 8505c8b1a775931a0a7d6dc145337d2b4cf1bd40ca397326058e35268671adb4f0efaf3a0a7f461cd9deb41b2ef0190e7182f8d50eab0a5cea2bd2e435e580d3
+EBUILD qtlocation-5.15.16-r1.ebuild 1629 BLAKE2B 93af70522115073f42fcc8b073cd515c547f4be99a98bd8352fee740690fbbd0c5cba351f54ec0038dfc0c21bacd78f7bcba0a8d9cb02145a2748d4a5f371de6 SHA512 b21a9278eac1accf942ae82bb066991d5aacf59e43412a47e68b88a6b9bb0abf59347c310ca8988e248242b701a496862108e489da00ad7b537b6e6459aa61d3
 EBUILD qtlocation-6.7.2.ebuild 1367 BLAKE2B 7b74bb6c4539fa58b6d2b6153909d37eb9dcfa0a0ba9fd9145329519b5fae4196b53ff8a12d004f98717b7d43762a90742740e0755f89bc090bf0ded151d7fff SHA512 e8ce507d2ec96be88e69a7161e9e3e4bc3e142ab4bdb10572d4b73d31c8803be9d773a06481d5f0da1261c03e5dc6fe5e6ef36e6a038dea4b7cd4a6ce2545951
 EBUILD qtlocation-6.7.3.ebuild 1369 BLAKE2B 1201fde2d1e6828574f73a82d6a990643d2244afc2504ee15268c09754992ca0b2de726ef058d4bf0a10ab83bad54d3d448b9bb9729755b0b285b8fd2159d0ee SHA512 d4153d0f02735fe2ca0f60950fa445742eab593d5a268b9d7787e2148683b349020a3d4fe1a05f03ade335fe9e1321e417efc3f44607a9936bc2d8fd49a8fddb
 EBUILD qtlocation-6.8.1.ebuild 1367 BLAKE2B 7b74bb6c4539fa58b6d2b6153909d37eb9dcfa0a0ba9fd9145329519b5fae4196b53ff8a12d004f98717b7d43762a90742740e0755f89bc090bf0ded151d7fff SHA512 e8ce507d2ec96be88e69a7161e9e3e4bc3e142ab4bdb10572d4b73d31c8803be9d773a06481d5f0da1261c03e5dc6fe5e6ef36e6a038dea4b7cd4a6ce2545951
diff --git a/dev-qt/qtlocation/qtlocation-5.15.14-r1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.14-r1.ebuild
deleted file mode 100644
index 8041f5561688..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.15.14-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PATCHSET="${PN}-5.15.11-patchset"
-inherit qt5-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	MAPBOXGL_COMMIT=35d566724c48180c9a372c2ed50a253871a51574
-	SRC_URI+=" https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz
-	https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-fi
-
-RDEPEND="
-	dev-libs/icu:=
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtpositioning-${QT5_PV}*[qml]
-	=dev-qt/qtsql-${QT5_PV}*
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	=dev-qt/qtconcurrent-${QT5_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
-)
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-
-PATCHES=( "${WORKDIR}/${PATCHSET}" )
-
-src_prepare() {
-	rm -rf src/3rdparty/mapbox-gl-native/* || die
-	mv "${WORKDIR}"/${PN}-mapboxgl-${MAPBOXGL_COMMIT}/* src/3rdparty/mapbox-gl-native || die
-	qt5-build_src_prepare
-}
-fi
-
-src_configure() {
-	# src/plugins/geoservices requires files that are only generated when
-	# qmake is run in the root directory. Bug 633776.
-	qt5_configure_oos_quirk qtlocation-config.pri src/location
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/qtlocation-5.15.16-r1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.16-r1.ebuild
index 87f70fff3d3f..8041f5561688 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.16-r1.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.16-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	MAPBOXGL_COMMIT=35d566724c48180c9a372c2ed50a253871a51574
 	SRC_URI+=" https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz
 	https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 fi
 
 RDEPEND="