gentoo auto-resync : 17:04:2024 - 12:04:27

18 files changed, 134 insertions, 11 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index c00dfec5adcd..e8716309d637 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 58c51738c7e8..e9a68954b6c6 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -362,5 +362,5 @@ DIST 6.7.0-0-202403252230qtxml-documentation.tar.xz 341100 BLAKE2B 3b4eb622eba7e
 EBUILD qt-docs-5.15.2_p202011130614.ebuild 3233 BLAKE2B cec70539f86b4c8aa15efcf723679f735137206593183017a9e4b636cca7df8681ce6885dd2870459667492502067f9adf5cd45d93077862945456fcec6228d8 SHA512 4a7eab16f8e6008859b43d8742954209dac9e83cbc5c3fd1573e9cd73ae640ad9b11854aa5f54074b7f05ba08d0aa3f18b50ba0db5896662e38e85bdff34e642
 EBUILD qt-docs-6.6.2_p202402121133.ebuild 5106 BLAKE2B 143d9dcaa95105b37bf93bfb92703558577f5235df3880f803b91158e4c03d2383347dbaf18572850f3866f9ecd1771b7729bc926bfe22371729d4af364bfd40 SHA512 20f7b3206a23035e6981e2ab7f55b64640a4739643de02ce01144fffd848e82a766696045122549674d639c11ee761ac05b68c28ac144bae9c0bdebdd3d15f15
 EBUILD qt-docs-6.6.3_p202403191846.ebuild 5106 BLAKE2B 143d9dcaa95105b37bf93bfb92703558577f5235df3880f803b91158e4c03d2383347dbaf18572850f3866f9ecd1771b7729bc926bfe22371729d4af364bfd40 SHA512 20f7b3206a23035e6981e2ab7f55b64640a4739643de02ce01144fffd848e82a766696045122549674d639c11ee761ac05b68c28ac144bae9c0bdebdd3d15f15
-EBUILD qt-docs-6.7.0_p202403252230.ebuild 4819 BLAKE2B f6f3aeef51264c9d089a37fa62ae9cac821b7d46a031984e0bccd345113da167d84f9e4d5068979f3d570743f015ff7a99a9dabae62069cdb4b7104717f87912 SHA512 4ec9757de153afc7c037d7e404a0ef76b4256bea44de7396ff98430ac9a2784a5e869edefb4c1aebb50f72bde4b2f8d84a28bdbb14fd3c5faf5ce59fae395417
+EBUILD qt-docs-6.7.0_p202403252230.ebuild 4819 BLAKE2B bc3a714e200f6d3dcd870a6b2f1c436ffcc983207fd0da478976602cdd0ce63c2582c065d425a910f09a01e9db1d7cca048df152ef9f602d4157a8e745e9ceb4 SHA512 c2621223d517dfed40d2c1057f9d8f4d975fa9e427d22da1a79a97647bfab23df69cdbbf3ab8c52c5fb500caffb0b31ab614fa1463e7012a3961cde5dd84e73c
 MISC metadata.xml 5290 BLAKE2B 4bd7db247ead833a33ddca3f6d9c81773adfdcf776b02d49de7ca2e3b4a10ea8d9a0b07cd3f7068eecb954b93b0c77cf1d240df3ce33508231c2c3fb35afeb81 SHA512 7f6c6779880d1681e2dcac9273650f20690176bf47d7e3825d7d76b7f6db2cac92a2b1ecf3e2886fa724f5230e9bde703d3341a266ea05f19c2d2f3aee58c81e
diff --git a/dev-qt/qt-docs/qt-docs-6.7.0_p202403252230.ebuild b/dev-qt/qt-docs/qt-docs-6.7.0_p202403252230.ebuild
index 9316cf7db219..f0105fb148a1 100644
--- a/dev-qt/qt-docs/qt-docs-6.7.0_p202403252230.ebuild
+++ b/dev-qt/qt-docs/qt-docs-6.7.0_p202403252230.ebuild
@@ -64,7 +64,7 @@ qt6_docs_generate_metadata() {
 		-grpc/qtgrpc="qtgrpc qtprotobuf"
 		+httpserver/qthttpserver
 		+imageformats/qtimageformats: # empty examples
-#		-languageserver/qtlanguageserver # docs and examples are empty
+#		+languageserver/qtlanguageserver # docs and examples are empty
 		+location/qtlocation
 		-lottie/qtlottie:="qtlottieanimation" # empty examples
 		+multimedia/qtmultimedia
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index a681e1974d06..ba5e542e7c71 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -7,7 +7,7 @@ DIST qtdeclarative-everywhere-src-6.7.0.tar.xz 35360444 BLAKE2B 28aa00dfd59967eb
 EBUILD qtdeclarative-5.15.13.ebuild 1537 BLAKE2B c2f7b010977ed65abbe16d8b2df6ed8c29407685e014778f4f3da5b2853b6dfa6d5ce2a0d5037852d8d11894c1a33323090bd18659f7c85d8cdf56f8bf41ae79 SHA512 fd6e5bb4709174b8746d520a6fd0109e2d6b2de19d6a679fdbdcf4cf074dc778854afc2b364f7d692e6c60e0d3e3580c19e98b36368258f6e76b3a5ef2cff0c4
 EBUILD qtdeclarative-6.6.2-r1.ebuild 800 BLAKE2B b072059836526c122e5e0a509418d73f612093575910747097201b0abfbdc2a7dfc44a91d5317dfdd41631d9a5bc247d765ef31e343e6a914d2a18633edd43b4 SHA512 f82b798eab8b99c4ad8a876277cfb9248cdeefd759ec0c881cce8319a1deca39ca9d733e1e124d78b8f25807f998bc77225a7967712c9eb1018abae49b6da71b
 EBUILD qtdeclarative-6.6.3.ebuild 800 BLAKE2B b072059836526c122e5e0a509418d73f612093575910747097201b0abfbdc2a7dfc44a91d5317dfdd41631d9a5bc247d765ef31e343e6a914d2a18633edd43b4 SHA512 f82b798eab8b99c4ad8a876277cfb9248cdeefd759ec0c881cce8319a1deca39ca9d733e1e124d78b8f25807f998bc77225a7967712c9eb1018abae49b6da71b
-EBUILD qtdeclarative-6.7.0.ebuild 1030 BLAKE2B 1e9c15f68bbaf8f9efbcbbc2bd10bf68c11fe1d817d05789a52dfc895bc91975a448a702fe428a792affeda525bfcf8e91f2ed347ad7910b33c131104b6878e2 SHA512 c3c83c6036125e454adb07fb1cf1ce81ebfbfec0a29e03b0440e4a67f08060f2f599a2d472d4893ae111eb3bb79e24fd2074c1d2e7bc3edcc01122236f51cae9
-EBUILD qtdeclarative-6.7.9999.ebuild 1032 BLAKE2B c071fc90e00cb09bf147a4e59a58bad0f7d6134d37ca9bad94712210426d6b12ed2632441315b30cfe2ce80f849ffcccd9d6df96e348217795407ecb160f1acd SHA512 559a0ef86898e1e3562f0e8259ac4911231050e60ebea9a3344dc3e750f853d88f208e03873c96c4fdcdcd3680b441af3ef0e5dbf7c3a9fcd292b12faf2f0e20
-EBUILD qtdeclarative-6.9999.ebuild 1032 BLAKE2B c071fc90e00cb09bf147a4e59a58bad0f7d6134d37ca9bad94712210426d6b12ed2632441315b30cfe2ce80f849ffcccd9d6df96e348217795407ecb160f1acd SHA512 559a0ef86898e1e3562f0e8259ac4911231050e60ebea9a3344dc3e750f853d88f208e03873c96c4fdcdcd3680b441af3ef0e5dbf7c3a9fcd292b12faf2f0e20
-MISC metadata.xml 855 BLAKE2B 6be7ee8e497916e78de02244cba14f33434b37f34f901a3a789bc684ea509da865042b10ae37f12491281f846adbb0daadeb90205026d5fdd76d07755cd168c8 SHA512 0abf60e4c4624c698081871cadf757698ad4eded995c7c83f0edf739af2fa3be5f9a79f716403e40f2f8e09dfeeb5dd20342ec498fa121eb4cf9733462c8055a
+EBUILD qtdeclarative-6.7.0.ebuild 1140 BLAKE2B d6e7a0744287ef2f21b75049fd36d057b12c981aaeb4ec4316c31c4d3d10cffb1b54196f1356fc5e849d2b90516308f77974cc105c52d39e7025236328837cee SHA512 3b0b6f2ce774721ef817f1aa0f6186ea1e3d81e211d1fcc94f6ca20587939bef6a67e2f9ef8a3a648a6c2d1e683edbbbbd9d65dd3b420c3d0c4cb33f863b0a20
+EBUILD qtdeclarative-6.7.9999.ebuild 1142 BLAKE2B 45a7e31ef089de2fe44c1be643843dbd3e0d6d5be6f7283d2c7e5eeb0bb926293f963aab598a3260414fc23064310e704c181c131d8241e444ea562b48cb3679 SHA512 fc51b4e1bf9c31d0b090114f7d704c5c629bf28dc5bf0ee75dbaca7c8f3982eacc04ffb0adff091400b10e487152f65290988c7bdd42e24ee6f857ed70c2bf6e
+EBUILD qtdeclarative-6.9999.ebuild 1142 BLAKE2B 45a7e31ef089de2fe44c1be643843dbd3e0d6d5be6f7283d2c7e5eeb0bb926293f963aab598a3260414fc23064310e704c181c131d8241e444ea562b48cb3679 SHA512 fc51b4e1bf9c31d0b090114f7d704c5c629bf28dc5bf0ee75dbaca7c8f3982eacc04ffb0adff091400b10e487152f65290988c7bdd42e24ee6f857ed70c2bf6e
+MISC metadata.xml 945 BLAKE2B 8a5d26ab3274cb9ca8b7cf3dceddcd33d9690cd20194adc63b80cd5e13e11d222d48473232b4e2cb41cecf1f51b33df4458811b6fb622a41519f0f3f0223b578 SHA512 a4c587afdbb0320e0f23f47a3ae58e2f69e86a0f539bf613c275ab0be7b9490d33d9c9de35ace02d3cfef903f3e6c7caf492cfdfa53c989b2d56e6c7288f4552
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index 2d0b3fc41d29..b6df94c4541c 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag>
 		<flag name="network">Enable QtNetwork support</flag>
 		<flag name="opengl">Enable OpenGL support</flag>
+		<flag name="qmlls">Build the qmlls tool using <pkg>dev-qt/qtlanguageserver</pkg></flag>
 		<flag name="sql">Enable QtSQL support</flag>
 		<flag name="widgets">Enable QtWidgets support</flag>
 	</use>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild
index c82795f0d0f5..6385d3746191 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-IUSE="accessibility +network opengl +sql +ssl svg vulkan +widgets"
+IUSE="accessibility +network opengl qmlls +sql +ssl svg vulkan +widgets"
 
 # behaves very badly when qtdeclarative is not already installed, also
 # other more minor issues (installs junk, sandbox/offscreen issues)
@@ -20,6 +20,7 @@ RESTRICT="test"
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
+	qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
 	svg? ( ~dev-qt/qtsvg-${PV}:6 )
 "
 DEPEND="
@@ -33,6 +34,7 @@ BDEPEND="
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package qmlls Qt6LanguageServerPrivate)
 		$(cmake_use_find_package sql Qt6Sql)
 		$(cmake_use_find_package svg Qt6Svg)
 		$(qt_feature network qml_network)
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild
index b87689b35832..64a1db661828 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-IUSE="accessibility +network opengl +sql +ssl svg vulkan +widgets"
+IUSE="accessibility +network opengl qmlls +sql +ssl svg vulkan +widgets"
 
 # behaves very badly when qtdeclarative is not already installed, also
 # other more minor issues (installs junk, sandbox/offscreen issues)
@@ -20,6 +20,7 @@ RESTRICT="test"
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
+	qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
 	svg? ( ~dev-qt/qtsvg-${PV}:6 )
 "
 DEPEND="
@@ -33,6 +34,7 @@ BDEPEND="
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package qmlls Qt6LanguageServerPrivate)
 		$(cmake_use_find_package sql Qt6Sql)
 		$(cmake_use_find_package svg Qt6Svg)
 		$(qt_feature network qml_network)
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
index b87689b35832..64a1db661828 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-IUSE="accessibility +network opengl +sql +ssl svg vulkan +widgets"
+IUSE="accessibility +network opengl qmlls +sql +ssl svg vulkan +widgets"
 
 # behaves very badly when qtdeclarative is not already installed, also
 # other more minor issues (installs junk, sandbox/offscreen issues)
@@ -20,6 +20,7 @@ RESTRICT="test"
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
+	qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
 	svg? ( ~dev-qt/qtsvg-${PV}:6 )
 "
 DEPEND="
@@ -33,6 +34,7 @@ BDEPEND="
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package qmlls Qt6LanguageServerPrivate)
 		$(cmake_use_find_package sql Qt6Sql)
 		$(cmake_use_find_package svg Qt6Svg)
 		$(qt_feature network qml_network)
diff --git a/dev-qt/qtlanguageserver/Manifest b/dev-qt/qtlanguageserver/Manifest
new file mode 100644
index 000000000000..60cabd740a78
--- /dev/null
+++ b/dev-qt/qtlanguageserver/Manifest
@@ -0,0 +1,5 @@
+DIST qtlanguageserver-everywhere-src-6.7.0.tar.xz 145140 BLAKE2B 216b0b8c777361416d179dc970e4adcf78310eab603dba1907ff59bb1efa958ddcfc2de131dc37597096bb7f5d54bc68fe1c4f8a92eff23ef108abdbb9251dee SHA512 b3ebfd6e3093e6105dfda173cb8e8f7686e139621a882373f9a27ff7c3b7f7e4b10ccdbc1f71cab474ae6eddca4e68733a053b0045111575ff1f49741ecfe02f
+EBUILD qtlanguageserver-6.7.0.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17
+EBUILD qtlanguageserver-6.7.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17
+EBUILD qtlanguageserver-6.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17
+MISC metadata.xml 541 BLAKE2B 63c47a8da80c17d5203a53d31e6736ac288f00869b7e8291a4232966a0f2fd0cfc6b93161e996e8911d081ccca8e67675b1c8c11389ff9b8dd771b68156fdb4b SHA512 0dabf104c9e8bda0a72202e51d3e761974d12df24d8509f0a89ed559dccc3d92214ac06597d8e1c338db1c35849a35bcbfefc97c10736943f2da4168d5246a9f
diff --git a/dev-qt/qtlanguageserver/metadata.xml b/dev-qt/qtlanguageserver/metadata.xml
new file mode 100644
index 000000000000..59773d989592
--- /dev/null
+++ b/dev-qt/qtlanguageserver/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qtlanguageserver</remote-id>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.0.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.0.ebuild
new file mode 100644
index 000000000000..b02596ef5aab
--- /dev/null
+++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Implementation of the Language Server Protocol for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="~dev-qt/qtbase-${PV}:6"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild
new file mode 100644
index 000000000000..b02596ef5aab
--- /dev/null
+++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Implementation of the Language Server Protocol for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="~dev-qt/qtbase-${PV}:6"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.9999.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.9999.ebuild
new file mode 100644
index 000000000000..b02596ef5aab
--- /dev/null
+++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.9999.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Implementation of the Language Server Protocol for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="~dev-qt/qtbase-${PV}:6"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 7b742102b661..ee88b0caeddb 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,6 +2,8 @@ AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d4
 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
 AUX qtwebengine-6.6.2-clang18.patch 4565 BLAKE2B 73059ca5a86e8e7098e6d6228bcadef4477d7c21b02e9dcfaa8cb3525545c255f31d8a3b2608a91b7aa90cc6090effd18ba41f4969457e6af68614f74a80da90 SHA512 688ff84d742753e4c6ae235f09b32e5894e0cf704eca78f221b1511e4dec498d5b7615240fdeed27e9eeeadeca8822e51cb86172cc17eb271ee2578853b07b40
 AUX qtwebengine-6.7.0-clang18.patch 4862 BLAKE2B 0267bb9c9140cf9baa6264979297d1c218af2e68fde04cbf176b07d52a9e800f6758dad4b31372f9b8a09b7cfe3c6af2be556ea40b7fc07646d7a34f552bb720 SHA512 c13c38f7bbe6d40325fd41b56311cd94fe3a91f19795b2d59c420cb608251bba08146668d156e77f9ecf8e306b2da842b0440abea0b5f44455f1ab74ac245d44
+AUX qtwebengine-6.7.0-displaykey-header.patch 346 BLAKE2B d3591285c2c2b3b795818cc1da0a34307bafb01cdab2dd32df5645e83485ff1e332b257473f9475600d79557074b86bbd3bebfad4a740a2dd4dbff8189df4ea1 SHA512 346b1cf14d332af94c197558a41d12952575fb95ef97ed0b2ed35ac126f88809b30c2ac723fdd70e01253cd90c8b84347e5f7d1b03367d95eabb95ee4b667a78
+AUX qtwebengine-6.7.0-ninja1.12.patch 1173 BLAKE2B 11e1801ac32a984333bb8e81aed93471d3da330205508222e85140e1784654668dc1cf9e6a207d91f162568e0ff2d66c34c345084f62a4766745bd66f8927f94 SHA512 4cac6ac4abd17aa958db8c61026a80f4e363f7d8b4ed8fcc9660618e2fc2c7ff0eba03d3ca043755b28d9da65d819538b5f5982dff64ca1dea0043f7266ede36
 DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9 SHA512 cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166
 DIST qtwebengine-5.15.13_p20240322.tar.xz 301394204 BLAKE2B f9bb5bb79edbe0bc862a718feb3b11a56d8c6d2eee1dd711c9b4460f64308fdfbaa4c3551eebad3af5844564a49703574a7fb9d74e15abd0a6aeb8c707a14059 SHA512 b1f459fbb3d21118043a53ce6e292c6a45f8512830f4dbf6982713970f980ccfb8c1ea1c1d7ce373991632de8c44b5053fa1ccb883e19cd8f35a961e67472f5a
 DIST qtwebengine-6.6-patchset-10.tar.xz 8880 BLAKE2B 7583dbfbb60100dc669c780d611aa56034ba2172700168c716e06b37cfb8bb083a29b3ab36968ad0f34443224f7ce03956e6fad2734ac7ff62b2aaeba9e79fc4 SHA512 3cf5e597d7300b89297f15f10ffd7e24517f8762ecdc7b3be19f3c48bc16949ec47ebccf050d4416033e1915453c12b0e69ebb2defa50471cdb72794f8e05708
@@ -13,7 +15,7 @@ DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657c
 EBUILD qtwebengine-5.15.13_p20240322.ebuild 7285 BLAKE2B bbe6f1ab236d00678bd334ec33529fe15fe494c72edeecdb35004c804bb61c6f9d788359b1fdf2fa42d1a455b754716bd58db88e8f2328ea8226e1e5f01ce208 SHA512 4d3affbe7612d24f2e692b4a9b9d261024783b011a6319f337ea408470d464bf538f5addc9ce0f9b82114078003d14ec413e3456d1ba348ff1a85ec6c2b10606
 EBUILD qtwebengine-6.6.2.ebuild 9404 BLAKE2B bada4c8cfbf518a600835b2cc19efb21e3a34909fae7c37814ace181c8312ff2e8ef6cf431fe6a98c73261be29acd4713a7c4d3cae845dca8f1df8a9ce76fd69 SHA512 2d5c4638a51c3a678c45ae98da9a9d0958321e8fd36dc2cf4e0506fcbf104a12969e0c79cd142e8b25e6b8aa642f92cb321ee364121eddffa933410b96cb06bf
 EBUILD qtwebengine-6.6.3.ebuild 9393 BLAKE2B 2a1fa7cd0361f939a2f4a8f45c9b6e273ed8f9fa963cd6cc01f44a60f65aa5cffd51823d666f68b658e839c92f8cf2e03d548d64c92b26a436215d6229bbd453 SHA512 dd234a8963544b256d2dcf739e2e7a468bb4d1bfcbf75b5da3ee6bb0889b6421824cb52986a7c318da13aeea087ab512aa548e9c59a4f35426f78fc0006e9810
-EBUILD qtwebengine-6.7.0.ebuild 9772 BLAKE2B 05686d981f145a4df060fec8592bdd3a3d0d25c9134754d05c04ced03b884e4370c011ce4cc916c4e78488b63aad0397cb6ffebe48d98002541da14a6345d34a SHA512 9dc282903a59b50da7688ffe42a176b589327dfc4dba0b67e28a4d42efa9a873e96017e82d241b13e138df67a8e1b2cddc5cca3b55745f0ee8eb142e20cf80a6
-EBUILD qtwebengine-6.7.9999.ebuild 9774 BLAKE2B bc5dd440d6a58db487d0db3c85a0cc90d11fb689efcc219a2dca3ad1bd744b1c5d2a712f098507f790840474afd50fea13536c8864b2ad2438561c1558c36691 SHA512 22353f795973c3bcb583576c350514a469d4020a29261570b0e4a63186fb104476bd514d8796e1770448df477e745f554f531602a66897a48e938b5c6bdd0ae4
+EBUILD qtwebengine-6.7.0.ebuild 9866 BLAKE2B 228b79dd1352b9f2724a34968b5bc01b14f9ec50514ac9912e92fda9dd1f0eff677287452e2f2da6bd08418c6bf04ce8b57c5017ef1600868786517fae0df132 SHA512 5bc4350b3a16bd2a0f3ff79b830604da6cd8dbb30646f349d531ba659aad6ffb015c250895dacd03f5ff5f3db416418afe9f7456f0deaa2f3f8e966f4d018662
+EBUILD qtwebengine-6.7.9999.ebuild 9868 BLAKE2B 833d3ad6467e69f8497689a01bd71a0a583881c67e55624ac0f6020c33a21910f87ad50d3eb3059adb7b5a7ac8dc085d7b401af0b74a0aa74d3a76d76009e70e SHA512 4ff245c05d92b839f1326a4ac57390aa6829efa1e8b1b689cdd6b8df03ece16fc35408f399d486a6851d2bfc032ce4cf566853b8ad115670d3b764b07b6d7335
 EBUILD qtwebengine-6.9999.ebuild 9733 BLAKE2B bc70eaf049292cd42caeb8b678ef525f6f92d5231badc72e472b7b4f58e7966259079da653c45e7226a7d17fe7604d7ddf7c53ba8b119ada0097b9118e44fa27 SHA512 25e2b4f5bfebdf0487811b0b4a5bc45e72e67629729f924610605b4d0cf950bb8a057ec80f45ad5fab4d1743602a828a38398533b88fc253471d213642bdeb89
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch
new file mode 100644
index 000000000000..84dce821f80f
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch
@@ -0,0 +1,12 @@
+TODO: merge with glx-headers patch in patchset, similar
+issues that seem to stem from Qt's GLX restoration.
+
+https://bugs.gentoo.org/930107#c8
+--- a/src/3rdparty/chromium/ui/gl/gl_display.h
++++ b/src/3rdparty/chromium/ui/gl/gl_display.h
+@@ -12,4 +12,5 @@
+ 
+ #include "ui/gl/gl_export.h"
++#include "ui/gl/gpu_preference.h"
+ 
+ #if defined(USE_EGL)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
new file mode 100644
index 000000000000..2d12daccd224
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
@@ -0,0 +1,30 @@
+Patch status: pending being looked at upstream
+
+Issue[1][2][3] also exist in chromium itself[4], and unclear
+why this started happening only with ninja-1.12.0 at the moment.
+
+Just a quickfix, likely not fully correct and seems there may
+be further unresolved race issues.
+
+[1] https://bugs.gentoo.org/930107
+[2] https://bugreports.qt.io/browse/QTBUG-124375
+[3] https://github.com/ninja-build/ninja/issues/2417
+[4] https://bugs.gentoo.org/930112
+--- a/src/3rdparty/chromium/content/browser/BUILD.gn
++++ b/src/3rdparty/chromium/content/browser/BUILD.gn
+@@ -198,2 +198,3 @@
+     "//components/services/storage/public/mojom",
++    "//components/spellcheck:buildflags",
+     "//components/sqlite_proto",
+--- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
++++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
+@@ -22,2 +22,3 @@
+     "//content/public/browser",
++    "//components/web_cache/public/mojom",
+     "//extensions/common",
+--- a/src/core/configure/BUILD.root.gn.in
++++ b/src/core/configure/BUILD.root.gn.in
+@@ -235,2 +235,3 @@
+   deps = [
++    "//chrome/app:generated_resources",
+     "//components/zoom",
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index ce4b07c90f2c..997dbaf4ec5f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -108,6 +108,8 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.7.0-clang18.patch
+	"${FILESDIR}"/${PN}-6.7.0-ninja1.12.patch
+	"${FILESDIR}"/${PN}-6.7.0-displaykey-header.patch
 )
 
 python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index bab0b63fc807..f9dd54161654 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -108,6 +108,8 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.7.0-clang18.patch
+	"${FILESDIR}"/${PN}-6.7.0-ninja1.12.patch
+	"${FILESDIR}"/${PN}-6.7.0-displaykey-header.patch
 )
 
 python_check_deps() {