gentoo auto-resync : 23:11:2024 - 03:02:56

3 files changed, 3 insertions, 64 deletions

diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index aca622a09c4a..1bb283a93a81 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -5,11 +5,9 @@ DIST qtlocation-everywhere-src-6.7.2.tar.xz 3166188 BLAKE2B ca22bc51308b5f5b28f9
 DIST qtlocation-everywhere-src-6.7.3.tar.xz 3166232 BLAKE2B be9833355f758c6a7ffc799c911262c841f3419691a37a3ec21d3a2f2ffead23e69fce09811a8071c9454070659f7ea8a81eeb7ee5d7cfd89e5d76889649d8f6 SHA512 e905001e5edd4aa6fc3e28e7d9e0461083706510ae652bb8329a3eb9d0ca6a8cbea75ded54538e35a1a9389d743a41a4d1834f29184d398bdbb1281c0f4f591a
 DIST qtlocation-everywhere-src-6.8.0.tar.xz 3166076 BLAKE2B 5797705a6ec7dbb4050fe0e8f9a20e50578b7fc61cba26ed757812cc375e590d73b61190b6dbd321965c0ca6058f8ba9b1c46df69be7e8a60a37596314a53af5 SHA512 dcbeb6306c58b8809054be070fdcb00c8b3397c934bbd433d3e3152275cbbd662d67c9316a5724a229ec6e2874d5a2d33fa9693f1a0f0c4ffb294b92a0387d49
 DIST qtlocation-mapboxgl-5.15.14-35d56672.tar.gz 3726302 BLAKE2B f51c0589a06fab35ba85b3bf4ca8a1904cda5aec47b17fdf747da527d02be623a76b1af5883b33267fab825a4b5d0863ea0220f2907e98e286b40d4a0bbc82e5 SHA512 5c2ff6ab7e4382d87546a802c5603bdcec3deb7fbb836fc981292c67660514caaa6118e164d2e099d0304710035572706562ec84e4aba5ce36b01cade8b0993e
-DIST qtlocation-mapboxgl-5.15.14-4c88f2c0.tar.gz 3726387 BLAKE2B e9b818505ace86516262d1407450c14be82122bb91363a57708795844089371ac7d511a857f713c7cb4e6f8b54867aab0bc5dcdb9c49aa28aa3f8363271378e0 SHA512 e4d9133db892fd8b7b1bcf584bf7dae30c0f0353f3b0a696a6cabc9485067f262d42554b583640521734498572e5480b5e8d0143d5be47bb92077f3192fefa4d
-DIST qtlocation-mapboxgl-5.15.16-4c88f2c0.tar.gz 3726387 BLAKE2B e9b818505ace86516262d1407450c14be82122bb91363a57708795844089371ac7d511a857f713c7cb4e6f8b54867aab0bc5dcdb9c49aa28aa3f8363271378e0 SHA512 e4d9133db892fd8b7b1bcf584bf7dae30c0f0353f3b0a696a6cabc9485067f262d42554b583640521734498572e5480b5e8d0143d5be47bb92077f3192fefa4d
+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.14.ebuild 1629 BLAKE2B e5552627571a6b161e8fa025d5d8b21d96d8aba6b407efcaef5ccd6a17d656975904e2f927ef1218662a74dc28aa19811f2614298e3c1e653388e830d80db177 SHA512 dfe5123c519a24ae26cecb5d92b7a6a7c73722b78ed73cf66e6ebe45e09260ab119512fa6d2a48371a0830bf60e129321a2ea3b36fb13a67df04391bbe3ab7ea
-EBUILD qtlocation-5.15.16.ebuild 1634 BLAKE2B a059c676b4cf2cafae8d5434097ea3b976f02c744978035bf4e8f356f2b07368dff2b3b81e84d6881f1bd6a9d809b9ce9a7e1a715c309b06b1990d4df9b46bc7 SHA512 97d47b818372660f4c1f45a5ade6f0038bc749ee50a73932aa059204422fe6dc477a107f20a5c70f95340a56c1eca60e8ae37a6dcc3736dd724b1f260a9947db
+EBUILD qtlocation-5.15.16-r1.ebuild 1634 BLAKE2B 284692c84ed6349b7af4491e083af5c8a33e7494e31334a2c40251730886b5b9915489c81441d97da912c14a7fc00a9e98cba237ac8f944b52714b24c8722393 SHA512 298abe34a9ea8cfb28e46f3d23296830de27ae82f2c7bfeddbf27d01546ed64605ac905025c40fbed58f28050cf37df97663fda28334a8fd4fcbde78151f85f9
 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.0.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26
diff --git a/dev-qt/qtlocation/qtlocation-5.15.14.ebuild b/dev-qt/qtlocation/qtlocation-5.15.14.ebuild
deleted file mode 100644
index ddbc8cffd58c..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.15.14.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=4c88f2c0e61daa89f584a8a9a3eba210221c6920
-	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.ebuild b/dev-qt/qtlocation/qtlocation-5.15.16-r1.ebuild
index f1b34d76e226..3a3718d72c58 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.16.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.16-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	MAPBOXGL_COMMIT=4c88f2c0e61daa89f584a8a9a3eba210221c6920
+	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"