gentoo resync : 25.09.2021

37 files changed, 178 insertions, 384 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index ad9dd7fa1765..4d52d20cd74c 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index e06f3dabef73..0fe7549938e0 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD assistant-5.15.2-r10.ebuild 1267 BLAKE2B d530346bb33a5881c8c04e50ea38f807609b191f0cf487843eca254ca507cab524a7df7ac741fc201d7490e73783806db3da634ab154627be0e688a5a2549caf SHA512 fd2da93421be491f76a17770fc449961ec60d5cacb9085753eaebca427c5d91938d03f3cef816e9818cc6c30be37897e7188541149abdb3851b8681513faf058
+EBUILD assistant-5.15.2-r11.ebuild 1272 BLAKE2B 64c892c98b9d05bbd7139af89b3d3ef6e8650088389e15502aa31fcde47ea76a5ca74e2b2db8852e6200ccda108869b2bc78e8bbb2c5c5b227c1a944d0748f4e SHA512 2dc25e1a2e8fc76ce1b7cdb2f9b20d8fa430dfa225bea37a0979a9d12efb157d8d7390447f00edb623fecac73827cdb3a62c0331f5decaeb2c809814531826d7
 EBUILD assistant-5.15.2.ebuild 1172 BLAKE2B 279c9a3c861bae74c79d52a8549b06167a7ca4adc3e4da5b2de0eada3414702adf36f0055790221e3cf725e9dcd1a959a6a507dbb823ddef061c7ffaff34ff8c SHA512 65a1a15cc074952f79a15adf8f57dca1283d246c34367e467e591af4c3ae3284539592efcf10edbf035bf8e450688205d5c3ab9ce3c909c60e7b83f0691ea067
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/assistant/assistant-5.15.2-r10.ebuild b/dev-qt/assistant/assistant-5.15.2-r11.ebuild
index c1c5acadc774..1a3425517931 100644
--- a/dev-qt/assistant/assistant-5.15.2-r10.ebuild
+++ b/dev-qt/assistant/assistant-5.15.2-r11.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 
 DEPEND="
 	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*[png]
 	=dev-qt/qthelp-${QT5_PV}*
 	=dev-qt/qtnetwork-${QT5_PV}*
 	=dev-qt/qtprintsupport-${QT5_PV}*
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 55998f7f5d56..0f1b5551b5a4 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD designer-5.15.2-r10.ebuild 1323 BLAKE2B fa7b321ce9aa7ab565161c191ea362e64a47a3a6f5b9de352fd88b7441f59fc0ba2e0995505d90ae6a9ec0a8cb061566fd605b536b8c590f94a6feadd53d93aa SHA512 92e74771655cf662c4fae0cc131a0c16e3226320dc6fa9443ee3eefd91e0ebc1c6df55fe0036a579b1791dad78491c318d204eab8de301d23e7761fa0365a6c7
+EBUILD designer-5.15.2-r11.ebuild 1328 BLAKE2B bed1aeacca8f6c6bfd0b836f8cc8ce659f7293566a308f79cbce8b128acaed60958563c0c8b0cf100fc7b2f81db6d0069f8ff63f449e93c2e0b458c71c8b7b37 SHA512 9b6a83d8eb29090c39448cb8ac9d9bafb3360a314cbbeb8172590f7dd0239dc7af26792678f77a24295da2f189c452e8dd23766a42890e1e3fbe2fa20109b4bb
 EBUILD designer-5.15.2.ebuild 1207 BLAKE2B 164db9e578cf8ec76a9b319c0a40abf63dc318e9f8b697920f2123cc10ab07b2fdd85245fff218a09e70f9e69726c29f1c2e7327c59a040639845f5df9580895 SHA512 89f7f89384daf7d88afdea95ce93552f3430f79f75bfcc4b233c20cf700c2c1db25fedd722183eb13e80fdcbc04dddcdeea999a8cc6524259f8d10ace7fd952e
 MISC metadata.xml 565 BLAKE2B ff18f784bf09ba4add0fe5a9966a07ba2694dd84046bc528b22bcfd643a7e57be99235bd98eca4e58f68636f9fe6c8e274aabf82ed2055c6a4c70d10c60864ed SHA512 357d80b857e508aeceefcb45ab3757ce24d6ec3e1fd67642f2cbedf496748f89ab5a9726eb974bea8d5b1693601a965571913f79b1325aeaf9020183882ba16d
diff --git a/dev-qt/designer/designer-5.15.2-r10.ebuild b/dev-qt/designer/designer-5.15.2-r11.ebuild
index f4adcbff829e..c439cffb179c 100644
--- a/dev-qt/designer/designer-5.15.2-r10.ebuild
+++ b/dev-qt/designer/designer-5.15.2-r11.ebuild
@@ -17,7 +17,7 @@ IUSE="declarative"
 
 DEPEND="
 	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[png]
 	=dev-qt/qtnetwork-${QT5_PV}*
 	=dev-qt/qtprintsupport-${QT5_PV}*
 	=dev-qt/qtwidgets-${QT5_PV}*
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 88c2d95abd70..0579eb39797d 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD linguist-5.15.2-r10.ebuild 1068 BLAKE2B 91c8969a52ed32611d0a4e5ae35a5752ff8cd53f410386b8e46a8dc0ca2a25571bef42991880fa384cde982e21852c66fde1c1f50de022ac6ca00a860e72953c SHA512 1ea5c9e68f4733f432418739c42031fccfcbeff3738e1aa164a51e64d2f498ddb96dd45b6ddba713033efe08f8b89007fd41cd481dd64bb6eec272b461deac03
+EBUILD linguist-5.15.2-r11.ebuild 1073 BLAKE2B f48c0e3f513626923eac206ac01a046b0462962d7934c32bd535b16532d3afe02165cc8d6f0760961cdea5cd8ab2f3727cc7daf11cfcd2040eef4a6a28c2f5bc SHA512 0b6157cea4bea4ca85429f39f8a86b9139014d450ad850356f066777c3e72cfebc3bb036d148f49c310c3088546ee027830a3f62dcfac70681e140d526719ebb
 EBUILD linguist-5.15.2.ebuild 978 BLAKE2B 9a0597ccbbe503e80793cb39ea06f12f98f9ea30119eefc569f01cc7540eec38c7088230133ea44792e34b66c60c71f1a26afe3ae2ad33e7c726127fa5c3ce0a SHA512 3cdb00dd950edc643b8c60d7f33600e76c059e36b7bad8c549f08ab504bdba58641ab9ec81e7b4d084ddccc71593ef984716e52a63a9a84f98692696b7304306
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/linguist/linguist-5.15.2-r10.ebuild b/dev-qt/linguist/linguist-5.15.2-r11.ebuild
index e4d9d4505f59..d381188a7d98 100644
--- a/dev-qt/linguist/linguist-5.15.2-r10.ebuild
+++ b/dev-qt/linguist/linguist-5.15.2-r11.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND="
 	=dev-qt/designer-${QT5_PV}*
 	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[png]
 	=dev-qt/qtprintsupport-${QT5_PV}*
 	=dev-qt/qtwidgets-${QT5_PV}*
 	=dev-qt/qtxml-${QT5_PV}*
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 3f3fdc4b4f6d..dcc727653ff8 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD pixeltool-5.15.2-r10.ebuild 516 BLAKE2B 1ebaa452db6cef64d6f03e9a60f131322693a37e2d2fef257bc384bccf60b7175837d7a14df022e143a958cdd65e793923c75cf4f609c5553da2baa922d06007 SHA512 6355fab226f0cf895f3f05f88e88c410412d0739646fe12f8794e82b1c5f46c8ffafd055b9bf5ce107eb2ea4da1840fd4c9cba683ab76aba59959ca8c1bee57e
+EBUILD pixeltool-5.15.2-r11.ebuild 521 BLAKE2B 1ae558bdfb008cd3f1894edc2b3a9e30845d058bb9315601ed381c886e13fad5d04419cf4c80a50b5fa544c1bac06480fcc3b06d6dcdd58e592de992c46a75eb SHA512 bab8a80a97fa60b36cb2909c11fffc8f1ad526518dd81a7063c43de9eec7ba1afa35afe554349ec46c2a8eb423116fcd339107cfcca7fb0bd4495f02281a832b
 EBUILD pixeltool-5.15.2.ebuild 421 BLAKE2B 4e1e63db67d042bf03d2ee606682fa210e7c48ab314a4f78e71c198e3b920c45a930826054c7f9ba6af5b12f7e881c4fa9a605c96910f0317b7d88e37dcddf58 SHA512 6e8c19d9cfe7e5b8a651817499a72b5e8cb4a538cdd865a68fdf0c388ed093379297143916aa6fd3e55fe9ec25345554e072917a8096fc6a05fec241da329a89
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/pixeltool/pixeltool-5.15.2-r10.ebuild b/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild
index 1ddf79a9916e..5e5a65259760 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.2-r10.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 
 DEPEND="
 	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[png]
 	=dev-qt/qtwidgets-${QT5_PV}*
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 620b23686a63..35a29c637ba3 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -4,10 +4,9 @@ AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d714
 AUX qtcore-5.15.2-fix-UB-in-QDateTime.patch 3707 BLAKE2B 7b1ed1b539d04e299b3148acf85d69c014a8a76882a682910b323117e176c68dab8b48de12c0a5c885508dd6d97a4ae9da4a27162323ba743d25f9a83319b367 SHA512 62beec1be070ff6136f1b52c1789e31f877bf728ca12c54c90de6302f6c35008d0d9e939f99a92465ca14ee977faed507b2acdea553d8904eb201aed41a97805
 AUX qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch 1944 BLAKE2B 71f3a02d89e3604cec0f021fe28bddc0ab43e242742d0f5af17a46bbfdc444f7d3244fe995195ef0c1c9119313a472bd7e64a6fd02986f7cb6cb544553fbd36d SHA512 6f9f57eb2b374b56576fe0046518810e07482aae1a74f45c9692ffbd797ad1653aedfcd896d89909ade4572564164e92698de64da9f98ce876952c2c96b15aa3
 AUX qtcore-5.15.2-gcc11.patch 1002 BLAKE2B 5104165920881f0ec960a96b5e82430acf32eaf2a3b2a1724844c18a2b0661d71820401d4f6c8d25e56b3a5dfb99cc47f024a96c8fc48f9ddcb1fb8dacc8a90d SHA512 658169f8d7fa42d492f69b44feadd369bccf9a76d01989fd8b14991f97cdf3c8291ff316e195a05a8bb015bae477d5c49d495eefcfc4f3e25dbc58f33688854e
-AUX qtcore-5.15.2-revert-3a273ac4.patch 2373 BLAKE2B 4033cac8d0f4f1e96a519cf8ff524e40462fad2c5ff7e83a412108c2e4296db0e759fea93dd01835d1b9552041d15cb4ca0eccc01ef05aba14ade60cb542c478 SHA512 425f141a3a756721ef35191262885d52a3da948b079cd5f31c2c24a5eba76e0154e64486633758802f60912f0332b9814d11685b92bd2188ee08f4cf920a02ff
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-64a00680.tar.gz 67963186 BLAKE2B ad8cdd4f18e44791467f607585eed0ef00d16316cf31f246eb4fb7db650af4a9831792a84df8c0a59c34a538eb43de85a3815558425e5cc6d5c77695e954d5d2 SHA512 c5959125cffbfc817024a039ae6c9c5b0a5b3fef0d45e178e008ba3e4fbd79ff35f2a97ebd986897b700aca50e14183891dcd517c18674ccec410c7b4bf45a12
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtcore-5.15.2-r10.ebuild 2511 BLAKE2B c19f10a822863507b7d36faf243b538a74f666e5655e801222daba051136455311789ab8063ef30fc274a491d1bd89869c7556c46502900258562a0286f6bb17 SHA512 a5926114d78dd1ad39b507e5a0c063617aad21514090874094fadd6d48ee95ef0490e99daa1674db58b934307027105c6b201fa5729dad4807eeebe8668575c2
+EBUILD qtcore-5.15.2-r10.ebuild 2336 BLAKE2B ab42db398c5a6d9f169647393b00a78fe04fd94ec3dc901889952085d10442041014f4eff28e646b49ed1611bae12fc01245d65ea563d19ce217bac131b02197 SHA512 012e8b83acf01ec71ddacb9329c345574aa04e01bdcb3b484218fdbc032e42e13fca33606fddda31203ae46d034a4e9f04fe8f7cc0bfee9442a5e18f2ffaf95a
 EBUILD qtcore-5.15.2-r3.ebuild 2609 BLAKE2B 5ba2d7be01a791bfc9afcbe4d7cb7589df58b8ce5d343e9c35c7b69ff1ec2f80d701209e18bc2966fb154314e397b7577759b2bfa9271bb576558e6fa5ec2b49 SHA512 f4b64260fb2c66fdd106db7f464b212b7f63b506d4c3026cdbb15402a88f89f95742bc616f86bd6d92cfa4900b98e85dd50b9cfe9d49f3965c8df8fdeee42c51
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch b/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch
deleted file mode 100644
index a29e1b5256d4..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d9a85af5f24d0608c79b2d87b01213833bee01e5 Mon Sep 17 00:00:00 2001
-From: David Faure <david.faure@kdab.com>
-Date: Thu, 19 Aug 2021 15:07:13 +0200
-Subject: [PATCH] Revert "QString::lastIndexOf: fix off-by-one for zero length
- matches"
-
-This reverts commit 3a273ac47f20e82a1f2f63411b210025ca0f4495.
-
-See QTBUG-94215
-
-6cee204d56205e250b0675c9c6d4dd8a2367f3c4 for qtbase/dev changes the
-behaviour even further, I'm pretty sure we don't want that in Qt 5.15.x,
-see discussion in https://codereview.qt-project.org/c/qt/qtbase/+/365179.
-
-Change-Id: I663d74e0d44ebf46291fe0e8a7dc609be82eedc6
----
- src/corelib/text/qstring.cpp                    | 4 ++--
- tests/auto/corelib/text/qstring/tst_qstring.cpp | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
-index 02a9fe3a30..e6e7cbaad4 100644
---- a/src/corelib/text/qstring.cpp
-+++ b/src/corelib/text/qstring.cpp
-@@ -4558,13 +4558,13 @@ int QString::lastIndexOf(const QRegularExpression &re, int from, QRegularExpress
-         return -1;
-     }
- 
--    int endpos = (from < 0) ? (size() + from + 1) : (from);
-+    int endpos = (from < 0) ? (size() + from + 1) : (from + 1);
-     QRegularExpressionMatchIterator iterator = re.globalMatch(*this);
-     int lastIndex = -1;
-     while (iterator.hasNext()) {
-         QRegularExpressionMatch match = iterator.next();
-         int start = match.capturedStart();
--        if (start <= endpos) {
-+        if (start < endpos) {
-             lastIndex = start;
-             if (rmatch)
-                 *rmatch = std::move(match);
-diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp
-index 8f53824050..4c4a8f0416 100644
---- a/tests/auto/corelib/text/qstring/tst_qstring.cpp
-+++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp
-@@ -1674,7 +1674,7 @@ void tst_QString::lastIndexOf()
-     QCOMPARE(haystack.lastIndexOf(needle.toLatin1(), from, cs), expected);
-     QCOMPARE(haystack.lastIndexOf(needle.toLatin1().data(), from, cs), expected);
- 
--    if (from >= -1 && from < haystack.size() && needle.size() > 0) {
-+    if (from >= -1 && from < haystack.size()) {
-         // unfortunately, QString and QRegExp don't have the same out of bound semantics
-         // I think QString is wrong -- See file log for contact information.
-         {
--- 
-GitLab
-
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
index d8791013a67c..7cdf654113b4 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=64a0068011e12f178fb7ff65fafe7cfaa4620719
 QT5_MODULE="qtbase"
 inherit linux-info qt5-build
 
@@ -48,9 +48,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
 	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-	# Revert to 5.15.2 (upstream Qt release) behavior, QTBUG-94215
-	# See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/46
-	"${FILESDIR}"/${P}-revert-3a273ac4.patch
 )
 
 pkg_pretend() {
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 390a6f04b4f0..b0d621f41df3 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -5,5 +5,5 @@ AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbf
 DIST qtdeclarative-5.15.2-92225b72.tar.gz 24341895 BLAKE2B 049220433ac3339b41a4c43267b54b02c2383571c5abc9e77377d7d404a95c081b874ad906340ccd408ca491c04e7c017dcb7dd1dd7794f73bde7d729f64e06a SHA512 b83345747c87ddadea6581ed2803f15900678ee004dc43078529771eb9de12d643567b9349bb531d54d086097d80f7bdd7a88b604b347e8bfea89039b211f026
 DIST qtdeclarative-everywhere-src-5.15.2.tar.xz 21559880 BLAKE2B 07fa82a55f79c081cf3cb713e6b90274f2b2c420eba958042f58989502e2ae572294c4cd02eb73767e87d84c9173fb154e45370c043f6adfc7fb1a93377e2edc SHA512 a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3
 EBUILD qtdeclarative-5.15.2-r1.ebuild 1369 BLAKE2B fb3857c567472d259b15bdfb2cdf15f9d2b36cf237a8839051e5dcb1d64310a5760ee180c90b3880e68c6f74b38911f7f9aa7cadbfa596a6d88dfbf9f7d8766d SHA512 fe359a279c42693905970ebbacacd69a246b7710e443b82ec12f781ca667fcdc5b4173887fb19c5c1882cd56a4adac98b444216e320a1af1654eb3b312271ae3
-EBUILD qtdeclarative-5.15.2-r10.ebuild 1379 BLAKE2B fb99b50cfc388b008e561dd9c0ecbb37624414904822942c7f198d89ecbc838906655878312a6aab01864bcc51ea84896a34aeabeb369c98f6033a85fa9fdd0e SHA512 e13cc3bf7bdd763de1aac61cfe4cfba5f1589dc7a02f13458a1f2d7306766c05a33e8487e0ce8661557b1f81eb757942f26a890d1f5bb2cd03de74057a7beaf2
+EBUILD qtdeclarative-5.15.2-r11.ebuild 1430 BLAKE2B a1aae7561add8916fb72363c743377ad8b31ea50465fc816be4da41477e151ae51d0e49f962f1984cda5bfd118e843c7023b05a38983bbfe542fb16c869c4fd5 SHA512 dedc41243bb59e5548f8685e8b5a115d28e03d4eac378cf4e7c4ef0abc47054dbd432fdd7ae6a830d58350d6d536720af672752917b29948ec9c342355a88751
 MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r10.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r11.ebuild
index fd87062686a7..07b0ea7daad0 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r10.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r11.ebuild
@@ -15,17 +15,18 @@ fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"
 
-BDEPEND="${PYTHON_DEPS}"
 # qtgui[gles2-only=] is needed because of bug 504322
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qttest-${PV}
-	localstorage? ( ~dev-qt/qtsql-${PV} )
-	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
+	=dev-qt/qtnetwork-${QT5_PV}*
+	=dev-qt/qttest-${QT5_PV}*
+	media-libs/libglvnd
+	localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
+	widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index d37169c54dbf..c097d060ca97 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,9 +1,9 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
 AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
 AUX qtgui-5.15.2-bogus-xcb-util-dep.patch 2685 BLAKE2B d281ae95f88f853cf902438680c73b1660aa0e4df384c1b5b96fcf63d5ccef8f97acda57a077ec1bdf20fef64eca7be8bc1e329f90fd4d59e40b746c394725b4 SHA512 b4a7c65cdca80ec3ea9ee17db2bc07b69cee5da82b11ab6ae32cb7e05b6288e3d3ec8a82d91887e86a96286bea2c5918796131c71c5c5a076577dedd4b82189a
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtgui-5.15.2-r11.ebuild 4068 BLAKE2B 38d193e6d467324cc3e5429ff9523d414a657f1a3d63aff9cd7968ad881ce51f877f281f146311a47d553f5802b12ba1c580e19fe8316766a8d5a47f001cd187 SHA512 1cc1208ff2668eda04c7f6aee90e9b14aef3b0bd70ff101e99c81b2b0c62a0372461beec59ee43c9d0adb4306bad8265369e406971af8c4aaecc0a30c1478297
+EBUILD qtgui-5.15.2-r13.ebuild 3989 BLAKE2B 6d98b22538642fd6eee2c7d1132062d2eb1f60c1d737ba9415a8dae4eda9ede7f7276f7e6d74a305c064b490f9f8ed5867e4336555d87431530f68b1ebc90475 SHA512 6b40450d35b50ca138e6a334242a40967f207af4491e6f16f24a01deef990555f050f327bec7418e41c4250849a000fa0100f5fda156cfcc505909ceb6424ece
 EBUILD qtgui-5.15.2-r2.ebuild 4248 BLAKE2B 245ccc465ffa0a68ef3e0811072052511b28ec7b864567545f3bf2c35437a680d260c3f7fc9e44cb770186937fcb9e7641516efa3f485f4c18d486295b6afb56 SHA512 b3ec9c89421bbe6605c1f0b9f97706879274e675306d218975dd24352044850cd543df73c15e85f2e50462bd5c4205fddf45dc2a3bb265c53f4272a0b3521101
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r11.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
index 73a502c8255a..906ca6ad4263 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r11.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
 QT5_MODULE="qtbase"
 inherit qt5-build
 
@@ -27,21 +27,19 @@ REQUIRED_USE="
 
 RDEPEND="
 	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}:5=
+	=dev-qt/qtcore-${QT5_PV}*:5=
 	dev-util/gtk-update-icon-cache
 	media-libs/fontconfig
 	>=media-libs/freetype-2.6.1:2
 	>=media-libs/harfbuzz-1.6.0:=
+	media-libs/libglvnd
 	sys-libs/zlib:=
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
+	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
 	eglfs? (
 		media-libs/mesa[gbm]
 		x11-libs/libdrm
 	)
 	evdev? ( sys-libs/mtdev )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
 	jpeg? ( virtual/jpeg:0 )
 	libinput? (
 		dev-libs/libinput:=
@@ -49,9 +47,9 @@ RDEPEND="
 	)
 	png? ( media-libs/libpng:0= )
 	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
 	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
 	vulkan? ( dev-util/vulkan-headers )
 	X? (
 		x11-libs/libICE
@@ -71,7 +69,7 @@ DEPEND="${RDEPEND}
 "
 PDEPEND="
 	ibus? ( app-i18n/ibus )
-	wayland? ( ~dev-qt/qtwayland-${PV} )
+	wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
 "
 
 QT5_TARGET_SUBDIRS=(
@@ -155,15 +153,15 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		$(usex dbus -dbus-linked '')
+		$(usev dbus -dbus-linked)
 		$(qt_use egl)
 		$(qt_use eglfs)
-		$(usex eglfs '-gbm -kms' '')
+		$(usev eglfs '-gbm -kms')
 		$(qt_use evdev)
 		$(qt_use evdev mtdev)
 		-fontconfig
 		-system-freetype
-		$(usex gif '' -no-gif)
+		$(usev !gif -no-gif)
 		-gui
 		-system-harfbuzz
 		$(qt_use jpeg libjpeg system)
@@ -175,7 +173,7 @@ src_configure() {
 		$(qt_use udev libudev)
 		$(qt_use vulkan)
 		$(qt_use X xcb)
-		$(usex X '-xcb-xlib -DUSE_X11' '')
+		$(usev X '-xcb-xlib')
 	)
 	if use libinput || use X; then
 		myconf+=( -xkbcommon )
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index dc6944c1e3b9..e1e0313ef428 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,3 +1,5 @@
+AUX qtmultimedia-5.15.2-no-qtopengl.patch 445 BLAKE2B 9224c90ef5a57b0da8c5ea5a51eb03d4702824fbb435101d5d9d559bdc4d30ece2de7457ed1bb80ca7f028a0b1a5abfa7436501d5d30c87680fb46707de17f53 SHA512 2f3dbb4dcbcedd01e3d911cf1f665e78dc08b383a5c8f2e17f96072330242e7463e6e403159f90f60b799110371ca923f502619548d5db3fd264af4298e4b587
 DIST qtmultimedia-everywhere-src-5.15.2.tar.xz 3828172 BLAKE2B 6d492abdd563788e601eba8183197863f5ddf0697c8f72939f8d6de8043d0575333bc6effd17182a2b5e2e0a93d6f431054282ad34f4ea0f0a0a67e1502a948d SHA512 be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd
 EBUILD qtmultimedia-5.15.2-r1.ebuild 1505 BLAKE2B 7e9049970a904dbec7accd0db053faa8e6755f93296cc3f2a67ab15b28c35814ab31f218abbbe1f21c0be7bbcee6b13731fa962137ca80597517c0088245586d SHA512 fd943e28d689fea3af9cc1dbbb66fc1c5a101201e2b79bf7be72491038c3e5c33b8628c99334d75a7b2714ca7c0b3de76100023d41eca95ceba3af6b3eab9414
+EBUILD qtmultimedia-5.15.2-r2.ebuild 1561 BLAKE2B 56234e911eecafeb404ea2169d4bf5c6d3efed4499b1ff66dcd5cc22a96cec010214c6383fe2b2d7f29abbc44170bd73379371229034cd05543f44330e905194 SHA512 fbfb974306297bedfc281117abe5938423ee618bd4c95eb188696d65eaefef1cf202be988db2060f59f9915d4e52f3fb8ba53a340587e0028eecf24bc9c93db8
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
new file mode 100644
index 000000000000..471bfabcce8e
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
@@ -0,0 +1,14 @@
+Widgets were ported away from QtOpenGL in 5.15.0 but bogus dependency
+remained: https://bugreports.qt.io/browse/QTBUG-81902
+
+--- a/src/multimediawidgets/multimediawidgets.pro
++++ b/src/multimediawidgets/multimediawidgets.pro
+@@ -2,8 +2,6 @@
+ TARGET = QtMultimediaWidgets
+ QT = core gui multimedia widgets-private
+ QT_PRIVATE += multimedia-private
+-qtHaveModule(opengl): \
+-   QT_PRIVATE += opengl
+ 
+ PRIVATE_HEADERS += \
+     qvideowidget_p.h \
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
new file mode 100644
index 000000000000..8148aa4f31be
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
+
+RDEPEND="
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
+	=dev-qt/qtnetwork-${QT5_PV}*
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	qml? (
+		=dev-qt/qtdeclarative-${QT5_PV}*
+		gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
+		media-libs/libglvnd
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-base/xorg-proto )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.15.2-no-qtopengl.patch" )
+
+src_prepare() {
+	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+		src/multimedia/multimedia.pro || die
+
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
+
+	qt_use_disable_mod qml quick \
+		src/src.pro \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/gsttools/gsttools.pro \
+		src/plugins/gstreamer/common.pri
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index f3b6950dfce9..3ef32e3b2004 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -2,6 +2,6 @@ AUX qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch 2104 BLAKE2B 2fdeae57b0
 DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtnetwork-5.15.2-r10.ebuild 1669 BLAKE2B 72015a1cb1e1e612e9dffc22554adef8b773ba6dd13dc217b315d87ef9110085795134634a16c3b696a82d6781c1be06a0825703eb4fb69f441cea15afa69d68 SHA512 3838d35dd549f8fdd35ed39834281bf676549a794daf93cfb9da01b5e9617825fbd6938e1e29dde1bd9d0f92493f2ab1d0634ffc2c25e87aa9d0eb4e9b421ad4
+EBUILD qtnetwork-5.15.2-r11.ebuild 1667 BLAKE2B 8113d59ac2a52e4c73eefac8a1124094e6170b03ffefa738c899d3bf6796e943cdd71c52a59e37836410fdad63529bef37021ed59d5d0299aea72044eecbadb3 SHA512 1b1c04abd19815465bc660f86c98f12124d2b6a3c26c9f4ffdb8ff7502bdd4a60989cc01cb735c7b3809c1a6d1755bd2b1aff26a7b60c85bdaf5b75a689882b2
 EBUILD qtnetwork-5.15.2-r2.ebuild 1835 BLAKE2B 683c4b2d419a041c89c08975db612d0e2c40d6c1969c7ce77640fd1c3259b39772485d89114fe71ceb7f3232ccb4b9cda9d3e2aded1b62ea8bd191116ef28e39 SHA512 2c58ed1f755b4a2b982534644aab38f0d59017ebc0168b79e77e1b3f6450f922edeff12a54f7701952baff278e02569b5cd41ae960b49b6fe0292b773109d6e4
 MISC metadata.xml 958 BLAKE2B 7d9b64c45710ec4b80132463178d63563b09fdb7c79f527a84017faa524f6f45f5ff566abea92f8cee5f9c62c7d6bb505d3789520559fd3864f402c18c35f771 SHA512 11948c91b244c607f2cd84c8165db6794be18d0f465ae27ed02086fcc1f8b3755e451b8203f447a05f53437cb04c8e4859de8e077f85360fe87ce846939408c1
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r10.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
index 15b485299326..e7c99f63ba76 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r10.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
@@ -16,12 +16,12 @@ fi
 IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}:5=
+	=dev-qt/qtcore-${QT5_PV}*:5=
 	sys-libs/zlib:=
-	connman? ( ~dev-qt/qtdbus-${PV} )
+	connman? ( =dev-qt/qtdbus-${QT5_PV}* )
 	gssapi? ( virtual/krb5 )
 	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
+	networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* )
 	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
 	ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] )
 "
@@ -54,7 +54,7 @@ pkg_setup() {
 src_configure() {
 	local myconf=(
 		$(usev connman -dbus-linked)
-		$(usex gssapi -feature-gssapi -no-feature-gssapi)
+		$(qt_use gssapi feature-gssapi)
 		$(qt_use libproxy)
 		$(usev networkmanager -dbus-linked)
 		$(qt_use sctp)
@@ -65,6 +65,7 @@ src_configure() {
 
 src_install() {
 	qt5-build_src_install
+
 	# workaround for bug 652650
 	if use ssl; then
 		sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 2da09abbef2a..46caf56875ec 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -2,5 +2,5 @@ DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 EBUILD qtopengl-5.15.2-r1.ebuild 827 BLAKE2B f0cdf498740c5fa109d2700284f5476c85c9dee0bee3708c8777360bab704b88b0d04387523a5a31f246acd40178caca6a17faf60e01c1ce05d19f95ca6e11e5 SHA512 8df750310b2f177a529d36061589756e36cd387fd935174c94e47af5bab79ceec631a3bf7b2d94ec8f3c82048d2b11dcbd47e9c8d9d1ebc873eb0d6f96a2e00d
-EBUILD qtopengl-5.15.2-r10.ebuild 744 BLAKE2B 4551b8c6519f789566cf85dcb7edad18f422d1748b7591940b3236d19e97b4e496408a1c70c9ba451554decb9422c8e4c3fdc61dc7741903080f5f843e273d9b SHA512 050be84aede1f8bd320b92c6caf3122b55b376f8596861ae9ab3c1ef20213bc41554f8a0c29885f18a336e48f3cfeb1e6da96fab6cf5b696bc09f635b38efab8
+EBUILD qtopengl-5.15.2-r11.ebuild 726 BLAKE2B c77235fa727462bba6a2f69b6919a1d93e9ced71e597cf88b75da96c4fdabe9e11669534a5db3bb028259c2b890fb45f0f336bc96f412e0340a46b873d8611f7 SHA512 b21e51683a0957a455971df43ba1018edd460717739f126ab213d5b1d1052cee78643388563d7e980d0f27581790a2fb543d395f8469725e5ff823c6e0f12a1c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtopengl/qtopengl-5.15.2-r10.ebuild b/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild
index f17a22b05e76..0a0961690b9c 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.2-r10.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild
@@ -17,10 +17,9 @@ fi
 IUSE="gles2-only"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	!gles2-only? ( virtual/opengl )
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
+	=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 506a302451c0..20f8bdd74381 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,5 +1,5 @@
-DIST qtquickcontrols2-5.15.2-a2593ff9.tar.gz 9243099 BLAKE2B 56a3b57e4f70ae18fd91afae6bd1a5242e0a582aa386ecce2d9b682dd97f8d044e2bec23295a7945206aa4346344cc294eace0f5ceed1e8654af2de5a79f2759 SHA512 915b873850d042580c3de1641d916f778da89f4b0dd7763254891fb48c99daece1c1c6888f9f8560d73617edce41e7ef4e712af965f12d29179a0bc70627556b
+DIST qtquickcontrols2-5.15.2-be66bf9a.tar.gz 9243427 BLAKE2B 7fcb46a69b8ea5a149f489b8ef6302185976fcf2a1afbcc19a05156647e00e037c9b447d763f0e1055464ece9bef0daa12e1b094d91d61c1a20f06727c232ae2 SHA512 7edfacbab302e3e0492d7bdf2b2b761818104452be95e20d52e2bc2649ca684ffb7e6ce709ed47ef6072b965cd63e7943746b193ec3a959dbb9a5540cc5a7567
 DIST qtquickcontrols2-everywhere-src-5.15.2.tar.xz 8284692 BLAKE2B c5c4550ff75bf655969b8601f36c38a0d5a6c9dbe406bc03d431c133f8f0b83a89098c3a64afa4073e4810ee73016a19e11fde1685732c3a9124ddaa2b21393f SHA512 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f
-EBUILD qtquickcontrols2-5.15.2-r10.ebuild 673 BLAKE2B 432969fba3ee4b17b1cc005abc88309294c16e5542b41e8bd05721cb9608f831acdec13f4ecd2c187392482e92a3fef451b29cca232e78ce5677ab00c2721a73 SHA512 e99d7edfc475214b3b553fd86b73d13bf5d78e0d7d5eee0113bc9ff4299debd63bb3b05cd6bc613655edd3c892e4c0855dbdcd0062162e96fa5aad917841280a
+EBUILD qtquickcontrols2-5.15.2-r11.ebuild 698 BLAKE2B e568f2aea0482c89ee7ca388acf530387f6bacbf64b917a9934ebb54c84ce34952b2db069a28620b94ef77bf20384df370e9073e3a90c5be49ce64195e3f973b SHA512 42ae241c0082473e6462184856c83f0a03956d36f99bf070537354e6859bdedcdd49e0479f451cba4d6ade109720fa9e60c767ec67b94b678065afec9cc284cf
 EBUILD qtquickcontrols2-5.15.2.ebuild 613 BLAKE2B da66e8d09b01a0818ad23e32fd627b955c8cde3a86130c349da5f1ce301036eb2339b48aed95545275b290df55fce18c23598d7ee08e8b7db3cfa3c380e46532 SHA512 d272f73610dd55378ae08e9df01a3ecf59903924ef01c2e05c7d33976ad2655cbf747ca7ff70d8ddbb5b27561be7a37fa1548a536e9103a1068c62b46859b4ef
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r10.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r11.ebuild
index eb0d955e9421..d69f36c8cde2 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r10.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3
+KDE_ORG_COMMIT=be66bf9a5618c745d2a6ee2262967af6307b3b07
 inherit qt5-build
 
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
@@ -15,13 +15,13 @@ fi
 IUSE="widgets"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
 "
 RDEPEND="${DEPEND}
-	~dev-qt/qtgraphicaleffects-${PV}
+	=dev-qt/qtgraphicaleffects-${QT5_PV}*
 "
 
 src_prepare() {
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index ac3cd88c010f..6d1df469fda6 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,3 +1,3 @@
 DIST qtscript-everywhere-src-5.15.2.tar.xz 2663016 BLAKE2B f3cf09396fbcd9c386de9628042d2b70263343fec3e1fa49e53e705f56802a244373a37e5daafe6d90252ad67a8b1d3e0446aa4520ff8ff4a8bd010951a5d86e SHA512 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32
-EBUILD qtscript-5.15.2-r1.ebuild 696 BLAKE2B 4e9a59a088bb9f059977507b668b505118875ff8bf67a25769a3f55ec1a717701b066233f83889e02c55ce806120e3d59fc667366d114cae71dac6bd9bf6a698 SHA512 19f14e37efc672da5f02a90530b5e357750b123d785f4ab3913d39cfeabc3a28aed7a390e294dfee4a22e2f52491d6dd3d0844843ef9cf867f0835013e93191e
+EBUILD qtscript-5.15.2-r1.ebuild 685 BLAKE2B 694f2b109b5969defcbb57b3269ab134ba2c96a3101e8fc51d11fb8d500719185ccb4648d5991b5d6dee077fb743337d0e27530deb9ed54a608b79e11f1ef560 SHA512 13f57b04fa8f39f26e50190165329ad30d3775656f1ea0d7abf9e27b3baf9ac11d2fdcfb00edb542fa3e12da197dd3de1e8085cceb2ac044d8cf9f30b1b36321
 MISC metadata.xml 583 BLAKE2B 5389c382561f060259c9eb626a98fa6d1861a33cffb3ca62899cfb6f1b020d6841314edd05c4fd0e5f05593f6015af8826f1d087078754a3dd31ae72be7da4aa SHA512 f8d07eb515db1b455670371655c572aac73653a2d1af68d8a226ecfeaf77b62737114a66bc41375cf7f32d575df792a685298487a90c650b6c6dfb4a7c113181
diff --git a/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild b/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild
index 00e1e6cc7370..b855afed554e 100644
--- a/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
 
 src_configure() {
 	local myqmakeargs=(
-		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
+		JAVASCRIPTCORE_JIT=$(usex jit)
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index f54703e6bda9..7780ef5e2de4 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,5 @@
-DIST qtvirtualkeyboard-5.15.2-2f0e9f98.tar.gz 13693484 BLAKE2B 88cd048af73c208772115a10b7c4eb7fb78f8598bcb4ecea297e5b7115aa5eda21e47ee062c26c810781de22af4e9abeec67a55761443a89cf381fcce3ee4df8 SHA512 67afa86666aa6f55263053f9b9e76fde94232cd65c44b0edcc91f4f2c1866f699f60122b31a97d5e577b1d9986211fa5e1e0bc0b2ea86cec488a07a462e88e40
+DIST qtvirtualkeyboard-5.15.2-353b75b2.tar.gz 13693438 BLAKE2B fc803496c2b56967e6b5d192805fa577072561cc55a891957e47985cec6d4971aa055e2d9d9b2e585d182426ec835f604279f7bf9882fd50ead9c65d29f91e5b SHA512 0152ad3848dd856ca4d3551e4296a68ed3bc7cd8d8dd45655232ca64586c1ce936ee819dff0dc3e2f6779a70f1faf5ae3d3fd2183a69f9313d943c506391b167
 DIST qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz 10955076 BLAKE2B 629068b92f58e825060410c84906edbcb9d83f942f1d4acfc1aab9404eb69e0ffeca0b5ca69a3d4b07033efb80ef161f23474e0a19ae6d9c4efb7698ba0a0d75 SHA512 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016
-EBUILD qtvirtualkeyboard-5.15.2-r10.ebuild 1268 BLAKE2B e9140ba0bebadc24e250b980b4d2502f0f5c6389f9bd2aefd3c67a944c94cf25eaf83d5aae93e3ece2354ee1727ca394f5a5de269a9378027a61be89e1a30f99 SHA512 834beb8c202fb3137d8fee0b69f9b27a783a46de8d925f29920d8fe741efe236f8d43dab862f506eb50069316c99a2af1e1cb402f9e4fd1b5afd44aebc0c3b73
+EBUILD qtvirtualkeyboard-5.15.2-r11.ebuild 1280 BLAKE2B b8dc16302b35ef34fcb85c78565bf4efea41d5e2cd7bcd3ce39fde842a5ef2bb8df081d2143d0e4976fd4f10006d0dd91347923e8c65046e8a7c19766e543319 SHA512 8d071a4c9731d90c07c8468a5300c8870e9b6290ddff905b838a4cb74657499c10ba1752d23fa489aab0425349ca7f97ae4e9d25a396c29315daf5c047ef1bd4
 EBUILD qtvirtualkeyboard-5.15.2.ebuild 1208 BLAKE2B 9dd8f4af6e11c38e20eed246826c773dc39627d1c94841586124a89002a1fbe89aa948806b1462c0c283d6bdd46d472200ddf87e701da58fb5537bda67cafc22 SHA512 1551e08535a9e02bbd7beac31f6c73ff153f68dba53e4681432962d6a7e4cc2114e3515757fe34f209c1cb14337415ea80acf131751c585d575a5550a7d68723
 MISC metadata.xml 580 BLAKE2B 18223136bcc07b46ab272ff282bcdce54dad6e6d97fe39b5431850a8960992a16eed32a580980748368ff120ea50ada55be823ba1e16950856462979835562fb SHA512 e865c0a030aeffbf270300806f99d1b2ff4ca148b3e1a3a901df25d1193e84d63a99b643da033a469dfbdbc99e559f71addc7671487c92d94e9019e742977020
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r10.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r11.ebuild
index 5b16d81a99bc..5a535f1c9930 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r10.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=2f0e9f98c6c6fdac09f762d41fddcc114f64b28a
+KDE_ORG_COMMIT=353b75b2e34bdae901625bbddf5c5e3f3e6c0de5
 inherit qt5-build
 
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
@@ -16,10 +16,10 @@ fi
 IUSE="handwriting +spell +X"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtsvg-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtsvg-${QT5_PV}*
 	spell? ( app-text/hunspell:= )
 	X? ( x11-libs/libxcb:= )
 "
@@ -27,9 +27,9 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local myqmakeargs=(
-		$(usex handwriting CONFIG+=lipi-toolkit '')
-		$(usex spell '' CONFIG+=disable-hunspell)
-		$(usex X '' CONFIG+=disable-desktop)
+		$(usev handwriting CONFIG+=lipi-toolkit)
+		$(usev !spell CONFIG+=disable-hunspell)
+		$(usev !X CONFIG+=disable-desktop)
 		CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
 			lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
 			lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
@@ -39,6 +39,5 @@ src_configure() {
 			lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
 			lang-uk_UA lang-vi_VN"
 	)
-
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 795260cc2067..693c3103e6f1 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,6 +1,6 @@
 AUX qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch 1650 BLAKE2B 37091d2be8194d023af6463130879d6d4649f802539d77b897bca222bfae13761f82213118d41d8dbaef91b63c05ca4ab140cd071e749baf78852287ff522508 SHA512 5a4f287731231fe11e755648aff54bc99f25e3d4bc274eac94511497af9d2d0e287760d52a5f103554e505450ad304f378a5f53ebde9bbf742c8bbc2beab1f09
-DIST qtwayland-5.15.2-d4c41797.tar.gz 829183 BLAKE2B 2a185e724dc4bb409d588664adf956fc16ab2115f5f2a5217c7654312f320402ef5b247aae44ec021c274b2a070698b2e6771135d604baf8308d8d33deffc55f SHA512 2e8e6149f6ffd5379075c235ea334aac0663e1c888291a564467c46f8073503d6b6c3c0cf9080cfa98c1d8742a6295c9b9aff877afcf06e8efccd0b54b1b9389
+DIST qtwayland-5.15.2-3c420cd1.tar.gz 829193 BLAKE2B dcd6f466184263b8988f5ae8e8cd47d22711ec791d5f7afdc156ce6de31488f6b37970bac00edbbe9a485b3627f86f865e45d9515e48eccf37cc12a831d7740e SHA512 d4e247d08ed17a31073005b4bef818571cd1268f8b4a430dd366f680a0f652d3aa321ea264efc88628405ac254693bdc1b34d32a2bcb14f4d987d5380e4cedfc
 DIST qtwayland-everywhere-src-5.15.2.tar.xz 564884 BLAKE2B 472effd3e9f3fd5470e0449703a52d45f2fd823770880b5ad15d8bf99196eee5d8511ca2bc9e23df6e27c933551d1853928ba79b4b1e5fa6e53334c54c04a463 SHA512 e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c
 EBUILD qtwayland-5.15.2-r1.ebuild 916 BLAKE2B c319d05e9293595a50613e687f2242da18a8b49af854f9c4f46356642472762cd7659d6ec0f3b3c41eedc5d40a631001c88dd6435aae9eb94c32d7ee4233d322 SHA512 ed27a404fe9fa2a9d2ca5216cd017c9fcd2ba40f7d55758a5337ddc9040d3df9d5cc0c3610561551e0b640cd5902cefd2cb978f7e2003fa77aab4e0b57ae59e8
-EBUILD qtwayland-5.15.2-r11.ebuild 904 BLAKE2B 86d9a2e59de0cc333067749f4661e3b213ce871d0ef43b5bb2f21286bca51970fcdcd72e27aa992364288b6da97d3e31522e29dd61a69e6ca8a9de85b36730aa SHA512 e52bec1c27a07c11db93fb47f4d4e1782558adf37d9858b771640a2156e1bd41fdec7c432935abb5d3a1c5f1ff10d19b29cc377a1413d07ad4dd2b726cd39a52
+EBUILD qtwayland-5.15.2-r12.ebuild 923 BLAKE2B 8714d001f3dc1c3aab3503eb9dc1b1715793fe00dc69eaf1dd6c34fd0e3941904711a5351e9b062d7a03d7a6acecdc91f58a7f12026da1e16f07a57cad0d2ed9 SHA512 044c855aec9a16740aebd8b2d86d27ef74ec91017afe3353d33fa85b3785e7041392ed05213f42b79f94b4e2f5c7ac19b3052af3bd3508210918bb5678738822
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r11.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r12.ebuild
index 61945b0b2d0d..89a557d9935d 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r11.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2-r12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=d4c41797b61a5a8da47c5821711aca72e756dcbf
+KDE_ORG_COMMIT=3c420cd180397e3f42c8a436a7f1b11465925bdd
 inherit qt5-build
 
 DESCRIPTION="Wayland platform plugin for Qt"
@@ -16,14 +16,14 @@ IUSE="vulkan X"
 
 DEPEND="
 	dev-libs/wayland
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtdeclarative-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=[egl,libinput,vulkan=,X?]
-	media-libs/mesa[egl]
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtdeclarative-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
+	media-libs/libglvnd
 	>=x11-libs/libxkbcommon-0.2.0
 	vulkan? ( dev-util/vulkan-headers )
 	X? (
-		~dev-qt/qtgui-${PV}[-gles2-only]
+		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
 		x11-libs/libX11
 		x11-libs/libXcomposite
 	)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ee12e40b527b..0508bdd0437b 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
-AUX qtwebengine-5.15.0-disable-fatal-warnings.patch 414 BLAKE2B 531523ee8c85d6ac51637b3bfd4fbcd56476e1231103c0db62b7c27ace4d5e070becb97beb74526806101c138669adc81a00eefe319ff96582df4743ecabcef8 SHA512 4e3ae727f2738bcc011c9fdd27593d9689206573ff7f17a51fd78d3aa25d427b899af78c098c278f6e7ab4ce88bf415e7382a8a635dd880448a75e6756abc680
 AUX qtwebengine-5.15.2-disable-fatal-warnings.patch 442 BLAKE2B d2f303f03f817c1e10d0c3c64deaefce773cb63852e8a37ba1c4611e26e850c5722e708425525a6fbfe170ce757a7fcb89e0324e3ea41f4ddeafd4bc15cc5c3b SHA512 79503e9278b50b5ac799852958850c54027c329f32242747514bbc7253192893c9ce5b9c6feeae7918f9e0f4047526adfb1c9ac9c0c5dcc625fe7b1507a93d23
 AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d43f1bfb8c2e63e691f2f0c4b10ef5367bc71b12fb6d161767f7669825e423c08af83e70ff744dd08facf92281c431de90a36847e SHA512 8e29e4e3c2085e5bba9c5a6ce7b366814767bb421132474cae413bba81217a70aec941b09a63d1f914c1e6b9e417b108df236d0b9d39e0df4b4d74111ddcda47
 AUX qtwebengine-5.15.2-extra_gn.patch 503 BLAKE2B 7949b35e725d920605ee7337de7aa29c22dee43ffaa383b4351e1e4170b06755e8b16eed28faf004486831fb020cd4fca1d5e54f61e99b7c8f084cad0d5d847c SHA512 2d916d918a1b12d91387da8b1161b15d33a55a9445de9725927fb88bb91666506a91df0df9224ec4a273b0c3f2fd3dbb2bb10857164a4204023f277707c099d0
@@ -9,8 +8,6 @@ AUX qtwebengine-5.15.2_p20210521-gcc11.patch 3642 BLAKE2B 9b5085dbb201b12c3476bb
 AUX qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch 7642 BLAKE2B 3650865736f4fdaa3fcb6146da8607710612a7652053f314ddf21e6a1f9c9acfd48bc26e048091ecb3096705c91529b264198812ceca774754c19911ccbef23e SHA512 f2168d125f5c4e3cb7e1c33924cbef687291e0f172b0f079fb8f8ecf8790247437bdedbb58c3f916ef93e8b991485cc3a14611500212b7b7f5d56c7b55e83941
 AUX qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch 8346 BLAKE2B d305461d127bd95b7bd3be58cb1488212f9af8d934f2519b82416f8a4237238b02f4ed2a7cb9cba7145ae44e48725a28f6f41f9250d052e2a58670724050e825 SHA512 1e99d95459509c58fe185d3b39f9b46b19d5052ea5927254f283de1dacb02cd94a208a72f4bd85517254c933c9990b570fe40e23b4e6ed2067f16be3bc30996c
 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
-DIST qtwebengine-5.15.2_p20210625.tar.xz 320144708 BLAKE2B cd11e69a34ff0fa07d26262906a12304c39a12575024d61db18bc696284e9c5700090e5bfed217c89d2c8eac49b0ccb7d7ee0ba716ec3a81878de1301566884d SHA512 517a8cdaff684894456db8cfb5cfca412b8764e7035623d8190d9a06f6995742097a53eb67329d12bf8dc0a56372f7d09a54532ba804a5bff245ca8ef042a4e1
 DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6
-EBUILD qtwebengine-5.15.2_p20210625.ebuild 7233 BLAKE2B bf4cd6335662386076828df5f5f323d9c3ae0943074ac46e8ca684433a003e72caabea226f6de5f7f8dafcb86d8c56a23881f92ae1ffbcb9e328c5d672220f3a SHA512 aaadc7463ce4236f0f0bc810ce10e10094fcd8c0ff01476c8a6f43761aae1d4dff9e0216d94a2d6f263c054cdcf1aa3215771663a30bf4ffcc44e04c252a3bb9
-EBUILD qtwebengine-5.15.2_p20210824-r1.ebuild 7482 BLAKE2B 04f538d0b2fa01dc5713cede7e248c674dbba153d0b9ceef3d7d337927dfd70b725bea9064649d13506b0a57e978ca0c159f38116c8a2c9da74e952903cf7860 SHA512 4e49fd72cba906f8999ae40de86affe8a69e1e92196c3191970984a3d311b9d1d4870dabbd1cd89f18ee54ca18092231b9a7b4cf1011fd9383745234c71a1416
+EBUILD qtwebengine-5.15.2_p20210824-r1.ebuild 7329 BLAKE2B 195c450f0a1fb24cc9ccda3d527944866e5507d9b9eeedb0f5d7d27e477eb1283be4254d931de133b1763704fee5d100d1ec8680ebdcf70425c47e13615374f5 SHA512 2793f9052fc3eb4a8a278486efb5219f50efd615965b6b25cec9656936cfc90e2e37e82df5ac3299981e22d1ec3be7342048834d5df74360d88f5eb94d01fb36
 MISC metadata.xml 1270 BLAKE2B 6ac8693b4a994904a8d7dd5728a0f47679b2b7553750a17fa64a7b8fd8cd74abd54ffbcb7da00d5b43622a67dedb3e3bcc93029bef2872e921e333a24892ca47 SHA512 4675ec29c3d6ac329b177f10b920dcf75ea5ed18a21aee1c500ee28430d85fcaaeac6df28a942c4bdcdf8692196017b1ea456e9f66d129afd1254d7931083eda
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch
deleted file mode 100644
index af602855b129..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/buildtools/config/common.pri	2020-02-28 22:21:09.341072620 +0200
-+++ b/src/buildtools/config/common.pri	2020-02-28 22:20:26.702399180 +0200
-@@ -25,6 +25,7 @@
-     strip_absolute_paths_from_debug_symbols=false \
-     toolkit_views=false \
-     treat_warnings_as_errors=false \
-+    fatal_linker_warnings=false \
-     use_allocator_shim=false \
-     use_allocator=\"none\" \
-     use_custom_libcxx=false \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
deleted file mode 100644
index 3b18dfa1b720..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-QTVER=$(ver_cut 1-3)
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-HOMEPAGE="https://www.qt.io/"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	if [[ ${PV} == ${QTVER}_p* ]]; then
-		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/${P}"
-		QT5_BUILD_DIR="${S}_build"
-	fi
-else
-	EGIT_BRANCH="5.15"
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt/${QT5_MODULE}.git"
-		"https://github.com/qt/${QT5_MODULE}.git"
-	)
-	inherit git-r3
-fi
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	~dev-qt/qtcore-${QTVER}
-	~dev-qt/qtdeclarative-${QTVER}
-	~dev-qt/qtgui-${QTVER}
-	~dev-qt/qtnetwork-${QTVER}
-	~dev-qt/qtprintsupport-${QTVER}
-	~dev-qt/qtwebchannel-${QTVER}[qml]
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc(+)]
-	media-libs/libwebp:=
-	media-libs/mesa[egl,X(+)]
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/zlib[minizip]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( ~dev-qt/designer-${QTVER} )
-	geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	widgets? (
-		~dev-qt/qtdeclarative-${QTVER}[widgets]
-		~dev-qt/qtwidgets-${QTVER}
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-	ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
-	"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
-	"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
-	"${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
-	"${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261
-)
-
-pkg_preinst() {
-	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
-	elog "additional security fixes from newer versions. Extensive as it is, the"
-	elog "list of backports is impossible to evaluate, but always bound to be behind"
-	elog "Chromium's release schedule."
-	elog "In addition, various online services may deny service based on an outdated"
-	elog "user agent version (and/or other checks). Google is already known to do so."
-	elog
-	elog "tldr: Your web browsing experience will be compromised."
-}
-
-src_unpack() {
-	# bug 307861
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-		ewarn
-	fi
-	eshopts_pop
-
-	case ${QT5_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;&
-		release) default ;;
-	esac
-}
-
-src_prepare() {
-	if [[ ${PV} == ${QTVER}_p* ]]; then
-		# This is made from git, and for some reason will fail w/o .git directories.
-		mkdir -p .git src/3rdparty/chromium/.git || die
-
-		# We need to make sure this integrates well into Qt 5.15.2 installation.
-		# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
-		sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
-	fi
-
-	# QTBUG-88657 - jumbo-build could still make trouble
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/buildtools/config/common.pri || die
-	fi
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | \
-		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
-	if use system-icu; then
-		# Sanity check to ensure that bundled copy of ICU is not used.
-		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
-		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
-		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
-		local file
-		while read file; do
-			echo "#error This file should not be used!" > "${file}" || die
-		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
-	fi
-
-	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	if use ppc64; then
-		einfo "Patching for ppc64le and generating build files"
-		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
-		pushd src/3rdparty/chromium > /dev/null || die
-		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
-		popd > /dev/null || die
-		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
-		mkdir -vp source/config/linux/ppc64 || die
-		mkdir -p source/libvpx/test || die
-		touch source/libvpx/test/test.mk || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-no-build-qtpdf
-		-printing-and-pdf
-		-system-opus
-		-system-webp
-		$(usex alsa '-alsa' '-no-alsa')
-		$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
-		$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
-		$(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
-		$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
-		$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
-		$(usex system-icu '-webengine-icu' '-no-webengine-icu')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
index b1b5dd8a07c0..e3f9df28c79c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
 HOMEPAGE="https://www.qt.io/"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	if [[ ${PV} == ${QT5_PV}_p* ]]; then
 		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/${P}"
@@ -204,13 +204,13 @@ src_configure() {
 		-printing-and-pdf
 		-system-opus
 		-system-webp
-		$(usex alsa '-alsa' '-no-alsa')
-		$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
-		$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
-		$(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
-		$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
-		$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
-		$(usex system-icu '-webengine-icu' '-no-webengine-icu')
+		$(qt_use alsa)
+		$(qt_use !bindist proprietary-codecs)
+		$(qt_use geolocation webengine-geolocation)
+		$(qt_use kerberos webengine-kerberos)
+		$(qt_use pulseaudio)
+		$(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+		$(qt_use system-icu webengine-icu)
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index c6d6d858b8a1..490777bdd76b 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -2,5 +2,5 @@ DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 EBUILD qtwidgets-5.15.2-r1.ebuild 1188 BLAKE2B 9c2992011433a9f903dc6380f012f07ae16359e6eeb8b765ca2023c8fe46cf7c4e7d83a9959d0e652c8e75555e76abd17a8e1fe3fbc26a5562ff821fce0ec1b9 SHA512 fb7d0ef11ae6a8a1306c1ff86f47946049280a0de772eca84aab5c003eb5adfba9fd1a65881c2645bcf6ced24910646e67fe8ba199d1020b7964ec6e06e75fc9
-EBUILD qtwidgets-5.15.2-r10.ebuild 1083 BLAKE2B e4a33a34bfe6cae0822e933f14c1ed771600a28d57b482aa899c9dbc20dd8df9620e47384103dcc60820ec03dbf44c2b38c55597d722831792758346a832cdcf SHA512 61f3fb70d6f1a0fe2635c78b4926c3fdc952144f4845a731bdc6b936c44ccb4930271e1ebfec195f7ccac01d956634369ca91605438a2715752a31be7c011544
+EBUILD qtwidgets-5.15.2-r11.ebuild 1235 BLAKE2B 4180eb9f3cada8e31acd7d15d60e5ba4abe3b3c2230a898a8206522b9c3c684659dd8f430c1ed935c785f52656ecb833595fb973d7f6412b93e5d85c1d53c5c0 SHA512 e671386c5f562172e415035f85615177a0ad8c1d38827a700d8db0a39d4c2cb7b9990bb5793ed0e98a59ac53a3f1b9b26289268ea9b1c844c1392789893f630c
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r10.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
index ebc81a5c757a..4c5ad74f9d8a 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r10.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
@@ -14,13 +14,17 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2-only gtk +png +X"
+IUSE="dbus gles2-only gtk +png +X"
+
+REQUIRED_USE="gtk? ( dbus )"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
+	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
 	gtk? (
-		~dev-qt/qtgui-${PV}[dbus]
+		dev-libs/glib:2
+		=dev-qt/qtgui-${QT5_PV}*:5=[dbus]
 		x11-libs/gtk+:3
 		x11-libs/libX11
 		x11-libs/pango
@@ -35,6 +39,7 @@ QT5_TARGET_SUBDIRS=(
 )
 
 QT5_GENTOO_CONFIG=(
+	dbus:xdgdesktopportal:
 	gtk:gtk3:
 	::widgets
 	!:no-widgets:
@@ -47,6 +52,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 src_configure() {
 	local myconf=(
 		-opengl $(usex gles2-only es2 desktop)
+		$(qt_use dbus)
 		$(qt_use gtk)
 		-gui
 		$(qt_use png libpng system)