gentoo auto-resync : 03:07:2024 - 08:05:42

25 files changed, 207 insertions, 35 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 0e20d64ee2ce..342c849f7292 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 86e103f642cd..22170e5c86bd 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -4,5 +4,5 @@ DIST qt-creator-opensource-src-13.0.1.tar.xz 51891908 BLAKE2B ab4701be5328fccc91
 DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac
 EBUILD qt-creator-13.0.1.ebuild 7500 BLAKE2B 4c45f30ac0f69b4dc816949df0d3433af3162e9f3fc25ee5cdbfce2be07e84c8066f0f9e70ca4cdbdb16b494a4af6d248c1d7ae997d2ad4c9c84c6a39c78518c SHA512 1fad52764ead14f568196c64ec4ce543f1327c60a7dbc3fbdf42c8b9af684c240398ab4056e9cfb8f07978c4c430ed69dbbcd76a8fdd5e2e4981783735937fa4
 EBUILD qt-creator-13.0.2.ebuild 7500 BLAKE2B 4c45f30ac0f69b4dc816949df0d3433af3162e9f3fc25ee5cdbfce2be07e84c8066f0f9e70ca4cdbdb16b494a4af6d248c1d7ae997d2ad4c9c84c6a39c78518c SHA512 1fad52764ead14f568196c64ec4ce543f1327c60a7dbc3fbdf42c8b9af684c240398ab4056e9cfb8f07978c4c430ed69dbbcd76a8fdd5e2e4981783735937fa4
-EBUILD qt-creator-9999.ebuild 7501 BLAKE2B c804b606676d054ac4a4c182114e45b8b0f61f156ebe2a1dcfbdf6bbb2a8d050d6c580e6d45c98d4984943ec43f5142897f2ebf796f2ff249984b5c585ed9ca9 SHA512 31c34ced0c2608d4fd0ff263ef8f5643b6424c0645db0247650bdb7b77abe7710ed4a9806bcdcde84e7f87ddcba62c7c5b9a06260c9cc995194bc802915a0d94
+EBUILD qt-creator-9999.ebuild 8115 BLAKE2B 095c2e0dd375338727a3b60c6009426d681a2414729423ef50181a46ce6679e62e1fbb0d0f6937de79cbc78e5e11ab8c10dd20aa2b6fd700002aa7c4d418935f SHA512 033808753f2b3850f8741f9e71b8d78e9cc5688f3bc9c7b33682fae91d97f5095288fca3eb658b48cc78d6b5882c10aa4683fa0fe7f292b5555c9700f64dcd25
 MISC metadata.xml 1241 BLAKE2B 0d68bad4f8bdf857a44107e1b22299ce2e1ac84c2b2197f33e5f3c99562e4cd1d68982a2048961bd1d469a497f4cf4942005cdfb7876a6cdc720ed19e81e7a6d SHA512 33e3e7021d07f83f2ddd39120ac695394963978c80acdd8e2f0713e7cd485ac705ba11168276bb43f3f80b9c1122dd98a5359f342c2c075c2fd8ebddb93084b6
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index f7ae725146b9..7e70e0a5b37d 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 LLVM_COMPAT=( {15..18} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing
+inherit python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -23,7 +24,10 @@ else
 	QTC_PV=${PV/_/-}
 	QTC_P=${PN}-opensource-src-${QTC_PV}
 	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
-	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	SRC_URI="
+		https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz
+		https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
+	"
 	S=${WORKDIR}/${QTC_P}
 	KEYWORDS="~amd64"
 fi
@@ -32,6 +36,7 @@ DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://www.qt.io/product/development-tools"
 
 LICENSE="GPL-3"
+LICENSE+=" BSD MIT" # go
 SLOT="0"
 IUSE="
 	+clang designer doc +help keyring plugin-dev qmldesigner
@@ -79,8 +84,11 @@ RDEPEND="
 	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
 "
 DEPEND="${COMMON_DEPEND}"
+# intentionally skipping := on go (unlike go-module.eclass) given not
+# worth a massive rebuild every time for the minor go usage
 BDEPEND="
 	${PYTHON_DEPS}
+	>=dev-lang/go-1.21.7
 	>=dev-qt/qttools-${QT_PV}[linguist]
 	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
 "
@@ -90,11 +98,23 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )
 
+QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 	use clang && llvm-r1_pkg_setup
 }
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		cd "${S}/src/libs/gocmdbridge/server" || die
+		edo go mod vendor
+	else
+		default
+	fi
+}
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -112,6 +132,9 @@ src_prepare() {
 }
 
 src_configure() {
+	go-env_set_compile_environment
+	local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie"
+
 	# -Werror=lto-type-mismatch issues, needs looking into
 	filter-lto
 
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 6e1ead171859..6aa2416d2991 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -6,9 +6,9 @@ AUX qtbase-6.6.3-pkgconf-deps.patch 1873 BLAKE2B a801c6aba664e676dabf421d0a8b912
 AUX qtbase-6.7.1-qeventlooplocker.patch 7083 BLAKE2B c2413fda052de5d5695050a5bfcd7dea3ff10f0ffb904e5368ef60a25f31b4599313ebfc36d546ca1d9ebff3df38a63ba0725dabf999d919b67509af26a2c815 SHA512 1fd2115fedb413459d961c6047a78713c6393e87325e8adf74d50730586438e5bb7c7ce8b26528a6721c98421275a0f842537a19399fd9818cc5b57123f44438
 DIST qtbase-everywhere-src-6.7.1.tar.xz 49324536 BLAKE2B 5e5a5801c29c1ac541812931cd56709a934a500ce4d5a38e7d3776620cb46db0d25408c22cbf33a7bcc657098c571e501fde14f523a77acba1827edd977d2bc5 SHA512 864bebfc3659907e52b8dc3f62a65d431573ef2bf406a9f71c688229083a2128c5474f75823275d11948be3d031de1d6427acf373f977df9ee9e73a27ef56efb
 DIST qtbase-everywhere-src-6.7.2.tar.xz 49364504 BLAKE2B b48b8a8decafe3262d459b9446c25561851fef88b3316107c2909f5964e8122a558b5501a3e59667bdf4776d36ea5ba0d9f227538c45c1f8e94fbc8fff4244a6 SHA512 eb4b2f1fb02ab0ed5508d32449e140778278ff1a619cfcae14920b276b5c46e01a566d73fb8f84cf2cfc81e19cb11e53ab500df6b27d12ab875aa8c07bd15d6b
-EBUILD qtbase-6.7.1.ebuild 9583 BLAKE2B fb6dc805a32a2d11b5d5b2f154f4976052564a0c9999d0fbc1aaea9cd339e31d7159b011b436717cf2adb58034c5c90d67b9a94ddd73c97c0948a61236f62069 SHA512 4a409a71d90b9e882bda547631f1678e083004b35efca4d29b46aa965b1eaa8c31e46c29c3408219c80ba1868a50cdf81f3273350db2edec2991ea65f36f1349
-EBUILD qtbase-6.7.2.ebuild 9492 BLAKE2B a5c489ccf944d52d6d69b4bea9493236669644d5c7349f99b7e13efb69f53a300db5c5a455e2e3b6d32669cf554faafd8118d0deba25394ad039dad020a39fe5 SHA512 5963f23bf57f0da8fac249e6fb3da120889e3a9072faca3e6443a8e2fd19d5397838c598be1bc436219a6ac73a763d1e106e209219a022cbc1c87801a5adb037
-EBUILD qtbase-6.7.9999.ebuild 9492 BLAKE2B a5c489ccf944d52d6d69b4bea9493236669644d5c7349f99b7e13efb69f53a300db5c5a455e2e3b6d32669cf554faafd8118d0deba25394ad039dad020a39fe5 SHA512 5963f23bf57f0da8fac249e6fb3da120889e3a9072faca3e6443a8e2fd19d5397838c598be1bc436219a6ac73a763d1e106e209219a022cbc1c87801a5adb037
-EBUILD qtbase-6.8.9999.ebuild 9931 BLAKE2B 3c409cc2be75bc54c7ea7e889b9918592e3ea86c0cfdd8998a6bcfd89a71850fc6f545dd5158d1b75169ddd673de3af3d66dd72dee4c89431cc23b6bf835b61b SHA512 c5e544880ec065c9a064ecf50dd4af9ab7e707e5c34336009cd6aa697c103d054c5b6d73ea71da05cf25d9eb9befb5ec9d9811e8224a5b425da48552358a2ebb
-EBUILD qtbase-6.9999.ebuild 9931 BLAKE2B 3c409cc2be75bc54c7ea7e889b9918592e3ea86c0cfdd8998a6bcfd89a71850fc6f545dd5158d1b75169ddd673de3af3d66dd72dee4c89431cc23b6bf835b61b SHA512 c5e544880ec065c9a064ecf50dd4af9ab7e707e5c34336009cd6aa697c103d054c5b6d73ea71da05cf25d9eb9befb5ec9d9811e8224a5b425da48552358a2ebb
+EBUILD qtbase-6.7.1.ebuild 9650 BLAKE2B 0731f4a5230ad7212f8fae6d467ee34467cbda184a08bd289a9bf9533384c9f41c21276247e4f3543ff4807d6f654331f97377d285b54a4a987596296eedb775 SHA512 c330431375470cb22a25b5394730a3eebe14b4b6ef36527560b102db1c23da118db86507fe8466508fd5d22bb5d4e9b0a4c59d4d5a1d5ab48f91247fa74e03d7
+EBUILD qtbase-6.7.2.ebuild 9559 BLAKE2B 5963ad805fab54ad09255d5fa42ee6f7abdba38aa2caf211138b3df78abb4f714d54122aaf66b7455a0740e40002ee77b0bb67a5bdba307ec02ae69a92607362 SHA512 4924e009671bfc94d8c2da05ea884ce8043d77adcbd2cc403c3badbf5034e1ea511bfb4df6d343a531471d472cb865e49bcc7f7028b195647f50bab4aa6f164f
+EBUILD qtbase-6.7.9999.ebuild 9559 BLAKE2B 5963ad805fab54ad09255d5fa42ee6f7abdba38aa2caf211138b3df78abb4f714d54122aaf66b7455a0740e40002ee77b0bb67a5bdba307ec02ae69a92607362 SHA512 4924e009671bfc94d8c2da05ea884ce8043d77adcbd2cc403c3badbf5034e1ea511bfb4df6d343a531471d472cb865e49bcc7f7028b195647f50bab4aa6f164f
+EBUILD qtbase-6.8.9999.ebuild 9998 BLAKE2B 71b9fc07d2b968a92d9a421439488690a5e24a7da5b500592a7beba14aff4d6ec0eac4d78a4671c2697edb4d03d65995c708b34bc0db4b4be0f650fad3c5cb50 SHA512 c787767932b16b336f170dcfc9fa6529c941e92a7a160281aa7d40ae4e9d5eef86dc5f05a7955ba70b85eec4fff093f82bddb17ba63ac208758344e4df7cd57a
+EBUILD qtbase-6.9999.ebuild 9998 BLAKE2B 71b9fc07d2b968a92d9a421439488690a5e24a7da5b500592a7beba14aff4d6ec0eac4d78a4671c2697edb4d03d65995c708b34bc0db4b4be0f650fad3c5cb50 SHA512 c787767932b16b336f170dcfc9fa6529c941e92a7a160281aa7d40ae4e9d5eef86dc5f05a7955ba70b85eec4fff093f82bddb17ba63ac208758344e4df7cd57a
 MISC metadata.xml 1655 BLAKE2B 1f3bdbe5f14716d1825ff0ce6d3a9439a87c0c18abd0bb6a2286c9709e815205f2f6911ef5d053b57598aa54471d4316f87c9a4d36004be15f499447785f14bd SHA512 d1479bae177f75991241eacaa1300f43d644730fa3d6d7e6e039b8a212f1289b920b6e1aad7c56576857049f133492f5cf648c7931228c6c4ee272d93437e351
diff --git a/dev-qt/qtbase/qtbase-6.7.1.ebuild b/dev-qt/qtbase/qtbase-6.7.1.ebuild
index 534c7504e39a..63fdc141c19c 100644
--- a/dev-qt/qtbase/qtbase-6.7.1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.1.ebuild
@@ -281,6 +281,7 @@ src_test() {
 		tst_qlogging # backtrace log test can easily vary
 		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
 		tst_qprinter # checks system's printers (bug #916216)
+		tst_qhighdpi # may detect users' settings and fail (bug #935364)
 		tst_qstorageinfo # checks mounted filesystems
 		# flaky due to using different test framework and fails with USE=-gui
 		tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.7.2.ebuild b/dev-qt/qtbase/qtbase-6.7.2.ebuild
index fbe1ce6c1da1..435584eeecbe 100644
--- a/dev-qt/qtbase/qtbase-6.7.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.2.ebuild
@@ -279,6 +279,7 @@ src_test() {
 		tst_qlogging # backtrace log test can easily vary
 		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
 		tst_qprinter # checks system's printers (bug #916216)
+		tst_qhighdpi # may detect users' settings and fail (bug #935364)
 		tst_qstorageinfo # checks mounted filesystems
 		# flaky due to using different test framework and fails with USE=-gui
 		tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index fbe1ce6c1da1..435584eeecbe 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -279,6 +279,7 @@ src_test() {
 		tst_qlogging # backtrace log test can easily vary
 		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
 		tst_qprinter # checks system's printers (bug #916216)
+		tst_qhighdpi # may detect users' settings and fail (bug #935364)
 		tst_qstorageinfo # checks mounted filesystems
 		# flaky due to using different test framework and fails with USE=-gui
 		tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index ea4d281fc895..04fb1a0aaefe 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -291,6 +291,7 @@ src_test() {
 		tst_qlogging # backtrace log test can easily vary
 		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
 		tst_qprinter # checks system's printers (bug #916216)
+		tst_qhighdpi # may detect users' settings and fail (bug #935364)
 		tst_qstorageinfo # checks mounted filesystems
 		# flaky due to using different test framework and fails with USE=-gui
 		tst_selftests
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index ea4d281fc895..04fb1a0aaefe 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -291,6 +291,7 @@ src_test() {
 		tst_qlogging # backtrace log test can easily vary
 		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
 		tst_qprinter # checks system's printers (bug #916216)
+		tst_qhighdpi # may detect users' settings and fail (bug #935364)
 		tst_qstorageinfo # checks mounted filesystems
 		# flaky due to using different test framework and fails with USE=-gui
 		tst_selftests
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 48c9bc24abda..f7a5e1ea70b1 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -4,9 +4,9 @@ DIST qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz 3842164 BLAKE2B 0065c
 DIST qtmultimedia-everywhere-src-6.7.1.tar.xz 8362120 BLAKE2B 2dc442d9ee1290507ebe437e0087756b98ba63baa65fb64174e876d84758dd1062044934610134a782ec1d2a32c6281657e060554be3a2fe9591ad925e7c0129 SHA512 18e7b2036baac68a421cb8741713b43d739f558cad8b9d2b8192e390b2c37cfda17f6bb290c9313ae9e3b7ea2ee4fda52b86a58195201e99179d6f4a4e386783
 DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70
 EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91
-EBUILD qtmultimedia-6.7.1.ebuild 2723 BLAKE2B 8c80a6f06289f4c5efafbc12643326c8f8cc52e39c4890e985e9c959d0b9ebaa0e4df6c249735ee202e45fd2acd5f3926681f0965ef7eb9ecd014f9c7e918c52 SHA512 2c96316b085ef0e7a2c0646e8617b482a1a740742677e9734375ce3394330cca6ee446412b95b314f01d83b18f37732b780d5340145eddba15a6239b6668d67c
-EBUILD qtmultimedia-6.7.2.ebuild 2784 BLAKE2B 89a5cd726ee152e9a72ce36b0a5d2b8e2f356f4ae03717657500b1a291a08ec873f7ea70f8bd254d706476c10b6c894d0d3363292b817d5d031c7752302ffe11 SHA512 dc951d455f55da4bb63c87b8751b99e82d07f14df85f3d9449ce2b8c106929c687d9b146acbc9b28174c140d5b5c9f055d4c3eb8584139ba61f24d5cb0734233
-EBUILD qtmultimedia-6.7.9999.ebuild 2728 BLAKE2B 183da22be878b7fddf6af1b6a88927c9e38917308d19c28400933d82c7c332a741a2385579f2b2c63ab84a5353e71bc8eabcc38cec4b50da0f81059a7ce08108 SHA512 47f4e25c9a44eff18fa7300dddcd33d88b02da61433112fbc1bc74648e469454aef72ab9cca067bb4742bb5a2fc7029afd9e92713656e56607fbbd5459762d50
-EBUILD qtmultimedia-6.8.9999.ebuild 2728 BLAKE2B 183da22be878b7fddf6af1b6a88927c9e38917308d19c28400933d82c7c332a741a2385579f2b2c63ab84a5353e71bc8eabcc38cec4b50da0f81059a7ce08108 SHA512 47f4e25c9a44eff18fa7300dddcd33d88b02da61433112fbc1bc74648e469454aef72ab9cca067bb4742bb5a2fc7029afd9e92713656e56607fbbd5459762d50
-EBUILD qtmultimedia-6.9999.ebuild 2728 BLAKE2B 183da22be878b7fddf6af1b6a88927c9e38917308d19c28400933d82c7c332a741a2385579f2b2c63ab84a5353e71bc8eabcc38cec4b50da0f81059a7ce08108 SHA512 47f4e25c9a44eff18fa7300dddcd33d88b02da61433112fbc1bc74648e469454aef72ab9cca067bb4742bb5a2fc7029afd9e92713656e56607fbbd5459762d50
+EBUILD qtmultimedia-6.7.1-r1.ebuild 3188 BLAKE2B dcb9e39eec40a1b84a17c07a60523d65a8eb51aa9b1cf5e02dd98b29a895968250a145069bec014122832367b5af62dea50497360757bcd2a119ca2982df2db2 SHA512 b89cea044c03896b03d438e71e511e377ab89a7b6874c99b6511467293afa684302b49b7b42b6dbc20db8fe741ea11ff90d3247bc65bb53d10cb71e1503dedc1
+EBUILD qtmultimedia-6.7.2-r1.ebuild 3249 BLAKE2B a0747832a4cf9206a7b4b46d657c886e7939a1d737c819d266b4f3d05f577756145693d366e33a637a8d4646b97ad064447e2714e86bb9e579fbce59bf8cfaf4 SHA512 05fc3e1770c320737318054fbcebfd3cfb1b4ef8878f7135884dbeebbd2e3b0abf19133a8ecc74338edbc2f4804098bb864e4f84d16f148ce37c82924a41be11
+EBUILD qtmultimedia-6.7.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667
+EBUILD qtmultimedia-6.8.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667
+EBUILD qtmultimedia-6.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.1-r1.ebuild
index 1d78a1de5024..ddf6bb150a26 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.1-r1.ebuild
@@ -22,7 +22,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
+	alsa? (
+		!pulseaudio? ( media-libs/alsa-lib )
+	)
 	ffmpeg? (
 		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
 		media-video/ffmpeg:=[vaapi?]
@@ -77,7 +79,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
 		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
@@ -86,6 +87,17 @@ src_configure() {
 		$(qt_feature vaapi)
 	)
 
+	# ALSA backend is experimental off-by-default and can take priority
+	# causing problems (bug #935146), disable if USE=pulseaudio is set
+	# (also do not want unnecessary usage of ALSA plugins -> pulse)
+	if use alsa && use pulseaudio; then
+		# einfo should be enough given pure-ALSA users tend to disable pulse
+		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
+		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
+	else
+		mycmakeargs+=( $(qt_feature alsa) )
+	fi
+
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild
index 25d6f40c49e6..3325d8cc1142 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild
@@ -22,7 +22,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
+	alsa? (
+		!pulseaudio? ( media-libs/alsa-lib )
+	)
 	ffmpeg? (
 		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
 		media-video/ffmpeg:=[vaapi?]
@@ -81,7 +83,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
 		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
@@ -90,6 +91,17 @@ src_configure() {
 		$(qt_feature vaapi)
 	)
 
+	# ALSA backend is experimental off-by-default and can take priority
+	# causing problems (bug #935146), disable if USE=pulseaudio is set
+	# (also do not want unnecessary usage of ALSA plugins -> pulse)
+	if use alsa && use pulseaudio; then
+		# einfo should be enough given pure-ALSA users tend to disable pulse
+		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
+		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
+	else
+		mycmakeargs+=( $(qt_feature alsa) )
+	fi
+
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
index 99d03b1ca8be..3b8589664575 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
@@ -22,7 +22,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
+	alsa? (
+		!pulseaudio? ( media-libs/alsa-lib )
+	)
 	ffmpeg? (
 		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
 		media-video/ffmpeg:=[vaapi?]
@@ -77,7 +79,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
 		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
@@ -86,6 +87,17 @@ src_configure() {
 		$(qt_feature vaapi)
 	)
 
+	# ALSA backend is experimental off-by-default and can take priority
+	# causing problems (bug #935146), disable if USE=pulseaudio is set
+	# (also do not want unnecessary usage of ALSA plugins -> pulse)
+	if use alsa && use pulseaudio; then
+		# einfo should be enough given pure-ALSA users tend to disable pulse
+		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
+		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
+	else
+		mycmakeargs+=( $(qt_feature alsa) )
+	fi
+
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 99d03b1ca8be..3b8589664575 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -22,7 +22,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
+	alsa? (
+		!pulseaudio? ( media-libs/alsa-lib )
+	)
 	ffmpeg? (
 		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
 		media-video/ffmpeg:=[vaapi?]
@@ -77,7 +79,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
 		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
@@ -86,6 +87,17 @@ src_configure() {
 		$(qt_feature vaapi)
 	)
 
+	# ALSA backend is experimental off-by-default and can take priority
+	# causing problems (bug #935146), disable if USE=pulseaudio is set
+	# (also do not want unnecessary usage of ALSA plugins -> pulse)
+	if use alsa && use pulseaudio; then
+		# einfo should be enough given pure-ALSA users tend to disable pulse
+		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
+		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
+	else
+		mycmakeargs+=( $(qt_feature alsa) )
+	fi
+
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 99d03b1ca8be..3b8589664575 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -22,7 +22,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
+	alsa? (
+		!pulseaudio? ( media-libs/alsa-lib )
+	)
 	ffmpeg? (
 		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
 		media-video/ffmpeg:=[vaapi?]
@@ -77,7 +79,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
 		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
@@ -86,6 +87,17 @@ src_configure() {
 		$(qt_feature vaapi)
 	)
 
+	# ALSA backend is experimental off-by-default and can take priority
+	# causing problems (bug #935146), disable if USE=pulseaudio is set
+	# (also do not want unnecessary usage of ALSA plugins -> pulse)
+	if use alsa && use pulseaudio; then
+		# einfo should be enough given pure-ALSA users tend to disable pulse
+		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
+		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
+	else
+		mycmakeargs+=( $(qt_feature alsa) )
+	fi
+
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index da3966650739..a2a346a530f6 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -3,9 +3,9 @@ DIST qtsvg-everywhere-opensource-src-5.15.14.tar.xz 1881248 BLAKE2B dc0f0754d480
 DIST qtsvg-everywhere-src-6.7.1.tar.xz 1790712 BLAKE2B 4df926dbac0372d41fbaf0ac3ea5cce5c80439ef29154837c9a67b054ba901a48b14d5935afe77ba748b909910bd719fc3a7cec5a3b4afa2712dd671b0ecccfc SHA512 8c5b54886e8a9580c022229b8b6176eaf9f113890333e5d9ca558fe57e6f2acad2a2e01fb5154ddb67a48ac95727d744339512876fb8334077ca5af27506e106
 DIST qtsvg-everywhere-src-6.7.2.tar.xz 1791468 BLAKE2B e72cf5b153141942c7aa92f7433b19317549deacc5d9bf981dd41f80ce25b0bc60c81185eb9134146aa93a6ce830aa3afcaced9e92902b9aa8c4a321718a5f86 SHA512 5a4209134afd3265d4b4b02a388a3078f2f915613c83e8a4aafd292e6b49d77019597f820468c8a9fe6c046c64e6890ac94ebc52e6b321a9b57a5ef3b51552e4
 EBUILD qtsvg-5.15.14.ebuild 496 BLAKE2B 973507084399af01f2f442cbfd3a6c9dfe91c8185ddb483c9b7b8cc1f7cf135e80e4c7c1286f22bc59a5209a87144310780d0c380681b963d42204c46a228e07 SHA512 d8500010ff86d3d03f18210b771fe0961b99d16efebbba0c428ffcc49dda115814538f6d8b20801671ee5a0de7b1e643eed6101c7f37dbf42795d1a5c6dfd978
-EBUILD qtsvg-6.7.1.ebuild 388 BLAKE2B c9406b2dbf4251b6b4d3d72ca2ec40b71936a8d466543a9252449c3e8bc6f49013aa0b6fec37e992275d1ae3d8bf07fc34745c3ae02aa02bed57f1e88e10456a SHA512 c202d32777fe44d6c7fadba38a8381e3dc6017b743650976ec8ca9ada9c2719d993dc47b7e02b6186abb16bc2892b205a67dd0d9b7c597c79611d2ed698d67d6
-EBUILD qtsvg-6.7.2.ebuild 393 BLAKE2B 590aebdab4891eb74fe461de8bb0170b15423d201eab166f794e87d04d7bdcb0e60f5317b7550e3c397046770b55949d69d48d1ea4fe117a3c17238348199fa9 SHA512 5bda049f2ae5e3f013a01034dabba7459d844cbc006a9d0463213db8e119c24d5056d40c838833fb4b82ea2ac8acedfb4a0f92fe011f2c768b45c6ce0bd1528b
-EBUILD qtsvg-6.7.9999.ebuild 393 BLAKE2B 590aebdab4891eb74fe461de8bb0170b15423d201eab166f794e87d04d7bdcb0e60f5317b7550e3c397046770b55949d69d48d1ea4fe117a3c17238348199fa9 SHA512 5bda049f2ae5e3f013a01034dabba7459d844cbc006a9d0463213db8e119c24d5056d40c838833fb4b82ea2ac8acedfb4a0f92fe011f2c768b45c6ce0bd1528b
-EBUILD qtsvg-6.8.9999.ebuild 393 BLAKE2B 590aebdab4891eb74fe461de8bb0170b15423d201eab166f794e87d04d7bdcb0e60f5317b7550e3c397046770b55949d69d48d1ea4fe117a3c17238348199fa9 SHA512 5bda049f2ae5e3f013a01034dabba7459d844cbc006a9d0463213db8e119c24d5056d40c838833fb4b82ea2ac8acedfb4a0f92fe011f2c768b45c6ce0bd1528b
-EBUILD qtsvg-6.9999.ebuild 393 BLAKE2B 590aebdab4891eb74fe461de8bb0170b15423d201eab166f794e87d04d7bdcb0e60f5317b7550e3c397046770b55949d69d48d1ea4fe117a3c17238348199fa9 SHA512 5bda049f2ae5e3f013a01034dabba7459d844cbc006a9d0463213db8e119c24d5056d40c838833fb4b82ea2ac8acedfb4a0f92fe011f2c768b45c6ce0bd1528b
+EBUILD qtsvg-6.7.1.ebuild 655 BLAKE2B 4609e7e89355efc516d215b53fe91d69d477fa83985b0a1251ece83c0e12857c365f7087add8888c034cf9a938b128718ac4d49c70919f6ea00c73da39df6f68 SHA512 a3ce460ab6bd044ec810b978394a3bea266c9587202caa413e40011f690b103d03f4ea88331e8db7b0e7ca5f1413667a1b1908ec461bc2734924befa663402e8
+EBUILD qtsvg-6.7.2.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef
+EBUILD qtsvg-6.7.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef
+EBUILD qtsvg-6.8.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef
+EBUILD qtsvg-6.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef
 MISC metadata.xml 530 BLAKE2B 4cff37d5824321054b8131fc65a4a86433a2e33882c66411b7af25c0550ad4933a680ceb517d1ba2cd11dab4b3110da69f330f334d25577310d59d7ab4aca439 SHA512 f538df6a65076e6744ab7e498778ff1addd3f45af50708d5af3c0eefb5862fc0b82bf99c18b268bb6ed257b3feed51f64ed18cd4006ba717c03be37ea5258ab3
diff --git a/dev-qt/qtsvg/qtsvg-6.7.1.ebuild b/dev-qt/qtsvg/qtsvg-6.7.1.ebuild
index 73a0e9316b19..dfcbf6a8848b 100644
--- a/dev-qt/qtsvg/qtsvg-6.7.1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qt6-build
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="SVG rendering library for the Qt6 framework"
 
@@ -16,3 +16,11 @@ RDEPEND="
 	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}"
+
+src_test() {
+	# tst_QSvgRenderer::testFeColorMatrix (new in 6.7, likely low impact)
+	# is known failing on BE, could use more looking into (bug #935356)
+	[[ $(tc-endian) == big ]] && local CMAKE_SKIP_TESTS=( tst_qsvgrenderer )
+
+	qt6-build_src_test
+}
diff --git a/dev-qt/qtsvg/qtsvg-6.7.2.ebuild b/dev-qt/qtsvg/qtsvg-6.7.2.ebuild
index 566af04442ed..e7ea7c613b25 100644
--- a/dev-qt/qtsvg/qtsvg-6.7.2.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qt6-build
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="SVG rendering library for the Qt6 framework"
 
@@ -16,3 +16,11 @@ RDEPEND="
 	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}"
+
+src_test() {
+	# tst_QSvgRenderer::testFeColorMatrix (new in 6.7, likely low impact)
+	# is known failing on BE, could use more looking into (bug #935356)
+	[[ $(tc-endian) == big ]] && local CMAKE_SKIP_TESTS=( tst_qsvgrenderer )
+
+	qt6-build_src_test
+}
diff --git a/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild
index 566af04442ed..e7ea7c613b25 100644
--- a/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qt6-build
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="SVG rendering library for the Qt6 framework"
 
@@ -16,3 +16,11 @@ RDEPEND="
 	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}"
+
+src_test() {
+	# tst_QSvgRenderer::testFeColorMatrix (new in 6.7, likely low impact)
+	# is known failing on BE, could use more looking into (bug #935356)
+	[[ $(tc-endian) == big ]] && local CMAKE_SKIP_TESTS=( tst_qsvgrenderer )
+
+	qt6-build_src_test
+}
diff --git a/dev-qt/qtsvg/qtsvg-6.8.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.8.9999.ebuild
index 566af04442ed..e7ea7c613b25 100644
--- a/dev-qt/qtsvg/qtsvg-6.8.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.8.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qt6-build
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="SVG rendering library for the Qt6 framework"
 
@@ -16,3 +16,11 @@ RDEPEND="
 	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}"
+
+src_test() {
+	# tst_QSvgRenderer::testFeColorMatrix (new in 6.7, likely low impact)
+	# is known failing on BE, could use more looking into (bug #935356)
+	[[ $(tc-endian) == big ]] && local CMAKE_SKIP_TESTS=( tst_qsvgrenderer )
+
+	qt6-build_src_test
+}
diff --git a/dev-qt/qtsvg/qtsvg-6.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.9999.ebuild
index 566af04442ed..e7ea7c613b25 100644
--- a/dev-qt/qtsvg/qtsvg-6.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qt6-build
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="SVG rendering library for the Qt6 framework"
 
@@ -16,3 +16,11 @@ RDEPEND="
 	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}"
+
+src_test() {
+	# tst_QSvgRenderer::testFeColorMatrix (new in 6.7, likely low impact)
+	# is known failing on BE, could use more looking into (bug #935356)
+	[[ $(tc-endian) == big ]] && local CMAKE_SKIP_TESTS=( tst_qsvgrenderer )
+
+	qt6-build_src_test
+}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 480009b86066..b261ec235ee5 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,6 @@
 AUX qtwebengine-5.15.14_p20240510-icu-75.patch 5107 BLAKE2B fc61801f5bbf5583610afe5af8ed60a90f94a248c0aa16b94f6df96e239e9c1cfe1fc40da487d3a25fc600a798b33c5bf8384c6d6cfcd0ff9446c20aae5f8f84 SHA512 b812dc26e6135cd69df9ef3b9049509be9888e012394af3c496b03666e80c63f4c827916398d94f7499f73739ca70829108b60705d5b2329f3134dd695a029eb
 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
+AUX qtwebengine-6.7.2-QTBUG-113574.patch 1696 BLAKE2B 10d4bca0527636a3934ccfdf6e52fca4ca369d07624c3b63377dc899a2f0313a936347d73dccf2f35d259f43c9c76bb7519b85339468b93b49862d3d5057f23b SHA512 bb2489a41da7b7a00fe58fee963b89e6ba8ece2c1a8f29e75169db7400a475473866c71bc78825875d007cac1e98175251b1f5fb4bdfbdd4318d32fc6f7871a2
 DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
 DIST qtwebengine-6.7-patchset-8.tar.xz 8320 BLAKE2B 88f31506865aeef02d6ad0c46dacd478f4c77330815648bf5377762b9f053f5a51b6426c1fbeef81fff5c3a9f4e853f8d51013d5df27fcd0ab0449ce369e18e5 SHA512 1d8e1f8e15a13c6f1675208ba1a329dfa335031e06577de39dc89464b40bd5cf7df7bce4f09f6e67a84c1c2f7aa1fbf6d2d94ea8c142ec5ea67bac8cef1b03b1
@@ -9,8 +10,8 @@ DIST qtwebengine-everywhere-src-6.7.1.tar.xz 550975920 BLAKE2B b0bbe1d62132bc75f
 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
 EBUILD qtwebengine-5.15.14_p20240510.ebuild 7659 BLAKE2B d930e49649e91657fbe65668a0dfe41ebd4732d4901c36f59f562094d9cb9d339157bf0f5c4e8b530270a13c8a40449ac4800ce9a17a29069be1c7177c288452 SHA512 6c621d916a502e778fb9662dba61161eb55b6ab37bd1045d5a96924bc943428b3ef28512d7838b31b4bfaa0ac43e23b10a66d67fdce2505139325cc837dd756f
 EBUILD qtwebengine-6.7.1.ebuild 10335 BLAKE2B 07a6b771a160576cd1812da7fb42bc020c603288bb2220af2d80dd5a8a1e21b324b6d040936fab0986dfa8eb19e5567b56e4b872c8315ce9321534327c31b158 SHA512 fae01a93192be9ad56c3970b523cf0c606e794944b468b95646aee20a234cb785216eae6c652a64e49b24b26c4c210daae60df1b85275973f418b9630bcfee29
-EBUILD qtwebengine-6.7.2.ebuild 10337 BLAKE2B df8461aaee9ab10b7b99f6ebcd72ce425dc3f489577e690d189a3ca1b859ab010267be175da5461fcbb81b22d534834206ffa35829200fcfae3dc68431132506 SHA512 127fa4f0abf8452bfbe1002d704fd86743e6d38fa072dee29da338886f8b47a681a909df36021255cdb28f3ad9026ea118db1374e20e98122baa789e71bd9c00
-EBUILD qtwebengine-6.7.9999.ebuild 10337 BLAKE2B df8461aaee9ab10b7b99f6ebcd72ce425dc3f489577e690d189a3ca1b859ab010267be175da5461fcbb81b22d534834206ffa35829200fcfae3dc68431132506 SHA512 127fa4f0abf8452bfbe1002d704fd86743e6d38fa072dee29da338886f8b47a681a909df36021255cdb28f3ad9026ea118db1374e20e98122baa789e71bd9c00
+EBUILD qtwebengine-6.7.2.ebuild 10383 BLAKE2B a48d23b446dd01073e0250213733c41ffe0d856c2a7db95aa3d160c49e8f1ea07b93c2e8fa016ebc8477e98b781af0374b6c090b0bd45f19d873c63fe3711147 SHA512 bccd4d397ce5ed9ebe91c7c422e91f6def0af290d572261331e574bcd1f6954c7656c7272ccd5d6869766f08e457b0a96eabdb4b9e321a5f90bf8cbeda3aa03f
+EBUILD qtwebengine-6.7.9999.ebuild 10383 BLAKE2B a48d23b446dd01073e0250213733c41ffe0d856c2a7db95aa3d160c49e8f1ea07b93c2e8fa016ebc8477e98b781af0374b6c090b0bd45f19d873c63fe3711147 SHA512 bccd4d397ce5ed9ebe91c7c422e91f6def0af290d572261331e574bcd1f6954c7656c7272ccd5d6869766f08e457b0a96eabdb4b9e321a5f90bf8cbeda3aa03f
 EBUILD qtwebengine-6.8.9999.ebuild 10337 BLAKE2B 3ae67d7f4cbe977649ad447d81fed709e92edbdeff622a8998f3b03a02a3764653ecece43d4be4df40492a18ef056d6f3b4b386145c5e5c0ce8b2a3fa0a1dcdb SHA512 8c440f9cdf9e4209c8f9079a29232126bfbcbb4c34135c20e3fd5dbd28237917cb5f8cbdcb3ba31899653aeab9615fe92af82ee27362e173a45c3441e3a5b76c
 EBUILD qtwebengine-6.9999.ebuild 10337 BLAKE2B 3ae67d7f4cbe977649ad447d81fed709e92edbdeff622a8998f3b03a02a3764653ecece43d4be4df40492a18ef056d6f3b4b386145c5e5c0ce8b2a3fa0a1dcdb SHA512 8c440f9cdf9e4209c8f9079a29232126bfbcbb4c34135c20e3fd5dbd28237917cb5f8cbdcb3ba31899653aeab9615fe92af82ee27362e173a45c3441e3a5b76c
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch
new file mode 100644
index 000000000000..d8a9158c8a01
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch
@@ -0,0 +1,41 @@
+Backport of [1] from 6.8/6.9 for [2].
+
+[1] https://codereview.qt-project.org/c/qt/qtwebengine/+/569910
+[2] https://bugreports.qt.io/browse/QTBUG-113574
+
+From 21a9add47def34322b799683e1e1daff88dc4a06 Mon Sep 17 00:00:00 2001
+From: David Edmundson <davidedmundson@kde.org>
+Date: Wed, 19 Jun 2024 10:37:45 +0100
+Subject: [PATCH] Use device pixel ratio of the window rather than the screen
+
+Window device pixel ratio can differ from the screen depending on the
+platform. The window is the more authorative source with new events in
+Qt to support that.
+
+In Chromium the rendering is still based off a screen factor, but each
+view will have a completely independent set of screen variables, so we
+can adjust the screen to match our current view.
+
+Chromium itself also alters the screen scale factor on a per window
+basis for their own native Wayland backend or if recording a window.
+--- a/src/core/render_widget_host_view_qt.cpp
++++ b/src/core/render_widget_host_view_qt.cpp
+@@ -875,4 +875,9 @@
+ 
+     display::ScreenInfos newScreenInfos = screenInfosFromQtForUpdate(window->screen());
++
++    // We always want to use the scale from our current window
++    // This screen information is stored on a per-view basis
++    auto &screen = newScreenInfos.mutable_current();
++    screen.device_scale_factor = window->devicePixelRatio();
+     if (screen_infos_ == newScreenInfos)
+         return false;
+--- a/src/core/render_widget_host_view_qt_delegate_item.cpp
++++ b/src/core/render_widget_host_view_qt_delegate_item.cpp
+@@ -346,4 +346,6 @@
+                 onHide();
+         }
++    } else if (change == QQuickItem::ItemDevicePixelRatioHasChanged) {
++        m_client->visualPropertiesChanged();
+     }
+ }
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
index 3726d7743a00..1ad6561ecc65 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
@@ -110,6 +110,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
+	"${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.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 3726d7743a00..1ad6561ecc65 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -110,6 +110,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
+	"${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.patch
 )
 
 python_check_deps() {