gentoo auto-resync : 09:06:2024 - 00:08:13

3 files changed, 2 insertions, 76 deletions

diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest
index cdf1526193a6..f99a2fcc292c 100644
--- a/dev-qt/qtconnectivity/Manifest
+++ b/dev-qt/qtconnectivity/Manifest
@@ -1,7 +1,5 @@
-DIST qtconnectivity-everywhere-src-6.7.0.tar.xz 1060904 BLAKE2B 83669930846e57495c193b467c8a004eb2a61017934b5f1c8ecb39de24f538b40671dc06ec558e0809e131f008abc16826a246abbe5acee59ebaf69849070652 SHA512 bbdb6798a9cca5ec523d0f06aa3e1ea0024e4c7bd5cba765ad87b7b2f40ec59bd2a557bb45224bb3490c818292ccf04283f7c5d47723d95d83f2edf85c214b78
 DIST qtconnectivity-everywhere-src-6.7.1.tar.xz 1061900 BLAKE2B 30cb15ba6a0e08fccfd0f3ce9a9ec36a0902e3fa15bdd0791e166371c6baa31438c141c7bf5c57de0287eeee04bae87aaaf4800eeaa3062ab23d541e577cce3a SHA512 28496a2a7338f71bb51fbd8fa1b23e4e2e14e6fefc6249ce0eeae8d19b7740a70eed1c312c5d5a79344330001592acd4048c134382cdc168cf4d30e9760dbdc2
-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.1.ebuild 1679 BLAKE2B cf04fdab826b2b9cbb851d76b320c54b4196ea52a60e396d2ccdd91d84db355a5be0e922bc870c92c2ef0221b635020cdbd221f2d75bdfe946c37a39f1442898 SHA512 cbde1a1f1ea6d509e5a1f6bba2e08943e320832a97fad5b01380f89a883532d7dd32cc7eba8afb79c417cd40b34e50df7f3b71ca21813d59d61aa36e5afc6698
 EBUILD qtconnectivity-6.7.9999.ebuild 1683 BLAKE2B c94145ac24b7545954637500dccde31df3584699c47893efd00866c3d255460a4021c881b68dd448f4156ff9f0ff54eef8461a9ab478bbed9ee875c848148a11 SHA512 bbcba9e6c26ec4afc5a839e436779d95fb7d19bdc300858047240dceb7c5b253295d3f2193b581c87c1c878a409e2c34276458928990cb45b167bbe89f6a26d3
 EBUILD qtconnectivity-6.8.9999.ebuild 1844 BLAKE2B a2e7f9713d7e5edf327385ee4d6ce39189b605be63e721316b7f9697d3a36d080cfa4f8752f9995e48e3a42d1094a963fd20eb01c8ce2e98d7ce2315324fa69e SHA512 b6f7c31b694fb462fc9e5090985afc81a81a65a42f038b827c4329f77cb1d6708168abb4eeeb3005fcd358eb7c65df989bda17835934d2aa1c8901344ad30d2a
 EBUILD qtconnectivity-6.9999.ebuild 1844 BLAKE2B a2e7f9713d7e5edf327385ee4d6ce39189b605be63e721316b7f9697d3a36d080cfa4f8752f9995e48e3a42d1094a963fd20eb01c8ce2e98d7ce2315324fa69e SHA512 b6f7c31b694fb462fc9e5090985afc81a81a65a42f038b827c4329f77cb1d6708168abb4eeeb3005fcd358eb7c65df989bda17835934d2aa1c8901344ad30d2a
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.0.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.0.ebuild
deleted file mode 100644
index 02d652404d9a..000000000000
--- a/dev-qt/qtconnectivity/qtconnectivity-6.7.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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 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
-}
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild
index b41fdcce407a..47ec23329c20 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.1.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 arm ~arm64 ~loong ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~riscv x86"
 fi
 
 IUSE="+bluetooth nfc smartcard"