gentoo auto-resync : 05:06:2024 - 00:07:52

4 files changed, 105 insertions, 7 deletions

diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest
index 1bbe590914a1..cdf1526193a6 100644
--- a/dev-qt/qtconnectivity/Manifest
+++ b/dev-qt/qtconnectivity/Manifest
@@ -3,5 +3,6 @@ DIST qtconnectivity-everywhere-src-6.7.1.tar.xz 1061900 BLAKE2B 30cb15ba6a0e08fc
 EBUILD qtconnectivity-6.7.0.ebuild 1681 BLAKE2B 8e929edba51a2533cf46bef8d06a61ccbc6be3d064b90e61838bcccfc4696f4b71278cfcd9edb2b826b8937dd59c7741b2c6d5d300bb6dd34f13b3701a7598ea SHA512 193158675dad56afaf708c19645a38abde0fb4aaf2e3d27980245c083848832db1477c41ec6c72f80cec3d717aacb0ec9c2d075eb77b52f9d76644c52237e01d
 EBUILD qtconnectivity-6.7.1.ebuild 1680 BLAKE2B 60fc15ab6e1e245aa56eb308f3fa4cdf26c124803012193b8ba282862197d8717d63424db0d58c495cfb36038f10dd9533e3bc7b7c68f8ae2c6d70f221aebcdd SHA512 e63091ab3e244bb2f3ded940dab1e60e937af40eb586881f847970c9ea1d4b8ae1d42bf5a374eccbc04dfb02fe8d51cd8703353901d795caff69b0216808a3d1
 EBUILD qtconnectivity-6.7.9999.ebuild 1683 BLAKE2B c94145ac24b7545954637500dccde31df3584699c47893efd00866c3d255460a4021c881b68dd448f4156ff9f0ff54eef8461a9ab478bbed9ee875c848148a11 SHA512 bbcba9e6c26ec4afc5a839e436779d95fb7d19bdc300858047240dceb7c5b253295d3f2193b581c87c1c878a409e2c34276458928990cb45b167bbe89f6a26d3
-EBUILD qtconnectivity-6.9999.ebuild 1683 BLAKE2B c94145ac24b7545954637500dccde31df3584699c47893efd00866c3d255460a4021c881b68dd448f4156ff9f0ff54eef8461a9ab478bbed9ee875c848148a11 SHA512 bbcba9e6c26ec4afc5a839e436779d95fb7d19bdc300858047240dceb7c5b253295d3f2193b581c87c1c878a409e2c34276458928990cb45b167bbe89f6a26d3
-MISC metadata.xml 637 BLAKE2B 5e9bcc7a56c93b58d09022effcbef407532e6248bda88bd0eb6a2d1c0094b9715b867025e464870bf9c6ee644c020538d8210ae742fcb55be1b795f50bfadbce SHA512 f9a9ebe77ba29217437d2afa9b05a13d421683feef94f1c64d861d9a1e081ed2ab1716453ddd66a0b93c6fecccfd11642ab69f297efbfe23baf3ad8f232197d5
+EBUILD qtconnectivity-6.8.9999.ebuild 1844 BLAKE2B a2e7f9713d7e5edf327385ee4d6ce39189b605be63e721316b7f9697d3a36d080cfa4f8752f9995e48e3a42d1094a963fd20eb01c8ce2e98d7ce2315324fa69e SHA512 b6f7c31b694fb462fc9e5090985afc81a81a65a42f038b827c4329f77cb1d6708168abb4eeeb3005fcd358eb7c65df989bda17835934d2aa1c8901344ad30d2a
+EBUILD qtconnectivity-6.9999.ebuild 1844 BLAKE2B a2e7f9713d7e5edf327385ee4d6ce39189b605be63e721316b7f9697d3a36d080cfa4f8752f9995e48e3a42d1094a963fd20eb01c8ce2e98d7ce2315324fa69e SHA512 b6f7c31b694fb462fc9e5090985afc81a81a65a42f038b827c4329f77cb1d6708168abb4eeeb3005fcd358eb7c65df989bda17835934d2aa1c8901344ad30d2a
+MISC metadata.xml 721 BLAKE2B 4c2d1448a532b27910627b3fa1b8912b9048434058ee6f7b14276913ad5d77e55a6f2200002953863aa76ef5d66c04126995e0746cfaf208fa6dbd6e9b622ce1 SHA512 17808c1ab2c7a8e36f6f20801ac288abfd3b390d67ae55212d0d6b890aa7bb49ad8c7d3899cade2d8515faee76a5e02b3cfc582e3f5dde744371592e6d8dfb67
diff --git a/dev-qt/qtconnectivity/metadata.xml b/dev-qt/qtconnectivity/metadata.xml
index 84c08090ba58..052592031909 100644
--- a/dev-qt/qtconnectivity/metadata.xml
+++ b/dev-qt/qtconnectivity/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
+		<flag name="neard">Use <pkg>net-wireless/neard</pkg> to access NFC devices</flag>
 		<flag name="nfc">Enable support for the Near Field Communication protocol</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild
new file mode 100644
index 000000000000..45b30ae3f8c0
--- /dev/null
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+IUSE="+bluetooth neard nfc smartcard"
+REQUIRED_USE="
+	|| ( bluetooth nfc )
+	nfc? ( ?? ( neard smartcard ) )
+"
+
+DEPEND="
+	~dev-qt/qtbase-${PV}:6[network]
+	bluetooth? (
+		~dev-qt/qtbase-${PV}:6[dbus]
+		net-wireless/bluez:=
+	)
+	nfc? (
+		neard? ( ~dev-qt/qtbase-${PV}:6[dbus] )
+		smartcard? ( sys-apps/pcsc-lite )
+	)
+"
+RDEPEND="
+	${DEPEND}
+	nfc? (
+		neard? ( net-wireless/neard )
+	)
+"
+
+CMAKE_SKIP_TESTS=(
+	# most hardware tests are auto-skipped, but some still misbehave
+	# if bluez/hardware is available (generally tests here may not be
+	# very relevant without hardware, lists may need to be extended)
+	tst_qbluetoothlocaldevice
+	tst_qbluetoothserver
+	tst_qbluetoothservicediscoveryagent
+	tst_qbluetoothserviceinfo
+	tst_qlowenergycontroller
+)
+
+src_prepare() {
+	qt6-build_src_prepare
+
+	use bluetooth ||
+		sed -i '/add_subdirectory(bluetooth)/d' src/CMakeLists.txt || die
+	use nfc ||
+		sed -i '/add_subdirectory(nfc)/d' src/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(usev nfc "
+			$(qt_feature neard)
+			$(qt_feature smartcard pcsclite)
+		")
+	)
+
+	qt6-build_src_configure
+}
+
+src_install() {
+	qt6-build_src_install
+
+	# broken (unnecessary) symlink due to add_app() being used over add_tool()
+	use !bluetooth || rm -- "${ED}"/usr/bin/sdpscanner6 || die
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_BINDIR}"/bluetoothtestdevice
+			"${D}${QT6_BINDIR}"/bttestui
+			"${D}${QT6_BINDIR}"/qlecontroller-server
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -f -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
index de07cbfd1ffe..45b30ae3f8c0 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
@@ -11,20 +11,29 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
-IUSE="+bluetooth nfc smartcard"
-REQUIRED_USE="|| ( bluetooth nfc )"
+IUSE="+bluetooth neard nfc smartcard"
+REQUIRED_USE="
+	|| ( bluetooth nfc )
+	nfc? ( ?? ( neard smartcard ) )
+"
 
-RDEPEND="
+DEPEND="
 	~dev-qt/qtbase-${PV}:6[network]
 	bluetooth? (
 		~dev-qt/qtbase-${PV}:6[dbus]
 		net-wireless/bluez:=
 	)
 	nfc? (
+		neard? ( ~dev-qt/qtbase-${PV}:6[dbus] )
 		smartcard? ( sys-apps/pcsc-lite )
 	)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="
+	${DEPEND}
+	nfc? (
+		neard? ( net-wireless/neard )
+	)
+"
 
 CMAKE_SKIP_TESTS=(
 	# most hardware tests are auto-skipped, but some still misbehave
@@ -48,7 +57,10 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(usev nfc $(qt_feature smartcard pcsclite))
+		$(usev nfc "
+			$(qt_feature neard)
+			$(qt_feature smartcard pcsclite)
+		")
 	)
 
 	qt6-build_src_configure