gentoo auto-resync : 10:10:2023 - 18:09:58

7 files changed, 32 insertions, 4 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f94c1c4364a3..a32c5d345f69 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
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;
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 8ccaf12f0049..2909f7507e2c 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,5 +1,5 @@
 DIST sip-6.7.10.tar.gz 1165087 BLAKE2B 945027e741033a9d85dd9716586324d50380a1cbb4bcbe0df5e2db08697f6e088fb6778d93488c3d07947df3b57442af7a2225500efec0b274a8a9bfa177ecc8 SHA512 56f18fe6599dc74a90c07c58a7f1c23511c7f3661a3ec507d70fd2d32e636713ecd3cf1c960a3687261175c9a42df9de099e28cd1e6c0067ed755b97fc753e96
 DIST sip-6.7.11.tar.gz 1165368 BLAKE2B 62ba38ca39544e7ed0935e91729ba6f82a5e613a4b26fbf27c3708a5cb38ba0fa583ceb6a45c0c7485579f4c318fc5ac910eee8477aee6d25d33d4ae07bf527b SHA512 a9247714fd6f6e6dffff2e6b53b35a7831ced55f0706e7c883d6700f22b814dc2cf1e56e681214759c90386ff2c77cb4ace6d07cd0c8b6da0ed65444f9857056
 EBUILD sip-6.7.10.ebuild 790 BLAKE2B 27e9f2be3e97ed1fafc24d1ef1144ab6718003c8c564d8538ad2ce80f344d320aec765863b37f68b7e4a33e20545b1f6853f5130e16cc3188a321a9e9fe8f6e3 SHA512 dcfb2797a857c60ce46c051f24a7abd19a49fd4085a7fe68696213a43f7c560b283d1324348cbb843fc741f03d1bef4274b2192fbc55fdae0695c155de0607fc
-EBUILD sip-6.7.11.ebuild 744 BLAKE2B d3ac72470a780082d781b30d3f700f17f44c5bdca10cd1278c59fa2b9fea8e3affe20c2aed183539dae41fbf769733079f0f99eb86da7f6808d1c5f841e39e31 SHA512 a213170e1c4bf4f09a30d48048dd20330e3706d9ae0ad551fdbd434c7a7206700bcd4e27de6f690f5798de7da81656df04cb39b161a6c133b9e936453b3876e6
+EBUILD sip-6.7.11.ebuild 743 BLAKE2B 7346f0b9fe8e9c5263c55bca1e9a0d749a9c0b13ca7d5f9d88bb16e2bb91a2e3e60de2a606ae54b675a7d948fe10290b4ca84ce65899d72b571d2659c6c9f183 SHA512 f5be0d7eb69e68034196c3d71a5d33198929eccd29c66e4f035136df0fde2dade424915a9df9af25db3663b276f28035c9b65655f2424dc64eebcdc94bccb504
 MISC metadata.xml 639 BLAKE2B deb4a3e534eaa966db932dc17bf7df6a04ed41ce707dc7f1befb272c362be06f222f976c4b0d526a6190d4954f1fa0e2c94ccc2e6cfceff6e8db5959e653fed1 SHA512 8c8e45d32587e346d4df067950aacbc767618418d42f4a5bf48a62706c9612007915ec643dc9fe7b7d083696b26795abb76d9cc475481c26782874f5116863a1
diff --git a/dev-python/sip/sip-6.7.11.ebuild b/dev-python/sip/sip-6.7.11.ebuild
index 2799d5876f38..db0583eb3b83 100644
--- a/dev-python/sip/sip-6.7.11.ebuild
+++ b/dev-python/sip/sip-6.7.11.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]