6 files changed, 179 insertions, 21 deletions
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 5dacbfa1c6d5..2f9ceff368c4 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,5 +1,7 @@
 DIST qtlocation-everywhere-opensource-src-5.15.10.tar.xz 6552240 BLAKE2B 1e44bdafcde01294424cef1963924b85fc4f3cc8ab19b1ae37d79d10cb0bbb1a482f592725fa28e0f039fc84cb2167df4d15e23e4060bd7c49df013c54322665 SHA512 e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4
 DIST qtpositioning-everywhere-src-6.5.2.tar.xz 1456284 BLAKE2B 15ec5202f72ccec5b5cd5e887eacd34718e47e150fd290e8ef3e03e6566b647ca4e2995c87bc54fad598b0225a390eaa93fe7685419006ff39db93fd3803488d SHA512 8319e999de227d6ee999a4e7f84e3a12e2a8b070375fd7b86cef7a7962cce1d4d45f17a846df779561e1cedde80a80240bd2a03259c8a2ed5ebda6e209bdd991
 EBUILD qtpositioning-5.15.10.ebuild 877 BLAKE2B 901e07cc2a16f98840d7361b5db7611406a275116728fe65f28012e03b90f9b797291508623e8ab5a28a10c88d2f8e917145e149ed494355706e12f9b44260d7 SHA512 79aee05d67010aecd2a0d4c802a39bea7f4d63a1a2009ade3df0343e8081c568a374728c818539a23f37e17acd98f47de1cdf825263fb25fcb5bf0988dc13db6
-EBUILD qtpositioning-6.5.2.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148
-MISC metadata.xml 639 BLAKE2B e49b21d1ca752b501e8fd6421e3166f490fd5b304ad04edae73db2634189b63bc3ee321d358ce2ca1b412ec0c1c608327aefc92658b27f28f5ff15b2e41fe31b SHA512 275f24bb9566eace9bb35aea94925088131784b094835fbd4cdfbdc050ec9c411091fa73496de59d28a5d137986a0a6b4ad1cccf06db2e72fb86f31da6b1cc10
+EBUILD qtpositioning-6.5.2-r1.ebuild 1350 BLAKE2B 1ef2f37d2998877ea48cad3309f2105f3853857e6f349e5084560a54dbcf4536d752b66c11cd0c3d82ba6ffefa13c2444958469d9137878607f64baf3ac2bb58 SHA512 8586ec27f68b4307ec81ee902e59120e740a5e0ce7d6a77f003e4a0777a3228550df3ea7bf079da93b520f32da9bb8229d95877b175710494d3be9956a6c485a
+EBUILD qtpositioning-6.5.9999.ebuild 1350 BLAKE2B 1ef2f37d2998877ea48cad3309f2105f3853857e6f349e5084560a54dbcf4536d752b66c11cd0c3d82ba6ffefa13c2444958469d9137878607f64baf3ac2bb58 SHA512 8586ec27f68b4307ec81ee902e59120e740a5e0ce7d6a77f003e4a0777a3228550df3ea7bf079da93b520f32da9bb8229d95877b175710494d3be9956a6c485a
+EBUILD qtpositioning-6.9999.ebuild 1350 BLAKE2B 1ef2f37d2998877ea48cad3309f2105f3853857e6f349e5084560a54dbcf4536d752b66c11cd0c3d82ba6ffefa13c2444958469d9137878607f64baf3ac2bb58 SHA512 8586ec27f68b4307ec81ee902e59120e740a5e0ce7d6a77f003e4a0777a3228550df3ea7bf079da93b520f32da9bb8229d95877b175710494d3be9956a6c485a
+MISC metadata.xml 695 BLAKE2B 13fe75d106b1e2067eaf8113a9f613a3fc575c46c0e92288155d9d799a8337557b8c0e59bc2e77d28e1ab1c358d50d14904d135415ee32f1003901ee18b094ab SHA512 f3310f84aa4fa176bbcde51d8e451a2ad34a502ec9a1f0943381bdfd099b8137df68ba18547320ced87bc68b2ef77307b7b5cf2a10bb42f100adfbd4be871474
diff --git a/dev-qt/qtpositioning/metadata.xml b/dev-qt/qtpositioning/metadata.xml
index f04124b945e5..307f4190be2e 100644
--- a/dev-qt/qtpositioning/metadata.xml
+++ b/dev-qt/qtpositioning/metadata.xml
@@ -12,6 +12,7 @@
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qtpositioning</remote-id>
 	</upstream>
 	<slots>
 		<subslots>
diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.2-r1.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.2-r1.ebuild
new file mode 100644
index 000000000000..1a70305f545f
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-6.5.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Physical position determination library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="geoclue +qml"
+
+DEPEND="
+	~dev-qt/qtbase-${PV}:6[gui,widgets]
+	~dev-qt/qtserialport-${PV}:6
+	geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+RDEPEND="
+	${DEPEND}
+	geoclue? ( app-misc/geoclue:2.0 )
+"
+
+src_prepare() {
+	qt6-build_src_prepare
+
+	# would use $(cmake_use_find_package geoclue Qt6DBus) but doing
+	# this side-disables gui+qml if do have qtbase[dbus]
+	use geoclue ||
+		sed -e 's/TARGET Qt::DBus/FALSE/' \
+			-i src/plugins/position/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*DummyPlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*TestPlugin*.cmake
+			"${D}${QT6_PLUGINDIR}"/position/libqtposition_satellitesourcetest.so
+			"${D}${QT6_PLUGINDIR}"/position/libqtposition_testplugin{,2}.so
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -f -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild
deleted file mode 100644
index 60873b452acc..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Physical position determination library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[dbus,gui,widgets]
-	=dev-qt/qtdeclarative-${PV}*
-	=dev-qt/qtserialport-${PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild
new file mode 100644
index 000000000000..1a70305f545f
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Physical position determination library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="geoclue +qml"
+
+DEPEND="
+	~dev-qt/qtbase-${PV}:6[gui,widgets]
+	~dev-qt/qtserialport-${PV}:6
+	geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+RDEPEND="
+	${DEPEND}
+	geoclue? ( app-misc/geoclue:2.0 )
+"
+
+src_prepare() {
+	qt6-build_src_prepare
+
+	# would use $(cmake_use_find_package geoclue Qt6DBus) but doing
+	# this side-disables gui+qml if do have qtbase[dbus]
+	use geoclue ||
+		sed -e 's/TARGET Qt::DBus/FALSE/' \
+			-i src/plugins/position/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*DummyPlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*TestPlugin*.cmake
+			"${D}${QT6_PLUGINDIR}"/position/libqtposition_satellitesourcetest.so
+			"${D}${QT6_PLUGINDIR}"/position/libqtposition_testplugin{,2}.so
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -f -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild
new file mode 100644
index 000000000000..1a70305f545f
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Physical position determination library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="geoclue +qml"
+
+DEPEND="
+	~dev-qt/qtbase-${PV}:6[gui,widgets]
+	~dev-qt/qtserialport-${PV}:6
+	geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+"
+RDEPEND="
+	${DEPEND}
+	geoclue? ( app-misc/geoclue:2.0 )
+"
+
+src_prepare() {
+	qt6-build_src_prepare
+
+	# would use $(cmake_use_find_package geoclue Qt6DBus) but doing
+	# this side-disables gui+qml if do have qtbase[dbus]
+	use geoclue ||
+		sed -e 's/TARGET Qt::DBus/FALSE/' \
+			-i src/plugins/position/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*DummyPlugin*.cmake
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*TestPlugin*.cmake
+			"${D}${QT6_PLUGINDIR}"/position/libqtposition_satellitesourcetest.so
+			"${D}${QT6_PLUGINDIR}"/position/libqtposition_testplugin{,2}.so
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -f -- "${delete[@]}" || die
+	fi
+}