12 files changed, 113 insertions, 27 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 2f74b799f2e8..390df8d42396 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index a81cdf714f28..cb968d63ca8f 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -2,6 +2,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
 DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
 DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
 DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD qdoc-5.15.10.ebuild 841 BLAKE2B d7a7080aa27918b8aa843623f8e0430f63b2672f3d04acdf18f7e87e01cf33ba6b02465f619abba35625dc91200938a7465a6d39b990591419c5a0fe433ff951 SHA512 ef600ef17a33c8806a055f7312ed469c72c4b37077e4f5163a1f2c26feac583ab9b2fedb9e014824d10d2a0249c1751462e7370c14910794968d0dbce950e250
+EBUILD qdoc-5.15.10.ebuild 581 BLAKE2B 5f3af1c1ff3acc40d73a540661b618ce966a73b1d34e75dc6fdfd416b668b54a39505a086c6a0db567b21be729f8e47b12d86ae4ae2db193da2c22034c378359 SHA512 68fab3cf3b90918e9796e37fa73b176352131a7f3108540960af7264d2d146c3ad8ceefc5eae73c54bd63288fbb779a6eef9563b8521becba787c23650753c18
 EBUILD qdoc-5.15.9.ebuild 838 BLAKE2B a28186636b1f45d5c5ed659fa747f48e1fb8f6704badbb82f1c200f6b468bd7f671e8e71d80b113ac18d96cbae1afc7dc45bf10ff485c5dfaef4ee922349574a SHA512 918320b63fc1845bb182c9bce78162771253be7b3f6752152535f3086a1b67ff6bc48b1d4b06a378092f3e9acd7f14d19c6eeddae28222d30f0bb8a33c9a5416
 MISC metadata.xml 553 BLAKE2B 6512e790088d4b7a76a22edfb8e278399315d3136239d5ea1e37ba5fcdd761fec2a1a30504882e7660b5ced6d582ad37cb9cfc68775e8593d638a4594f693339 SHA512 40075da7d634cc291dcc15c00d1fc63debc6704443fcc0c5d3d06d227b8cf86f89884ea43eb3a1cf8a722a6b260cf9cb6cd7f88c0b14babe301e4344533d472e
diff --git a/dev-qt/qdoc/qdoc-5.15.10.ebuild b/dev-qt/qdoc/qdoc-5.15.10.ebuild
index e3b270244340..7358ed9e1f7d 100644
--- a/dev-qt/qdoc/qdoc-5.15.10.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.10.ebuild
@@ -32,12 +32,3 @@ src_prepare() {
 
 	qt5-build_src_prepare
 }
-
-src_configure() {
-	# qt5_tools_configure() not enough here, needs another fix, bug 676948
-	mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 99a1e533d5a2..8688bdf380a3 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
 DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
 DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtcore-5.15.10.ebuild 2989 BLAKE2B 2f1751d31da843d3676b89373359c57c136dbb243644c8e1bc0852cadf642003c1077b7522f5a2ec6e10fe1ecee61865e5b9ddb1f90622d6399993653ea385cf SHA512 92a24d26703bd844aa1d707da994de743214281db99e85ce7cd55e9f1a875ec0899633318b5373530a4cf0c1ed22ffc55c6e744a928b9c29943c05a375f42f7e
+EBUILD qtcore-5.15.10.ebuild 2981 BLAKE2B e1f72fceb6dc340d9ea62310f497a59a6e553ca3dd2c5c2620855c3b9b0c90fdebc3742318085400db275e4e71e8cfd43fcb62d27280d09a5193cd292aedda65 SHA512 5a8502fdb37fe158f2e5293baab11294720c5f37e01ac0cdee757a2779683f9f94d8b2c5bd3d61696ae02c97c399946cbc7ffae23573cf36b0b5fc83198a0970
 EBUILD qtcore-5.15.9.ebuild 2983 BLAKE2B c3b319f027895875da585b8e2900ee76c140d819bb50b767579c1a0dbe3409cd7b7e6d518bf52fe04aa505d88ab52869d4fbf767ef46dfbba5e43c673a95142c SHA512 0d5f9dd4e9f71b9a27143efa74d1044ebe8495aba4461a098a1ee2bc287efe8b0ebc102f239be0705b9c557065511f71cd267a7d9e31f69e422709aae87db8c8
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.10.ebuild b/dev-qt/qtcore/qtcore-5.15.10.ebuild
index 48613cf5c13a..bb160e75674e 100644
--- a/dev-qt/qtcore/qtcore-5.15.10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10.ebuild
@@ -80,8 +80,8 @@ src_prepare() {
 
 	qt5-build_src_prepare
 
-	# workaround for 0113-Annotate-QMutex-...patch adding a header
-	perl bin/syncqt.pl -version ${PV} || die
+	# workaround for a79a370c (...0090-Annotate-QMutex-...patch) adding a header
+	qt5_syncqt_version
 }
 
 src_configure() {
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 332a8937eaa5..3e0acb51b978 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,12 +1,12 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
-DIST qtdeclarative-5.15.10-gentoo-kde-1.tar.xz 24808 BLAKE2B fda6c707cc576187b959ae0b3eb4fca8aeca711db1fdd9533dcd9f090f0c9e889bd4056f26cd91b841bc3729193f7e6e999c2c503c26ba786f195db80f4dab33 SHA512 7facbfb12237a6abd84289dc2b4e448772e274f2800fe50654058f7f6d58d1c1576a071abf31c66f3a2d138dddc1679cb1f57b521ec8a8ce0667bfb9dc126925
 DIST qtdeclarative-5.15.10-gentoo-kde-2.tar.xz 25376 BLAKE2B 90978286216648900b2d0654d0b5ef5c0c2e05d94bcadedbda58b03861b6ac0aea7bfe34c55c90bbdfe0f088e35a5ebbb3284523ffce04d1a0a93cdac5cc9312 SHA512 d34761a994977b8b3be43f71377441362c9075b970d83b7af9625a9c51dd588ea47637bb30fd50ff4d215ce97ed15f49607f958b5f18dd2281640c031dce01e8
+DIST qtdeclarative-5.15.10-gentoo-kde-3.tar.xz 26396 BLAKE2B 07ad0b115316e8eeaa1b9348cb6e742684b11d4d45087e763679938d43d77f90261a905037b07429d78933d7b7c487d3c1f7f1caedfdb5f6b512f4e20f55d946 SHA512 4d44ffaee5a3b1b01e5959f9c94a3daeda1528e4b7c0f267b11efac5a686c257b1f742ef38040a3ebad167faba0f61ffa2afc03d943770a9a9a005bd52ef99f6
 DIST qtdeclarative-5.15.9-gentoo-kde-1.tar.xz 21808 BLAKE2B fdf3205fed515bb43e72424673def7d3e1e0a7374e20f9f403e906403bcb3febf2c0decee08241bdc7e634cc1771f2e5326d698ff81fa46b931780eda3ea34d8 SHA512 2fe0230de76ed87247b288fdc34ceb5ab459ad4607968f656a73f0d6e4e8c854f6538b7eb0199a432b44b0bcec443a2f21633b46991a27b733b61d66f7f24422
 DIST qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz 21596352 BLAKE2B 4259b55b1406694cf10d5ff1c4bc2501b47a7a7ea4a09eeb77c08fa1417d5f8d028df1a0753af0d1ef52d7aa1331343c56b6c72adf462a6d1a1d5097c288ad8f SHA512 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8
 DIST qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz 21587820 BLAKE2B 530ff86b43ae0cbc427d0b35c64fc9cb7aad62536686486344ef6a224b609ab2eed72fe5aa761e8bcbd920cc5f4329e44cdffa87afa17b0847b57b6a2ffa4c3b SHA512 ada3e32f42270899d92c46f0c0b8cd78028cf2e658ac60b3745c804ec494fb1fc6f31a670668074433b3e702f81524415ef132a757ca80151eb13d0a19352af7
 DIST qtdeclarative-everywhere-src-6.5.1.tar.xz 35506504 BLAKE2B 8748a3c29d2bb7888fdb275fe663c39bb9c23e2e8afddbfb2aef11b1b315083da70bb180e10c9474cda4c8df5396d47b0b45b6620618753a455bf68cdc06044a SHA512 7ec840e42b1042263aa41c5d339cfa8a7921e3c5f217e710df0737b2c5c44b1e6c0fae155af934087f5a623d9370f30f83ec5691eb473e52b46486f4938173c7
 EBUILD qtdeclarative-5.15.10-r1.ebuild 1543 BLAKE2B 4f4d321275787c9e01f85022e3687f2ecd6d96ab6dbd848aa7255d72b9644822bf669ff63d3c98f942e07d36cc6aab65e337a298f0ca5abb0a659843960424a6 SHA512 819e891879cb938d9f7753246a174524ba0dd721314d7c199f086db604f0f5a508a570bffcea0a4f07c75cf814320292279fe64b2f765cc217e919901b70315b
-EBUILD qtdeclarative-5.15.10.ebuild 1543 BLAKE2B 99ca8d35bd069438a2d67791152766519ebb30f524658a559759202b5878848569257b3a878b1aac6aa607931792e5ee613223ed84f3794d063ee48743b4d96c SHA512 ea071705b5c59cc7ec82ec734bb4d428ad31ccfb0ab54fe9910eed859b78afc97d950a1d31b08f79e75f80108dab12daec77e2287d84ea9f4426f4b22d3399d5
+EBUILD qtdeclarative-5.15.10-r2.ebuild 1543 BLAKE2B 2eb023c77766962ff9d3de9bab5fb5431101cb159f07620214c0bd372a9f524100eff523d9492ce63f27b13ce0cc89eaadc4cce2d93b0180d68ba175a28366e6 SHA512 5b31fb023d4e6d4d4b431f277b01c78f7e60328aa6687752b708f6763e9f79bd3405ebc36f991424b3f26e784ea50552b475b9dcf2ae4ff024daf7fa10d1cf47
 EBUILD qtdeclarative-5.15.9.ebuild 1537 BLAKE2B 7a4c8c240e26b70bd7a7e60e4268cfbcb3f9f2b88091abda6be1ac39a3728072928ea53d93c044eae7c6981a2ac2936fa6e0af9ebd498e8bbe2e39bdf361b3b8 SHA512 24a254cb03164d73de0b377980ca36b85f21475f7abbdd67afe683a9b39be7d0558af0b18c9d7e809ec01ebe443c185c77939064b1b3d94a7733955e694e24a7
 EBUILD qtdeclarative-6.5.1.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
 MISC metadata.xml 744 BLAKE2B ef479ad28d7560fc3abd2e743e8994a6a843bc1a4d0644ac037a4fa481f71a6ee73fbf99073769d20fcb245e6432556bc00707d3ecec1fb709ae2622fc9c5e31 SHA512 27d3e595647800c62e1275f2b5bfae0f2644fce547175cd5f63c4907c2313298b988f5378761868d2761c3edf396cfcf4d0c733032026e7ea0a9bf7ba367ecda
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.10.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r2.ebuild
index 3c71973052f2..1fb7272a0e85 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.10.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
+	QT5_KDEPATCHSET_REV=3
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 54aa4a049f71..6aaab6773ada 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -5,7 +5,7 @@ DIST qtlocation-everywhere-opensource-src-5.15.9.tar.xz 6552244 BLAKE2B 5091aef5
 DIST qtlocation-everywhere-src-6.5.1.tar.xz 3032784 BLAKE2B 78f2254e56d97dcbe380832dade72a0dc47a9f829764b6c4d584acf00b0b64f9ff37135b01fcc34a5efef8f9b5877c511395de69138030c47eb077f5d18346a0 SHA512 31190ca57feb4ed8b72d5bb5896a81da56632f873609470e760b390a3839f84bf8f6771c6acfcccec6781c694642b85ea34b0c7321528df5a0529af3d2bc5ad1
 DIST qtlocation-mapboxgl-5.15.10-5a07e196.tar.gz 3726230 BLAKE2B 9dbe08088a55bc1da4952a628af987b3b056615e883983d3a5e2eb392ce4aff16bfd753f84bbad07f9a415fbd275ec9933a64b6bcfd27ea6d8adced6d2adcac7 SHA512 ec3de81f643388690eda45d073a9c6f908d8efeff30cd062d9afcd1f94c6b45b301327747928d45b4047ce04b7df5b0afaf9e8942e22660711a5ac49787829eb
 DIST qtlocation-mapboxgl-5.15.9-5a07e196.tar.gz 3726230 BLAKE2B 9dbe08088a55bc1da4952a628af987b3b056615e883983d3a5e2eb392ce4aff16bfd753f84bbad07f9a415fbd275ec9933a64b6bcfd27ea6d8adced6d2adcac7 SHA512 ec3de81f643388690eda45d073a9c6f908d8efeff30cd062d9afcd1f94c6b45b301327747928d45b4047ce04b7df5b0afaf9e8942e22660711a5ac49787829eb
-EBUILD qtlocation-5.15.10.ebuild 1653 BLAKE2B cc126c2d7e72194287f94c759a7e77b010ff7e2f1aac9617aa31205377fa7517acc3945b0b2889ac8dbe418bf6728f06ccc055e2476fc5036b5368c553bdf796 SHA512 d5274ca0e8389d2b5465cf36e659783c24c7a9790df8a73416124d6610d5ef1928e772cb9974772cbe7a88db4fe4fe32738f89dd43505259d9fc118b92355fde
+EBUILD qtlocation-5.15.10.ebuild 1321 BLAKE2B 7576f91a7b5d1fc402e6dda7b0096554fb0695c5a9ecc7fdcbd561b3dc9b019b4894b68ec98f60953f149450b5892f0f4a128768024ff20ee0317623bf14b685 SHA512 ce4c1b0a1c58cad64eddeccea7f2720d2c5c8788305aa282d843dfa40c604d5ff0572e44da0276f882e36069a0351a4d20b7ed6bf7eb1ffa38ea5732d536ed1c
 EBUILD qtlocation-5.15.9.ebuild 1648 BLAKE2B 3eef58b8008cca5aa3ef1d3e8149d8e55d498905f26bbc3d8d1f1b677fbced9b2b31b93ce9874a7f7acc9a4356146fe7d1b78b1d04ccb96f183f08ac879056d2 SHA512 e68ed2e2d6ccc2507334bb7749f484362cf654dd823cfcb6d85f1c3eda02572bcfddb3524f4c0806b9647b37e69252d783c5bd0d71016ef9428dfff7d4da8546
 EBUILD qtlocation-6.5.1-r1.ebuild 433 BLAKE2B b70a66d0ad3fd02696537c32677077786d0f528a7676af4a3e68afca659c64436b398f046d2a88ab513bb1ef4eecde08beb26a6f2cd3a5063f72b0f8fda26489 SHA512 f742f4ee5f73d0a5fcde8bf993c7e09495f852b0b62f2f5fa0925df31a69088c2712518542a06374373a5c3e91098c5f44ec2d0585354effddd44d736a81cdea
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/qtlocation-5.15.10.ebuild b/dev-qt/qtlocation/qtlocation-5.15.10.ebuild
index 3aa44e99e850..b668a16694a3 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.10.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.10.ebuild
@@ -49,12 +49,3 @@ src_prepare() {
 	qt5-build_src_prepare
 }
 fi
-
-src_configure() {
-	# src/plugins/geoservices requires files that are only generated when
-	# qmake is run in the root directory. Bug 633776.
-	mkdir -p "${QT5_BUILD_DIR}"/src/location || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 64c85dee7cb8..97bbadc936a6 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,3 +1,4 @@
+AUX qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch 4618 BLAKE2B 51ca56a407d055533e80c7639d385e959517a1983fddb0635e2441769c29d9b02ea9eb60ad18030185fde7e2babdfd18afb5a17d1a0365c0ff6c564519f44c0f SHA512 1e94f218a3d0e7580900712635a19d3162cadbbc77b62b91d1c195f0cd11ac90be0b90821fb9e48887e2ad3c1f4e49fee1ac33c291a587f595baaa8d72ea6b9d
 AUX qtnetwork-5.15.9-CVE-2023-32762.patch 1598 BLAKE2B 2d7a37066205b9eb75df0783d49bb36b71e7fe5ee65a391b9d5578c283c6058bec951b9587b27ca63b658254f9c540e54460ea2c4f6a8503fb25da31e8c6d969 SHA512 f89d96bb473e38fc069c8d0afa9c7339647af30948f40de6fc432f55e0d23ba01d0a1ef29145213afd6dbae6992a436baa693dcace982fd0a906d7118e73ad14
 AUX qtnetwork-5.15.9-CVE-2023-34410.patch 5162 BLAKE2B d4d268edeecd71972985f52a8f0aa34df9ad5a08e89176d3f368d37d13e889bb71093e7b70f2e32e7ce765fabb4c4b71bf6c7e1cb01d4daffd720070718e2fc9 SHA512 dfad275afee27020588769c71618a930e8e4836bffb2fa9b24a18fdb9724d26715ea5bcab8f9ea6d4484f8bec21fd06664111e37663fbbd5d177665e1a51bc7b
 AUX qtnetwork-5.15.9-QDnsLookup-dont-overflow-the-buffer.patch 4180 BLAKE2B b85be10b7274322b10eb4ab654aa83621655a495be641dd7d66ebdfc10749fe2aeb333f02b8fa4703e48eefec56e8657375c921320a22e601c9117fe605782e2 SHA512 f6ea5c46c252a3781de1364878692e76950b68f48e51cf042565cb7da0632310e7b85abe52054bb4571638645c2affa6ab20374c6b7c5beaa0b441b85a34956c
@@ -7,7 +8,7 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
 DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
 DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtnetwork-5.15.10-r1.ebuild 1190 BLAKE2B 09e826991757356e81e7290dd2ffc1a7ff58e4bb9957f152d2955bb577daf3328f954459d8562edfdd2d418bc6c4a0d1bbc758c3dc380331e09c83f94459ebf0 SHA512 56ef468bd04e9c5e0a1f8c06c355622eea1ee05e5184e490ab26478a69359b7b6113c566853f85771e4803b607008bdb03ea7635b3c4eab26af31b8503a6cbc7
+EBUILD qtnetwork-5.15.10-r2.ebuild 1255 BLAKE2B 66159533d27577432a763456fedb282388030e351e163f7bc2baa82661eb81dbc447acbff044a33dd07c3e4db3b40d955a63a43822cfca876c9a64308e35d57c SHA512 c0a2862585626a78337cb06aa3f859e6b2020b449f6740ce86b5e21022016f952cc5d2cc876b07cda42369c54feadce674703b608c71fd2e232152d6fd437e3f
 EBUILD qtnetwork-5.15.10.ebuild 1607 BLAKE2B 8c336a9117dd3289b8cc2c91fc6cce82cb9072612b65c5f5df79e402f1b765f20d9ada4e208f0143fe7e40c1f8c830837586104429244706135f02fa11facd63 SHA512 2f0f7f0bb1570e6e4501a29dd0fd6a96d1d44c2e01a354a78364f93a3cdcb7e47262f5f065fc629d3037306dfd8170fe552d677d894f1a507ff71aca47c41d4a
 EBUILD qtnetwork-5.15.9-r2.ebuild 1771 BLAKE2B f4f979099e47e355ccfae3074652019678e1a96ea0d69432c5b2d387d3e6b6558eff3694fdc955d1b63fe68e05d822e366357d73f1a142bc9f3fad3801244ddb SHA512 4d9178f57bbb24b204bac584af37ea2d3c6fd9296ba0e685e54ef9a8df153138c57ca6c5e0fd08ae9f9fbee8d5505cadfe6e9f7b99c1071a6f8afba390c04fc6
 EBUILD qtnetwork-5.15.9-r3.ebuild 1813 BLAKE2B 512e960cb5f65727e2c7de6b9e3bd151a72e71cc0f8b9c339a58c31a4a828cec2995f3cf206b4352004e31d49457fe120e85dfa9a2832f1bbea85ad427bf1cff SHA512 1cf46c222b8724838c28829905aed765a9906c9247aa842e710f906f33fb76df173bc456db38ee38ab36ee10b4bc0053783a8e644736c77f9eca387511ce2295
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch
new file mode 100644
index 000000000000..94f1325070d5
--- /dev/null
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch
@@ -0,0 +1,101 @@
+From 05406c3f5f516d3148254c8294e8883c28a2c95a Mon Sep 17 00:00:00 2001
+From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
+Date: Wed, 21 Jun 2023 13:30:35 +0200
+Subject: [PATCH] SSL: upgrade the default DH parameters
+
+We have been using as default DH parameters the 1024-bit MODP group.
+This is now considered insecure, and applications should use the
+2048-bit at a minimum [1]. This commit therefore replaces the parameters
+with the 2048-bit MODP group from [2].
+
+To double check the data, use openssl asn1parse to verify that the prime
+matches. For instance:
+
+1) put the encoded string in a `encoded.txt` file (c&p from the source,
+   removing the double quotes)
+2) put the hexadecimal value of the 2048-bit group in a `reference.txt`
+   file (c&p from [2])
+3) compare the output of openssl asn1parse with the reference. For
+   instance like this:
+
+    $ diff <(openssl asn1parse < encoded.txt | grep -m 1 INTEGER | perl -pe 's/.*://; s/\n//') <(perl -0777 -pe 's/\s//g' reference.txt) && echo OK
+    OK
+
+[1] https://datatracker.ietf.org/doc/html/rfc8247#section-2.4
+[2] https://datatracker.ietf.org/doc/html/rfc3526#section-3
+
+[ChangeLog][QtNetwork][QSslDiffieHellmanParameters] The default
+Diffie-Hellman parameters are now using the 2048-bit MODP group from
+RFC 3526.
+
+Pick-to: 6.6 6.5 6.2 5.15
+Change-Id: I47133cd78ba0e954b8f93a3da09fa2c760c9f7a8
+Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
+(cherry picked from commit 3ec24e329c9ef6802786a37f30ddd8982e903480)
+---
+ src/network/ssl/qsslconfiguration.cpp           | 12 ++++++++++--
+ src/network/ssl/qssldiffiehellmanparameters.cpp | 13 +++++++------
+ 2 files changed, 17 insertions(+), 8 deletions(-)
+
+diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
+index f5ce02807f..84a9187334 100644
+--- a/src/network/ssl/qsslconfiguration.cpp
++++ b/src/network/ssl/qsslconfiguration.cpp
+@@ -929,7 +929,11 @@ void QSslConfiguration::setPreSharedKeyIdentityHint(const QByteArray &hint)
+     Retrieves the current set of Diffie-Hellman parameters.
+ 
+     If no Diffie-Hellman parameters have been set, the QSslConfiguration object
+-    defaults to using the 1024-bit MODP group from RFC 2409.
++    defaults to using the 2048-bit MODP group from RFC 3526.
++
++    \note The default parameters may change in future Qt versions.
++    Please check the documentation of the \e{exact Qt version} that you
++    are using in order to know what defaults that version uses.
+  */
+ QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const
+ {
+@@ -943,7 +947,11 @@ QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const
+     a server to \a dhparams.
+ 
+     If no Diffie-Hellman parameters have been set, the QSslConfiguration object
+-    defaults to using the 1024-bit MODP group from RFC 2409.
++    defaults to using the 2048-bit MODP group from RFC 3526.
++
++    \note The default parameters may change in future Qt versions.
++    Please check the documentation of the \e{exact Qt version} that you
++    are using in order to know what defaults that version uses.
+  */
+ void QSslConfiguration::setDiffieHellmanParameters(const QSslDiffieHellmanParameters &dhparams)
+ {
+diff --git a/src/network/ssl/qssldiffiehellmanparameters.cpp b/src/network/ssl/qssldiffiehellmanparameters.cpp
+index 7807afaa30..7c2505a0be 100644
+--- a/src/network/ssl/qssldiffiehellmanparameters.cpp
++++ b/src/network/ssl/qssldiffiehellmanparameters.cpp
+@@ -68,17 +68,18 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
+-// The 1024-bit MODP group from RFC 2459 (Second Oakley Group)
++// The 2048-bit MODP group from RFC 3526
+ Q_AUTOTEST_EXPORT const char *qssl_dhparams_default_base64 =
+-    "MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR"
+-    "Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL"
+-    "/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC";
++    "MIIBCAKCAQEA///////////JD9qiIWjCNMTGYouA3BzRKQJOCIpnzHQCC76mOxObIlFKCHmO"
++    "NATd75UZs806QxswKwpt8l8UN0/hNW1tUcJF5IW1dmJefsb0TELppjftawv/XLb0Brft7jhr"
++    "+1qJn6WunyQRfEsf5kkoZlHs5Fs9wgB8uKFjvwWY2kg2HFXTmmkWP6j9JM9fg2VdI9yjrZYc"
++    "YvNWIIVSu57VKQdwlpZtZww1Tkq8mATxdGwIyhghfDKQXkYuNs474553LBgOhgObJ4Oi7Aei"
++    "j7XFXfBvTFLJ3ivL9pVYFxg5lUl86pVq5RXSJhiY+gUQFXKOWoqsqmj//////////wIBAg==";
+ 
+ /*!
+     Returns the default QSslDiffieHellmanParameters used by QSslSocket.
+ 
+-    This is currently the 1024-bit MODP group from RFC 2459, also
+-    known as the Second Oakley Group.
++    This is currently the 2048-bit MODP group from RFC 3526.
+ */
+ QSslDiffieHellmanParameters QSslDiffieHellmanParameters::defaultParameters()
+ {
+-- 
+2.41.0
+
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild
index 148c6d9f133f..39ee0ea09f21 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.10-r1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild
@@ -41,6 +41,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 	:network
 )
 
+PATCHES=( "${FILESDIR}/${P}-ssl-upgr-default-DH-params.patch" )
+
 src_configure() {
 	local myconf=(
 		$(qt_use gssapi feature-gssapi)