From 3f559ef486314f9b3b48d48eb303d6be68463af9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 3 Sep 2024 12:28:20 +0100
Subject: gentoo auto-resync : 03:09:2024 - 12:28:20

---
 dev-qt/qtwebengine/Manifest                    |  6 +++---
 dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 15 +++------------
 dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 23 ++++++++---------------
 dev-qt/qtwebengine/qtwebengine-6.9999.ebuild   | 23 ++++++++---------------
 4 files changed, 22 insertions(+), 45 deletions(-)

(limited to 'dev-qt/qtwebengine')

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 88b871992115..c4df77bef8b5 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -10,7 +10,7 @@ DIST qtwebengine-6.8-patchset-3.tar.xz 9260 BLAKE2B 6d4e0bcc24ecc16ce92f6d448326
 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
 EBUILD qtwebengine-5.15.14_p20240510.ebuild 7758 BLAKE2B f1c2e30680f12164b8a1a55ecaecc6b7a786cd173ae3500825c7ef04ebd53bd579d2c74a7648ff65c3c302a0f2955313814e0fd1223d564fde76ff7e0039d6d5 SHA512 37591ca47d0df49df995be8af07da94f32ee3d5e03bf9acf987b9966092e48e481d8fac5c3af920265a4736e95f8200be24cf75683e577ef135249555ad6efa1
 EBUILD qtwebengine-6.7.2.ebuild 10336 BLAKE2B 1345fddaace77254f82ea205e093032f8667b6b0ff4614c15393d34cc5100c035e13103a7edf4a705c5d0e442e0a0d14a6b2c302b7bef93ca45ea0c2d12e90fc SHA512 635c6cab34d3b3bfd17a3773697146b72a5530a856027a11d52b8eba2bfbddf662bfae6197720acd4783c75a4e59d005ccf3dda12fbdcc8975814854a2398827
-EBUILD qtwebengine-6.7.9999.ebuild 10338 BLAKE2B f79388ad31417f6e45945dfa2a70f94e79de202d6e67dc389cb149da43ba503eb017ae00928f0bfcd8ff4701e1d019d22e8b8359130439de69f8eee1a2dae5c4 SHA512 56136d10466267629cbaff4c8884e8068ca2196a48a512b416dd3c180c0555c8effbfbf198c53ebc7411695792f699dbed23533a6ea8a9e44a06c4343f534b3b
-EBUILD qtwebengine-6.8.9999.ebuild 10337 BLAKE2B 3ac9bb4b28f4882368bd264b121496064ae5cd43f7920100ff9d95219e29c94dfa34253890182f953a9f8c34f066b64e74087bc3753146bb5a78582cfe9be143 SHA512 ad7d17e8b97e7b60953b5290113719118fd133f777de0af8292238ccb9668383746aba2a00456d69401af3236d74de03725b3982f70e2d2450b3dd89cba8be72
-EBUILD qtwebengine-6.9999.ebuild 10337 BLAKE2B 3ac9bb4b28f4882368bd264b121496064ae5cd43f7920100ff9d95219e29c94dfa34253890182f953a9f8c34f066b64e74087bc3753146bb5a78582cfe9be143 SHA512 ad7d17e8b97e7b60953b5290113719118fd133f777de0af8292238ccb9668383746aba2a00456d69401af3236d74de03725b3982f70e2d2450b3dd89cba8be72
+EBUILD qtwebengine-6.7.9999.ebuild 9876 BLAKE2B f904bc7d9c44b86873766d505c6952f655917c59a255cb864712aa89d86724e0549699f6091a296be4ff53c7b212ff7037660c269319c65cbd0310a9546a5c9c SHA512 dff38c5c58a93de6fdc3a0a0c71d42e19699ab0d0826a2aa1e160f76f9e5fb28ef8e088e684487a43e596f4aa71d369d4076805e8201ac6f54076212403d5db2
+EBUILD qtwebengine-6.8.9999.ebuild 9961 BLAKE2B c259b87e0bee2cee73d86d630017747a37489fe3c6f717f62de30da2558589e3ab4d65099a5dce85b610b0f4eb131885720febd91c3662c862118607bfdc2e9e SHA512 90d57411fba88de7b0512a296ebd3e4288d042e837f5bc7e26e933291b9c37978e6cb05b84ce0e5cee3a9a3cd5c1aeb71e85586e35c9b7730f27fc1a62a22e1a
+EBUILD qtwebengine-6.9999.ebuild 9961 BLAKE2B c259b87e0bee2cee73d86d630017747a37489fe3c6f717f62de30da2558589e3ab4d65099a5dce85b610b0f4eb131885720febd91c3662c862118607bfdc2e9e SHA512 90d57411fba88de7b0512a296ebd3e4288d042e837f5bc7e26e933291b9c37978e6cb05b84ce0e5cee3a9a3cd5c1aeb71e85586e35c9b7730f27fc1a62a22e1a
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 4315b3198309..49de5422603a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -203,8 +203,8 @@ src_configure() {
 		# cooperate with new major ffmpeg versions (bug #831487)
 		-DQT_FEATURE_webengine_system_ffmpeg=OFF
 
-		# use bundled re2 to avoid complications, may revisit
-		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+		# use bundled re2 to avoid complications, Qt has also disabled
+		# this by default in 6.7.3+ (bug #913923)
 		-DQT_FEATURE_webengine_system_re2=OFF
 
 		# bundled is currently required when using vaapi (forced regardless)
@@ -243,16 +243,7 @@ src_configure() {
 		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
 	fi
 
-	# Workaround for build failure with clang-18 and -march=native without
-	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
-	# TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
-	use amd64 && tc-is-clang && is-flagq -march=native &&
-		[[ $(clang-major-version) -ge 18 ]] &&
-		has_version '<sys-devel/llvm-18.1.5-r1' &&
-		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
-		append-flags -mevex512
-
-	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+	export NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
 
 	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 937f5ca9c883..fec93a911d24 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -88,7 +88,6 @@ DEPEND="
 	x11-libs/libxshmfence
 	opengl? ( media-libs/libglvnd[X] )
 	screencast? ( media-libs/libepoxy[egl(+)] )
-	pdfium? ( net-print/cups )
 	test? (
 		widgets? ( app-text/poppler[cxx(+)] )
 	)
@@ -128,7 +127,7 @@ qtwebengine_check-reqs() {
 		ewarn "If run into issues, please try disabling before reporting a bug."
 	fi
 
-	local CHECKREQS_DISK_BUILD=8G
+	local CHECKREQS_DISK_BUILD=9G
 	local CHECKREQS_DISK_USR=360M
 
 	if ! has distcc ${FEATURES}; then #830661
@@ -192,7 +191,8 @@ src_configure() {
 		$(qt_feature vulkan webengine_vulkan)
 		-DQT_FEATURE_webengine_embedded_build=OFF
 		-DQT_FEATURE_webengine_extensions=ON
-		-DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+		# TODO: it may be possible to make x11 optional since 6.8+
+		-DQT_FEATURE_webengine_ozone_x11=ON
 		-DQT_FEATURE_webengine_pepper_plugins=ON
 		-DQT_FEATURE_webengine_printing_and_pdf=ON
 		-DQT_FEATURE_webengine_spellchecker=ON
@@ -203,8 +203,8 @@ src_configure() {
 		# cooperate with new major ffmpeg versions (bug #831487)
 		-DQT_FEATURE_webengine_system_ffmpeg=OFF
 
-		# use bundled re2 to avoid complications, may revisit
-		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+		# use bundled re2 to avoid complications, Qt has also disabled
+		# this by default in 6.7.3+ (bug #913923)
 		-DQT_FEATURE_webengine_system_re2=OFF
 
 		# bundled is currently required when using vaapi (forced regardless)
@@ -217,6 +217,7 @@ src_configure() {
 			minizip opus poppler snappy zlib)
 
 		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
 		-DINSTALL_GN=OFF
 	)
 
@@ -243,16 +244,7 @@ src_configure() {
 		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
 	fi
 
-	# Workaround for build failure with clang-18 and -march=native without
-	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
-	# TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
-	use amd64 && tc-is-clang && is-flagq -march=native &&
-		[[ $(clang-major-version) -ge 18 ]] &&
-		has_version '<sys-devel/llvm-18.1.5-r1' &&
-		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
-		append-flags -mevex512
-
-	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+	export NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
 
 	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
@@ -277,6 +269,7 @@ src_test() {
 
 	local CMAKE_SKIP_TESTS=(
 		# fails with network sandbox
+		tst_certificateerror
 		tst_loadsignals
 		tst_qquickwebengineview
 		tst_qwebengineglobalsettings
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 937f5ca9c883..fec93a911d24 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -88,7 +88,6 @@ DEPEND="
 	x11-libs/libxshmfence
 	opengl? ( media-libs/libglvnd[X] )
 	screencast? ( media-libs/libepoxy[egl(+)] )
-	pdfium? ( net-print/cups )
 	test? (
 		widgets? ( app-text/poppler[cxx(+)] )
 	)
@@ -128,7 +127,7 @@ qtwebengine_check-reqs() {
 		ewarn "If run into issues, please try disabling before reporting a bug."
 	fi
 
-	local CHECKREQS_DISK_BUILD=8G
+	local CHECKREQS_DISK_BUILD=9G
 	local CHECKREQS_DISK_USR=360M
 
 	if ! has distcc ${FEATURES}; then #830661
@@ -192,7 +191,8 @@ src_configure() {
 		$(qt_feature vulkan webengine_vulkan)
 		-DQT_FEATURE_webengine_embedded_build=OFF
 		-DQT_FEATURE_webengine_extensions=ON
-		-DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+		# TODO: it may be possible to make x11 optional since 6.8+
+		-DQT_FEATURE_webengine_ozone_x11=ON
 		-DQT_FEATURE_webengine_pepper_plugins=ON
 		-DQT_FEATURE_webengine_printing_and_pdf=ON
 		-DQT_FEATURE_webengine_spellchecker=ON
@@ -203,8 +203,8 @@ src_configure() {
 		# cooperate with new major ffmpeg versions (bug #831487)
 		-DQT_FEATURE_webengine_system_ffmpeg=OFF
 
-		# use bundled re2 to avoid complications, may revisit
-		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+		# use bundled re2 to avoid complications, Qt has also disabled
+		# this by default in 6.7.3+ (bug #913923)
 		-DQT_FEATURE_webengine_system_re2=OFF
 
 		# bundled is currently required when using vaapi (forced regardless)
@@ -217,6 +217,7 @@ src_configure() {
 			minizip opus poppler snappy zlib)
 
 		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
 		-DINSTALL_GN=OFF
 	)
 
@@ -243,16 +244,7 @@ src_configure() {
 		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
 	fi
 
-	# Workaround for build failure with clang-18 and -march=native without
-	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
-	# TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
-	use amd64 && tc-is-clang && is-flagq -march=native &&
-		[[ $(clang-major-version) -ge 18 ]] &&
-		has_version '<sys-devel/llvm-18.1.5-r1' &&
-		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
-		append-flags -mevex512
-
-	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+	export NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
 
 	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
@@ -277,6 +269,7 @@ src_test() {
 
 	local CMAKE_SKIP_TESTS=(
 		# fails with network sandbox
+		tst_certificateerror
 		tst_loadsignals
 		tst_qquickwebengineview
 		tst_qwebengineglobalsettings
-- 
cgit v1.2.3