gentoo auto-resync : 22:03:2024 - 13:00:51

3 files changed, 76 insertions, 2 deletions

diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest
index 92380906c074..d03c75166abb 100644
--- a/dev-qt/qtconnectivity/Manifest
+++ b/dev-qt/qtconnectivity/Manifest
@@ -1,8 +1,10 @@
 DIST qtconnectivity-everywhere-src-6.6.2.tar.xz 1060936 BLAKE2B 561f487a55c1352a67a3a5b2166ce4d62403f3adfdfbe7f6fee27c23b23e3ed6f0917daa212ffdc023ff521328421d6af7afe3d2353a1d835fba2bf3c10444b3 SHA512 aa66652cb8bd9f44cec616922f76b02c8dccdaea2bc8d24be8b8a4b6b76f08925a5088a2559eca3042e6aa77c67c722ec90910d2e2a092705c6f74ca413e4c5a
 DIST qtconnectivity-everywhere-src-6.7.0-rc.tar.xz 1061300 BLAKE2B 6d7d6132619aa13f1d9bde57f35a6a310113ad04a44fd4d51c778ba56a40f12fe74006efbd45269afcb6b8f5e8a1e0495574efc651d80f5ce06652ee04cb97b6 SHA512 0e9bd553f4626d253017a350519a8d63d998c62a1ef82c3616dd67c8e4158adf3bbeb591794d33ae45bce8cb6749a492fee928260ef400416d8a7e5a3d57edfa
-EBUILD qtconnectivity-6.6.2.ebuild 1665 BLAKE2B 8dbba409e79890fea148e57cecf452e1127a7d9cbe9d777b9431803c41550c9e2634438f5222b7b65e3bbd7f6af56a76a0e1e5e6ed092ed2be41e193a19407f8 SHA512 59cb86d050afcd0139f5fe6c940888ae1a3f1725d8a76af6a2bd978fcbdc997c2f3015d1a1637086f6bdfa80e59c922869f07f378e572162580a26bc054554b3
+DIST qtconnectivity-everywhere-src-6.7.0-rc2.tar.xz 1061232 BLAKE2B 33489b5d433d7aacb7a4936dc5771b3d36db4b4856b65cce53fe510d08541fd10c0f70da128cb428137b39aaaf1425828835ba9f15366f84501f237dc702c23a SHA512 d36b52cb6dfcffadd5f306cc78ca2c5056280710396fc693a59f8b4a853e13fcbb1b08596a30c62a62a6eed4b877f2a0292a1e47cf7c02b79e858ceb71de484e
+EBUILD qtconnectivity-6.6.2.ebuild 1664 BLAKE2B 5fac739b5e156cee0e4789b3178f1663a3862a34c9db7be9c8a69ea1fa6d8a17d6436720bba1873adf91b64618412bb9e148250abaa0b9e3efa340c2c160b308 SHA512 69f56d6914a0b604ae8e6f893d20ff70d66849252d98c8bf8ce0e844f617cf24009e890d33f3582e339448bcf01ecab00ec9dc1f1774997020d1d1323ec3d715
 EBUILD qtconnectivity-6.6.9999.ebuild 1666 BLAKE2B 5c2c31dafb2a1fcd93143486fcfb957fff941bbead38ebb5e4500220257b3d51795a076e7511a08e4256fcd51756041afd4f4164fc2b1d31fa2d5336b362c557 SHA512 6071e64cd2149e2007618a565920589a6c3f1bc11fe8ecda179bde7afe84680cd22ab39253cabd87a61e7720f8e7b9f20332b07dec366360ca1e2d9ce8ed08b3
 EBUILD qtconnectivity-6.7.0_rc.ebuild 1666 BLAKE2B 5c2c31dafb2a1fcd93143486fcfb957fff941bbead38ebb5e4500220257b3d51795a076e7511a08e4256fcd51756041afd4f4164fc2b1d31fa2d5336b362c557 SHA512 6071e64cd2149e2007618a565920589a6c3f1bc11fe8ecda179bde7afe84680cd22ab39253cabd87a61e7720f8e7b9f20332b07dec366360ca1e2d9ce8ed08b3
+EBUILD qtconnectivity-6.7.0_rc2.ebuild 1666 BLAKE2B 5c2c31dafb2a1fcd93143486fcfb957fff941bbead38ebb5e4500220257b3d51795a076e7511a08e4256fcd51756041afd4f4164fc2b1d31fa2d5336b362c557 SHA512 6071e64cd2149e2007618a565920589a6c3f1bc11fe8ecda179bde7afe84680cd22ab39253cabd87a61e7720f8e7b9f20332b07dec366360ca1e2d9ce8ed08b3
 EBUILD qtconnectivity-6.7.9999.ebuild 1666 BLAKE2B 5c2c31dafb2a1fcd93143486fcfb957fff941bbead38ebb5e4500220257b3d51795a076e7511a08e4256fcd51756041afd4f4164fc2b1d31fa2d5336b362c557 SHA512 6071e64cd2149e2007618a565920589a6c3f1bc11fe8ecda179bde7afe84680cd22ab39253cabd87a61e7720f8e7b9f20332b07dec366360ca1e2d9ce8ed08b3
 EBUILD qtconnectivity-6.9999.ebuild 1666 BLAKE2B 5c2c31dafb2a1fcd93143486fcfb957fff941bbead38ebb5e4500220257b3d51795a076e7511a08e4256fcd51756041afd4f4164fc2b1d31fa2d5336b362c557 SHA512 6071e64cd2149e2007618a565920589a6c3f1bc11fe8ecda179bde7afe84680cd22ab39253cabd87a61e7720f8e7b9f20332b07dec366360ca1e2d9ce8ed08b3
 MISC metadata.xml 637 BLAKE2B 5e9bcc7a56c93b58d09022effcbef407532e6248bda88bd0eb6a2d1c0094b9715b867025e464870bf9c6ee644c020538d8210ae742fcb55be1b795f50bfadbce SHA512 f9a9ebe77ba29217437d2afa9b05a13d421683feef94f1c64d861d9a1e081ed2ab1716453ddd66a0b93c6fecccfd11642ab69f297efbfe23baf3ad8f232197d5
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.6.2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.6.2.ebuild
index 006963f85458..25fa20e4c595 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.6.2.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.6.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm64 ~loong"
+	KEYWORDS="amd64 arm64 ~loong"
 fi
 
 IUSE="+bluetooth nfc smartcard"
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.0_rc2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.0_rc2.ebuild
new file mode 100644
index 000000000000..ee563938e4e6
--- /dev/null
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.0_rc2.ebuild
@@ -0,0 +1,72 @@
+# 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 ~arm64 ~loong"
+fi
+
+IUSE="+bluetooth nfc smartcard"
+REQUIRED_USE="|| ( bluetooth nfc )"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network]
+	bluetooth? (
+		~dev-qt/qtbase-${PV}:6[dbus]
+		net-wireless/bluez:=
+	)
+	nfc? (
+		smartcard? ( sys-apps/pcsc-lite )
+	)
+"
+DEPEND="${RDEPEND}"
+
+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 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
+}