gentoo auto-resync : 05:09:2023 - 16:23:54

7 files changed, 167 insertions, 22 deletions

diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 6f7c6026d554..b75e941cdfc7 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,10 @@
+AUX qtlocation-6.5.2-missing-memory.patch 607 BLAKE2B d097d0d39f32cf3ebd616fed9ed7772a5f68a786b95b2c66068aad395faa8746e4d7784826badd77ade8e2b47810779b956e16eb07b88a9b50556a0d90753ef2 SHA512 7018315e77fd478bb82aae0ead7019ae4fffe1063850436c8c9025529b2feb52042bfe917e2d31a914e7e6e7c9adad15ccdcac1f4a6d54bcfb9e9467a0c4f6a2
 DIST qtlocation-5.15.10-gentoo-kde-1.tar.xz 3664 BLAKE2B e2d694772a43ca4bc27c819d8fadf5bab3ddb40644d5a08315faa5af63a7aace6475c2dd2b6d612dcb7705113211cd50e6e83ce79773ec6033767be0fb761346 SHA512 c3917fa4db6316c9e173c475d8606b7fd9dc3cfed29487fa23c9b6df68887d799e6260abc3f5cd144e9d8c1e95e66b0de429bf59f15526639aab4d430c3d439a
 DIST qtlocation-everywhere-opensource-src-5.15.10.tar.xz 6552240 BLAKE2B 1e44bdafcde01294424cef1963924b85fc4f3cc8ab19b1ae37d79d10cb0bbb1a482f592725fa28e0f039fc84cb2167df4d15e23e4060bd7c49df013c54322665 SHA512 e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4
 DIST qtlocation-everywhere-src-6.5.2.tar.xz 3032488 BLAKE2B c8cd34980b0f78326fb70bf76a04094cf3e27afbd6aed6d982ce30abfa9dc4250d164dbe11c1027bedcdeee3b7c907c3716e88f16eeae173b846ccdf2c38d458 SHA512 b1e5c1813deb8a4eb9f8548afa935f1a2145ed3168f0276493ea501057fd4f70b8980ae387248a59e50f0e450ae245a04cd8636fb61d37af9c3634ff1cdd24f3
 DIST qtlocation-mapboxgl-5.15.10-5a07e196.tar.gz 3726230 BLAKE2B 9dbe08088a55bc1da4952a628af987b3b056615e883983d3a5e2eb392ce4aff16bfd753f84bbad07f9a415fbd275ec9933a64b6bcfd27ea6d8adced6d2adcac7 SHA512 ec3de81f643388690eda45d073a9c6f908d8efeff30cd062d9afcd1f94c6b45b301327747928d45b4047ce04b7df5b0afaf9e8942e22660711a5ac49787829eb
 EBUILD qtlocation-5.15.10.ebuild 1544 BLAKE2B 2943df2242ee45db0180334464d327614bcfb6ad93cd8117e4f6c81c3ef2384199dc547743f5784a0b88e976ea5296a833fbad986eb30eb947d6004283b69dd3 SHA512 453d7c2b6ab694e98c1ec9d08af70994910e8537f75d02aca8117b9887b3e7d98ac27f391b76327668a57d5a0186ebffb4b13f727d87feaaac4f0a0e1d5a2acd
-EBUILD qtlocation-6.5.2.ebuild 433 BLAKE2B b70a66d0ad3fd02696537c32677077786d0f528a7676af4a3e68afca659c64436b398f046d2a88ab513bb1ef4eecde08beb26a6f2cd3a5063f72b0f8fda26489 SHA512 f742f4ee5f73d0a5fcde8bf993c7e09495f852b0b62f2f5fa0925df31a69088c2712518542a06374373a5c3e91098c5f44ec2d0585354effddd44d736a81cdea
-MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
+EBUILD qtlocation-6.5.2-r1.ebuild 1468 BLAKE2B ed0d13151b41de0a0f86fca85dabf14b4893a939d4e6cde9ce4de4c844aef9e54e4ff2119566d48d2ce2ca1a307b6171592a658f7446ecd23d5de12aefe721c2 SHA512 e5a83f5e17b9db8ebc5dd92ab2024be8b96f0d2edc6994c58c9d260fc0c59dafb9852db3c402e6b47022587d2807c39292d84ec2b58bdda4fca8577f948ac74b
+EBUILD qtlocation-6.5.9999.ebuild 1411 BLAKE2B 843b87346b18a733fe8835e57990aef80aa48b762f7a1c0bad5ce65aad08932bdd8d92f8833953fcb2526342fea2403ed46a0fdaa52951083b5bf38cdf56cf79 SHA512 8a388a2303a712230d293ece7b6d23d7b0b31aa3776b28011327bc3400d80edfe88f66af4acb3c1079adc1e040778c5e5c8bb4c797e03f2461e9c4cbf9467947
+EBUILD qtlocation-6.9999.ebuild 1411 BLAKE2B 843b87346b18a733fe8835e57990aef80aa48b762f7a1c0bad5ce65aad08932bdd8d92f8833953fcb2526342fea2403ed46a0fdaa52951083b5bf38cdf56cf79 SHA512 8a388a2303a712230d293ece7b6d23d7b0b31aa3776b28011327bc3400d80edfe88f66af4acb3c1079adc1e040778c5e5c8bb4c797e03f2461e9c4cbf9467947
+MISC metadata.xml 535 BLAKE2B 061ed9abebe579a38a262451a5e72d112adbcf4693078042f3b55be8d16b7bd430198edb732cd127deccf8c67d444b9951dd7ac8e2d0fef7de02913a3a8ba644 SHA512 823b03655b8bbb923d38d4f8358898beb2e2fa34d36e2d8d843e164027d58eb044a3e661b8dfc12cda123f15fd07d0987874b81543c47e46c670c25fa35dde87
diff --git a/dev-qt/qtlocation/files/qtlocation-6.5.2-missing-memory.patch b/dev-qt/qtlocation/files/qtlocation-6.5.2-missing-memory.patch
new file mode 100644
index 000000000000..e57681c7ba97
--- /dev/null
+++ b/dev-qt/qtlocation/files/qtlocation-6.5.2-missing-memory.patch
@@ -0,0 +1,22 @@
+Manifests itself as an issue only with clang+glibc
+(gcc+glibc, or clang+musl are fine).
+
+https://github.com/qt/qtlocation/commit/3a1b28126a0a182bef9fe0ccb85409fceb39d1f3
+From: Tim Blechmann <tim@klingt.org>
+Date: Thu, 20 Jul 2023 17:04:39 +0800
+Subject: [PATCH] location: include missing header
+
+std::unique_ptr requires <memory>
+
+Pick-to: 6.5 6.6
+--- a/src/location/maps/qgeocameratiles_p.h
++++ b/src/location/maps/qgeocameratiles_p.h
+@@ -17,6 +17,8 @@
+ #include <QtLocation/private/qlocationglobal_p.h>
+ #include <QtCore/QScopedPointer>
+ 
++#include <memory>
++
+ QT_BEGIN_NAMESPACE
+ 
+ class QGeoCameraData;
diff --git a/dev-qt/qtlocation/metadata.xml b/dev-qt/qtlocation/metadata.xml
index ae8aa9597f20..4e925ad20fd6 100644
--- a/dev-qt/qtlocation/metadata.xml
+++ b/dev-qt/qtlocation/metadata.xml
@@ -8,6 +8,7 @@
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qtlocation</remote-id>
 	</upstream>
 	<slots>
 		<subslots>
diff --git a/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild b/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild
new file mode 100644
index 000000000000..227c0e646e5b
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network]
+	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtpositioning-${PV}:6[qml(+)]
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# ignores QML_IMPORT_PATH (unlike other tests) and looks in
+	# the missing builddir/qml, skip rather than work around
+	tst_declarative_ui
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-memory.patch
+)
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so
+			"${D}${QT6_QMLDIR}"/QtLocation/Test
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -rf -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtlocation/qtlocation-6.5.2.ebuild b/dev-qt/qtlocation/qtlocation-6.5.2.ebuild
deleted file mode 100644
index 0862902e101f..000000000000
--- a/dev-qt/qtlocation/qtlocation-6.5.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[network]
-	=dev-qt/qtdeclarative-${PV}*
-	=dev-qt/qtpositioning-${PV}*
-	=dev-qt/qtshadertools-${PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild
new file mode 100644
index 000000000000..1183318657ba
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network]
+	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtpositioning-${PV}:6[qml]
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# ignores QML_IMPORT_PATH (unlike other tests) and looks in
+	# the missing builddir/qml, skip rather than work around
+	tst_declarative_ui
+)
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so
+			"${D}${QT6_QMLDIR}"/QtLocation/Test
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -rf -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtlocation/qtlocation-6.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.9999.ebuild
new file mode 100644
index 000000000000..1183318657ba
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-6.9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network]
+	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtpositioning-${PV}:6[qml]
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# ignores QML_IMPORT_PATH (unlike other tests) and looks in
+	# the missing builddir/qml, skip rather than work around
+	tst_declarative_ui
+)
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so
+			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so
+			"${D}${QT6_QMLDIR}"/QtLocation/Test
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -rf -- "${delete[@]}" || die
+	fi
+}