From fc6ff4de73d70ead4ce3a005b4f5328f2b23129b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 10 Oct 2023 18:09:58 +0100
Subject: gentoo auto-resync : 10:10:2023 - 18:09:58

---
 dev-python/PyQt6/Manifest                      |  5 +++--
 dev-python/PyQt6/PyQt6-6.5.2-r1.ebuild         |  4 ++++
 dev-python/PyQt6/PyQt6-6.5.2.ebuild            |  4 ++++
 dev-python/PyQt6/files/PyQt6-6.5.2-qt660.patch | 19 +++++++++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 dev-python/PyQt6/files/PyQt6-6.5.2-qt660.patch

(limited to 'dev-python/PyQt6')

diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
index e5855f489b5a..5a0da2699f8a 100644
--- a/dev-python/PyQt6/Manifest
+++ b/dev-python/PyQt6/Manifest
@@ -1,4 +1,5 @@
+AUX PyQt6-6.5.2-qt660.patch 630 BLAKE2B 69972dd9c6c19562cffe4ebc492a4d42335928ddd3d8da385b8c2b0027ac81acba6b506ecd520f60ca25bb1b1a7600b5791615a711b53a1352454a378311dfa9 SHA512 6425c5f9982163440880b0f73f797b0a9d3fcce348fe0b16679f1699b12f4156591201ec6018d87036e3c77973bb9d1510416d4be4689f8a52ed7aae19bed03d
 DIST PyQt6-6.5.2.tar.gz 1037215 BLAKE2B dae331dc27975f3ad4fca10cedf093fecabf819d1fd97b873f9a793ce12168af9a72e2b119a4fc3ecf263e1ba42103f48d5198554248743a6289efc8aa3b7d70 SHA512 11da50ff8b914794e8044e136a3c8a79d16aa63ab33045f2807985c2fe2235c1a7682f7e955c9e8852093c34a671ec09d84afaa9d3d59945461797e81911721f
-EBUILD PyQt6-6.5.2-r1.ebuild 5393 BLAKE2B f89cae4cfbc598096f6f5f82adfa8d6f69b24188b5211aa932907c3866cde61981197ad666a33a1206785f3d5a7372a733f1cdd88994d10dc0d52feda1a82811 SHA512 a0da6c4687b7ffbfd6787bb115d0e6b99ba6b5d573cbd25bcbf0b214bc3f9c493160f497e748fcfe1ee1928d15623017eda4da2505af2c8a7273721d3e5d1e61
-EBUILD PyQt6-6.5.2.ebuild 5307 BLAKE2B 429cdfbabd96d8998b1323eb2e6e473409be84fb94700d93288c80a709a629fb07f33890d72294af669ba640e8fd3b702088f5436e46b02b79f58739e4718f09 SHA512 713a9d265e099b41b3728cd3f38be7ec9d05061859078731264c14453573569d68896f51c81b96693198f143d6cd06c0b129a2f0ed0ebb48126260cb01d350a2
+EBUILD PyQt6-6.5.2-r1.ebuild 5438 BLAKE2B 2025904703ce7a1bb392cee493a70ae9e8bec36dbd4ad0d79214f589638612f3e8ec5fd000b214038e15f47b3eac6fc2cdedd60dff9ebca476d7678fa9e4dd96 SHA512 259fafe747f2669400cf5d135ebe6af811844595a13f0e23557f7a4adcae78feeaf70369e6c842f218880e3bb061d221f9230a582d218507ede329890d297a6e
+EBUILD PyQt6-6.5.2.ebuild 5391 BLAKE2B 523eeb7b1f79ad105f8805c7ffff010136af77d74fd9c96a3b47df7ce571cca36aa0bed5a6cde9a0ece71e5e4fcf8d3966adedd4c16f64f178f1688e97532931 SHA512 d9d8c58e43b30a9eaa32c47309ef7a449b12ddebea7bee9ec81567f7434c0c7b0eaf59e446c285b2a2a62f2ceaf14cb743b12f00d8c8107245e6a43c2a0a138b
 MISC metadata.xml 2391 BLAKE2B 16eecbd105ced07699632a4b294f7da74b59ff931e39afb8a21f67f073bfc90ff613d753a67bcd303ea9f2bf35d7b91c1c7a56ece044c421c4e45b5951f5efe3 SHA512 1d595e07e201891c8c7d5635d39db36ccb65c7333cb27c1cd5384a76029b987959df05795283a4474a41a997bf951e577570b7d3a52a9a2975d563767651efae
diff --git a/dev-python/PyQt6/PyQt6-6.5.2-r1.ebuild b/dev-python/PyQt6/PyQt6-6.5.2-r1.ebuild
index 08010f0076ec..0cf7208d441f 100644
--- a/dev-python/PyQt6/PyQt6-6.5.2-r1.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.5.2-r1.ebuild
@@ -81,6 +81,10 @@ BDEPEND="
 	dbus? ( virtual/pkgconfig )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-qt660.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-python/PyQt6/PyQt6-6.5.2.ebuild b/dev-python/PyQt6/PyQt6-6.5.2.ebuild
index 1cea7b121eaf..e491f92c1c85 100644
--- a/dev-python/PyQt6/PyQt6-6.5.2.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.5.2.ebuild
@@ -73,6 +73,10 @@ RDEPEND="
 	${DEPEND}
 	>=dev-python/PyQt6-sip-13.4[${PYTHON_USEDEP}]
 "
+DEPEND+="
+	bluetooth? ( <dev-qt/qtconnectivity-6.6 )
+	sql? ( <dev-qt/qtbase-6.6 )
+"
 BDEPEND="
 	>=dev-python/PyQt-builder-1.15[${PYTHON_USEDEP}]
 	>=dev-qt/qtbase-${QT_PV}
diff --git a/dev-python/PyQt6/files/PyQt6-6.5.2-qt660.patch b/dev-python/PyQt6/files/PyQt6-6.5.2-qt660.patch
new file mode 100644
index 000000000000..1b5b4e2667eb
--- /dev/null
+++ b/dev-python/PyQt6/files/PyQt6-6.5.2-qt660.patch
@@ -0,0 +1,19 @@
+Bit is removed in Qt6.6, fixes build with USE=sql ahead of next release.
+
+USE=bluetooth is still broken, but is not essential (no revdeps), and
+can instead be masked for the time being.
+--- a/sip/QtCore/QtCoremod.sip
++++ b/sip/QtCore/QtCoremod.sip
+@@ -24,3 +24,3 @@
+ 
+-%Timeline {Qt_6_0_0 Qt_6_1_0 Qt_6_2_0 Qt_6_3_0 Qt_6_4_0 Qt_6_5_0}
++%Timeline {Qt_6_0_0 Qt_6_1_0 Qt_6_2_0 Qt_6_3_0 Qt_6_4_0 Qt_6_5_0 Qt_6_6_0}
+ 
+--- a/sip/QtSql/qsqlresult.sip
++++ b/sip/QtSql/qsqlresult.sip
+@@ -65,3 +65,5 @@
+     int boundValueCount() const;
++%If (- Qt_6_6_0)
+     QList<QVariant> &boundValues() const;
++%End
+     QString executedQuery() const;
-- 
cgit v1.2.3