gentoo auto-resync : 21:01:2025 - 06:42:16

8 files changed, 31 insertions, 5 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index ddc1bec02e72..a42ba3ab15fc 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 2240d3d2dec4..dfee88f55100 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -3,9 +3,10 @@ AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f
 AUX qtbase-6.6.1-forkfd-childstack-size.patch 1003 BLAKE2B abc1bc5633032fc55fca91ef3dcc33617b11694d7a9d97e5eac21c0b4aae900082b7158da08b8514a3424364a3c35cb49d46fa11a0739aadbb73766b7fee949a SHA512 9e1dfb3452858131db286cb30915871e46178bb0891b604a257745fad133676cdf0df5273b6f681c49b1c3d3245f2c6e0a5025ce19efe6a0ed8bf5a1b3a5a5f0
 AUX qtbase-6.6.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f7524e0df00e13912e2e28d5c204d1a3e2bc351b9cdc212b9169e4d84e2884df76d9722a73f29734c18fe50cc8e6583e41a5cc2 SHA512 1effa903d5d3c65ffc6af5fb2f9896346b4b90cd1f8a54f0a697f23f1c118dd1803b5f4fa9b4959cf4ba1c433d36ca21a6abe6cb3bfae84a811297566388e907
 AUX qtbase-6.8.0-qcontiguouscache.patch 526 BLAKE2B b701f92d8365e8408a2ff79c812c397ac0042aa6b6316cf167a7877d48044ffaa0d2683fa27ffcbe80c8e74f8ff0c8af220b927889e83340c6b5325b1fbf16ab SHA512 19f33f2dd856c8328b9175458250929f3da34cde179d5f52ec1982e5e5f1772412f2541e146763a6258ce3377e0b624f07926fe4af56de7364c34835151b8995
+AUX qtbase-6.8.2-pyqt6.patch 780 BLAKE2B 50e8400961d2d48be53d2c892bb751ee568c0c3969339787219c5ffc49bd9740328c99cf2a98e50462e2d354964309ce05a36e5f6deaef43128306366dc8658e SHA512 a3e29ec324e4762ad54de8e60258ed3dc5c167562d1f9cbb7a1e61535cc823587d44c7d51fe438bcf021b370ab918a57ef2a822a63f17b5fecc0564632f276de
 DIST qtbase-everywhere-src-6.8.1.tar.xz 48220752 BLAKE2B b42d562f9069cf3d68807c63492f0ae1dcb9cb9a057a8d8548a7d134b36af169e403324e2902fa59c6c82ce087add107173c7606dff952dbbbc06c33b056ddff SHA512 87b7df95a63f7c28bfc7659f19658e4151b9da55b0dc4d34dc0e04c5270254b01a72f8deac0b2fc5543fce8d7542128addb398833de9c3248196aa96b2dd1601
 EBUILD qtbase-6.8.1.ebuild 10455 BLAKE2B 47d0e9fda4aa3a2347b6feeddccc820f528849cd32ec707175cd243a5c390b99fa78bccd23054ad5f14e15ab1ba457f9ac1af6ae3bf0477f646a179aa6692f42 SHA512 d9a21714af5063b3b2c76eb2606ea6d597cfdabc9c3ab3edb36df547d55ce15d38e605c8b54cc9da257237b209b72c6c06c3eac0477bc95dfcb2756f6ebbad87
-EBUILD qtbase-6.8.9999.ebuild 10461 BLAKE2B 950b76161b91e97a7de963370dc15ef98ed1043167b0ec306ba9c8a736f95d0d2e236f3f84ce6c81d32ae2a0a3a44c2e4b42973de1e64365a04b9ec8ef322271 SHA512 303e240140391cfbe37762862d0b3ba1908f6a80598b7be0ec5e4cb8fab6849491d46f3f365d02d142f0214ee5266d39f54a70fefdb29b3f5534be7b06c4d9fa
+EBUILD qtbase-6.8.9999.ebuild 10500 BLAKE2B d6f63ddd4b8467ee0009f799dfd681aafea8c7423d900bceea6a3f0aba7ce9fabb054adda36fa41e9449179784d9ef00a2b5a4baa5a6cca1e329d3d232c686cc SHA512 456740fc75780d578df645d757ee0c3cd0344d3b11f1aca6835ca2eb398587e1e92a246ba0b871d2e788f5d59d95ce5229d2146fcee6263895e45b269094adc6
 EBUILD qtbase-6.9.9999.ebuild 10447 BLAKE2B ad7dcb0b911dc13777025baad5eb34e6ed6802591b06cb4c6db9fde94498ff06902c51a5471fc845b4e2b3530f94ed454a8a2f85cb5e3dfe4a680795fb0b2a8f SHA512 4f1d0f53d795744cf74b04ed6a42493646b5bf540d7d4ff6176529e55f2c4927db922d09d603ee4270f0b0911c8c55d38126de68db88067bbf8e9fdffff0a91f
 EBUILD qtbase-6.9999.ebuild 10447 BLAKE2B ad7dcb0b911dc13777025baad5eb34e6ed6802591b06cb4c6db9fde94498ff06902c51a5471fc845b4e2b3530f94ed454a8a2f85cb5e3dfe4a680795fb0b2a8f SHA512 4f1d0f53d795744cf74b04ed6a42493646b5bf540d7d4ff6176529e55f2c4927db922d09d603ee4270f0b0911c8c55d38126de68db88067bbf8e9fdffff0a91f
 MISC metadata.xml 1965 BLAKE2B e91aa3bc2379fa587766cfc7c4053b382a8894c0092d075543b2a5d466dfa001105bb0f564008fab8e71d4517954e527618896de41069c6bafb4258f6201cdbe SHA512 a71f6fe0fb01e60716aa6632605a423f765983f41da2c8ca761afca548cd061bd52bc328f7441fa831e890d75bcfc2820112c946802588dab1de706fbb7ac531
diff --git a/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch b/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch
new file mode 100644
index 000000000000..de728b73f404
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch
@@ -0,0 +1,18 @@
+Revert of [1] which breaks PyQt6, and reverting "shouldn't"
+negatively affected anything. Can probably leave this until
+6.9.x instead (or at least until PyQt6-6.8.2 is released).
+Please file a bug to Gentoo if believe that this is wrong.
+
+Ideally need to fix PyQt6 itself, but proper fix hasn't been
+figured out yet, and PyQt6-6.8.2 may take a while to release.
+--- a/src/corelib/text/qstringconverter_base.h
++++ b/src/corelib/text/qstringconverter_base.h
+@@ -81,8 +81,5 @@ public:
+     };
+ protected:
+-    QStringConverterBase() = default;
+     ~QStringConverterBase() = default;
+-    QStringConverterBase(QStringConverterBase &&) = default;
+-    QStringConverterBase &operator=(QStringConverterBase &&) = default;
+ };
+ Q_DECLARE_OPERATORS_FOR_FLAGS(QStringConverterBase::Flags)
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 11036a11512b..584b606a0590 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -146,6 +146,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
 	"${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch
+	"${FILESDIR}"/${PN}-6.8.2-pyqt6.patch
 )
 
 src_prepare() {
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 0c2f12663ff6..8e44871f2948 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -5,7 +5,7 @@ DIST qtmultimedia-everywhere-opensource-src-5.15.16.tar.xz 3824912 BLAKE2B d98fc
 DIST qtmultimedia-everywhere-src-6.8.1.tar.xz 9664564 BLAKE2B 675544811c845ddb34908fe82e33824451e6ec8fecb66730a2f4dbe754c4466db3ae6e157fac9e8d5d0505adf90ac65bed807bd52eaad0de05047e4532b8ebeb SHA512 77f8e913116ff75cf4602e9c5ee01c48161fb40aaadca0e09ca2f89292071fc6f2918403932b9b0653bbc2b007f25362e0cb84a382baedd67e9e4c31bc414463
 EBUILD qtmultimedia-5.15.16.ebuild 1504 BLAKE2B 7f3ba094454f1836208d3e33d2faaf6bf9b8eb281e9b6b7a8b596b9bfde2c67f3a0e3dc7da90c7b9c87c0f65540225ab315d98dc8f46a3ac82d0520b711fc1c5 SHA512 64b840b6169c5b77d83f58e41b93567e7ed287a634d5d225a2d41e17a0ada8694a7c86e3465659ba79d6af6501b40c88c6321fc6f836064989586220d8d12c1d
 EBUILD qtmultimedia-6.8.1.ebuild 4140 BLAKE2B d7ce39836e535940235d0e1fbb924f5af70f0abf581d61390bea068b6c7a63b01dae49edc2891278792d307735080bb44e65a6e1c3a29286b02f69f1c43eae55 SHA512 c4742a0fddbc96c508b25805b71aa7cb03dd4cf9095dabe3b974ca7d365460bafe337dcfedf511d2c81661d6ab2eb34b74870d6966dfc6ca316ee9646b30a570
-EBUILD qtmultimedia-6.8.9999.ebuild 4146 BLAKE2B 87a337199edf99a8f51ef841d1ea2e928a69fa8713718bef64c4e523b71c0437331cc3c2640be8328e8258a1380c9c2ff693941e85586a018caa2a2c63c02846 SHA512 d3e51cf8a9ef211876dcbd6cd21788cf592e0b5f54f992ef5727c854255c6688c1f96d2072a8a1326f39d48b6bad19b9ebe7347b48b292da5cc084bb31ebc9c6
-EBUILD qtmultimedia-6.9.9999.ebuild 4146 BLAKE2B 87a337199edf99a8f51ef841d1ea2e928a69fa8713718bef64c4e523b71c0437331cc3c2640be8328e8258a1380c9c2ff693941e85586a018caa2a2c63c02846 SHA512 d3e51cf8a9ef211876dcbd6cd21788cf592e0b5f54f992ef5727c854255c6688c1f96d2072a8a1326f39d48b6bad19b9ebe7347b48b292da5cc084bb31ebc9c6
-EBUILD qtmultimedia-6.9999.ebuild 4146 BLAKE2B 87a337199edf99a8f51ef841d1ea2e928a69fa8713718bef64c4e523b71c0437331cc3c2640be8328e8258a1380c9c2ff693941e85586a018caa2a2c63c02846 SHA512 d3e51cf8a9ef211876dcbd6cd21788cf592e0b5f54f992ef5727c854255c6688c1f96d2072a8a1326f39d48b6bad19b9ebe7347b48b292da5cc084bb31ebc9c6
+EBUILD qtmultimedia-6.8.9999.ebuild 4243 BLAKE2B 76ca3a131f79d77df263884b4d3c4c40a6860b2c8ae8ff00647c1d0c7b49f78870f3bc7e9350f2052d7b043172fa485f83f2ec4846f4ac8d55d049d97cdf1afc SHA512 bc7cc998cba90b2cffccdc0ee108f5760e083c5847522f719fabc872d6a4337b2cbb3fd5cfaee2cd117ec54ec1bd4f6c5b8eb741366dcc8077732067680e4457
+EBUILD qtmultimedia-6.9.9999.ebuild 4243 BLAKE2B 76ca3a131f79d77df263884b4d3c4c40a6860b2c8ae8ff00647c1d0c7b49f78870f3bc7e9350f2052d7b043172fa485f83f2ec4846f4ac8d55d049d97cdf1afc SHA512 bc7cc998cba90b2cffccdc0ee108f5760e083c5847522f719fabc872d6a4337b2cbb3fd5cfaee2cd117ec54ec1bd4f6c5b8eb741366dcc8077732067680e4457
+EBUILD qtmultimedia-6.9999.ebuild 4243 BLAKE2B 76ca3a131f79d77df263884b4d3c4c40a6860b2c8ae8ff00647c1d0c7b49f78870f3bc7e9350f2052d7b043172fa485f83f2ec4846f4ac8d55d049d97cdf1afc SHA512 bc7cc998cba90b2cffccdc0ee108f5760e083c5847522f719fabc872d6a4337b2cbb3fd5cfaee2cd117ec54ec1bd4f6c5b8eb741366dcc8077732067680e4457
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 669bee51d312..ebedbf72d367 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -87,6 +87,8 @@ CMAKE_SKIP_TESTS=(
 	tst_qscreencapture_integration
 	tst_qscreencapturebackend
 	tst_qvideoframebackend
+	# seems flaky depending on what codecs system libraries support or not
+	tst_qmediaformatbackend
 	# fails with offscreen rendering
 	tst_qvideoframecolormanagement
 	tst_qwindowcapturebackend
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
index 669bee51d312..ebedbf72d367 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
@@ -87,6 +87,8 @@ CMAKE_SKIP_TESTS=(
 	tst_qscreencapture_integration
 	tst_qscreencapturebackend
 	tst_qvideoframebackend
+	# seems flaky depending on what codecs system libraries support or not
+	tst_qmediaformatbackend
 	# fails with offscreen rendering
 	tst_qvideoframecolormanagement
 	tst_qwindowcapturebackend
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 669bee51d312..ebedbf72d367 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -87,6 +87,8 @@ CMAKE_SKIP_TESTS=(
 	tst_qscreencapture_integration
 	tst_qscreencapturebackend
 	tst_qvideoframebackend
+	# seems flaky depending on what codecs system libraries support or not
+	tst_qmediaformatbackend
 	# fails with offscreen rendering
 	tst_qvideoframecolormanagement
 	tst_qwindowcapturebackend