gentoo auto-resync : 15:11:2023 - 22:37:24

3 files changed, 2 insertions, 281 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index e5f1f3bfd011..97c56d95bd43 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -9,12 +9,10 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
 DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
 DIST qtwebengine-6.6-patchset-1.tar.xz 9648 BLAKE2B c1bb02662ed5952e22ac3c3ee68f5787503bcc6d12d05c22090cf9ba22511c76308aa1bb751df0a822585de63694f8ce0f254558416e392abe437995e30b7e99 SHA512 a634a2976bc19ada61671bc017a4456111214cc47a40c88812465f0ba25d025b3aa4da32467c59f7053d21650f3ac72010118b3b6962d34bb347d42b9109f95f
 DIST qtwebengine-6.6-patchset-3.tar.xz 9920 BLAKE2B 12b287392dabf1f1e3e99381ab1abf7e8fe44d85fb1b7148bc2d3427ff82d91e0d545955ee7c326f4d5e5af739759df2246173151673dabce3aa8aec28c4ecd8 SHA512 371549b2a2577872700842cc7f93cca900499b99de62f297a012fb16ccbb9d7c1f87a0123996ab14a49adf5604018000615736a8cc728122d37012ec6838211f
-DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
 DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 131b4baf0267e77e1356568867db26fe86af165ddbd9abb5f2c6121e757011f5e18dfc41b30342eebf5d53f54492a20c1c77309782355b369b73c088d2102814 SHA512 8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49
 DIST qtwebengine-everywhere-src-6.6.0.tar.xz 421117212 BLAKE2B b168913644e07d3d649082a78a03ccfb135960ea61907046f3e16c28471a9684aca4685ea907ed47a27719647ae0d9c753d4faa9e24c9897e88dad24b08bd774 SHA512 30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366
 EBUILD qtwebengine-5.15.11_p20231102.ebuild 8728 BLAKE2B cc1d87205949289e8d993b9e2656a91cfb1a1800725111c2b2c7d4ca8565b41f637841961ca9706d56fc5e2899a2bd220fabe9e22247ac59423d852123f9b2a4 SHA512 997e79d2939c9ae03c5890c99c4b7a163b73e545ba4bc3931a0de13ea9a235ee5133ca8b6cb67419aad9d1b25ec834819fa5a5d1a4f6dffe40b89c40e709483a
-EBUILD qtwebengine-6.5.2-r1.ebuild 8266 BLAKE2B 84e5d800f698c4c8ab3e94844157308d50c0e444daced479e6fc2b0b932d95d71a424f9786ea42c220651e8f298cf7c2d6fa67f11422eb48c2562b0bc6b0cc50 SHA512 5e561ce9652464b53bb9a70a9107e901a0e8afb8c23bfb25eb630bcbd8057c3f73c8a50152d4285c235f93880bd9ad94262964e9cb68b97085a44787ff2956a8
-EBUILD qtwebengine-6.5.3.ebuild 8304 BLAKE2B 6a5a66741352aad469ee2ed092e8d3475b0f55eee7939538379177de93e4f6f22343bc6b5bfb0c03a279ac5179b20e8c9617332f4a64dc45f986ef2658511d8c SHA512 fde3c768603b01df4422577975f1e726f9a01333adcf2fa297e28e87decc01ec326db46d985d23451703e274f4a234b17d115101ec0db4341aa8bee1edbb1797
+EBUILD qtwebengine-6.5.3.ebuild 8303 BLAKE2B 92cf5dad4a36778bfa7cbc282baa4d5296215a819a591c453a5772b0ba575fbbea5548bcdd4a50236178422c5b08fd487d151ed9cca506adaedc24c2d913d4ec SHA512 4c540026fdc658e4426d64a1ac2e848723fce05a7e62dde1313303a2fa83db4c78d6f2e03627d16767ade187f70e5ebb39645cb987127ca114dbd91d9cf72222
 EBUILD qtwebengine-6.6.0.ebuild 8595 BLAKE2B 31d24fe2192b598569a58cca547a7e962981a5757fe37a91eac8c3346a4c4d5744c67187f0360457b83968f923b957e4b943cf9e0a29615951775a0bf6da025b SHA512 d22ebb55538e7d878f27c61bcff76d7b13a6247942d23ef8cea4ae7d7f2ccedd0b6dc92afed63e6177985c0a78309c82097a3f166915fe2b007bb5f117fe3b6f
 EBUILD qtwebengine-6.6.9999.ebuild 8587 BLAKE2B 80180f5c67f91ea2c0b043026f8356af404a4505d33c2aa29d22603807fd2d917bfa5b4562e5f812f4b761e8a00a23f19f86825754f247f258f5585903a9f924 SHA512 306c9c28fdcd85c07213acf1b04b78e6b9a05a1c2a84b82ff8c2ce2bb91215fd0588262ca075b7468a129652525f796d93aba200091959576c809578e4648985
 EBUILD qtwebengine-6.9999.ebuild 8587 BLAKE2B 56fbe5f82062b45a1d8fb3a00b9f3d48418c7cc99d67233ac5f6a737ccaddf7a312f5a55a42787962bc6fde21df512cfa1ca231661ab423147b98310b5b66472 SHA512 fcb50ddfcf6155389d036cc5cb6fdc764da1646037618025cc7e81dda6256f6d68dd4a8414b183d13889b7c68716c3348f4f1dd5af9312e5c56ae4b973570670
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
deleted file mode 100644
index 4e6a0bddbc50..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs flag-o-matic multiprocessing optfeature
-inherit prefix python-any-r1 qt6-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-SRC_URI+="
-	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.5-patchset-1.tar.xz
-"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64"
-fi
-
-IUSE="
-	+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
-	opengl pulseaudio qml screencast +system-icu vulkan +widgets
-"
-REQUIRED_USE="
-	designer? ( qml widgets )
-"
-
-# dlopen: krb5, pciutils, udev
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
-	~dev-qt/qtwebchannel-${PV}:6[qml?]
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libvpx:=
-	media-libs/libwebp:=
-	media-libs/openjpeg:2=
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/zlib:=[minizip]
-	virtual/libudev
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	alsa? ( media-libs/alsa-lib )
-	designer? ( ~dev-qt/qttools-${PV}:6[designer] )
-	geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-libs/libpulse[glib] )
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-	screencast? (
-		dev-libs/glib:2
-		media-libs/mesa[gbm(+)]
-		media-video/pipewire:=
-		x11-libs/libdrm
-	)
-	system-icu? ( dev-libs/icu:= )
-	widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
-"
-DEPEND="
-	${RDEPEND}
-	media-libs/libglvnd
-	x11-base/xorg-proto
-	x11-libs/libxshmfence
-	screencast? ( media-libs/libepoxy[egl(+)] )
-	test? (
-		widgets? ( app-text/poppler[cxx(+)] )
-	)
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
-	dev-util/gperf
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-PATCHES=( "${WORKDIR}"/patches/${PN} )
-[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999
-	PATCHES+=( "${WORKDIR}"/patches/chromium )
-
-PATCHES+=(
-	# add extras as needed here, may merge in set if carries across versions
-	"${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
-	"${FILESDIR}"/${PN}-6.5.2-cstdint.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if is-flagq '-g?(gdb)?([1-9])'; then #307861
-		ewarn
-		ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
-		ewarn "is non-trivial with ${PN}. May experience extended compilation"
-		ewarn "times, increased disk/memory usage, and potentially link failure."
-		ewarn
-		ewarn "If run into issues, please try disabling before reporting a bug."
-	fi
-
-	local CHECKREQS_DISK_BUILD=7G
-	local CHECKREQS_DISK_USR=220M
-
-	if ! has distcc ${FEATURES}; then #830661
-		# assume ~2GB per job or 1.5GB if clang, possible with less
-		# depending on free memory and *FLAGS, but prefer being safe as
-		# users having OOM issues with qtwebengine been rather common
-		tc-is-clang && : 15 || : 20
-		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
-	fi
-
-	check-reqs_${EBUILD_PHASE_FUNC} #570534
-}
-
-pkg_pretend() {
-	qtwebengine_check-reqs
-}
-
-pkg_setup() {
-	qtwebengine_check-reqs
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	qt6-build_src_prepare
-
-	# for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
-	hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
-
-	# store chromium versions, only used in postinst for a warning
-	local chromium
-	mapfile -t chromium < CHROMIUM_VERSION || die
-	[[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
-		QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
-	[[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
-		QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT_FEATURE_qtpdf_build=OFF # TODO?
-		-DQT_FEATURE_qtpdf_quick_build=OFF
-		-DQT_FEATURE_qtpdf_widgets_build=OFF
-
-		-DQT_FEATURE_qtwebengine_build=ON
-		$(qt_feature qml qtwebengine_quick_build)
-		$(qt_feature widgets qtwebengine_widgets_build)
-
-		$(cmake_use_find_package designer Qt6Designer)
-
-		$(qt_feature alsa webengine_system_alsa)
-		$(qt_feature !bindist webengine_proprietary_codecs)
-		$(qt_feature geolocation webengine_geolocation)
-		$(qt_feature jumbo-build webengine_jumbo_build)
-		$(qt_feature kerberos webengine_kerberos)
-		$(qt_feature pulseaudio webengine_system_pulseaudio)
-		$(qt_feature screencast webengine_webrtc_pipewire)
-		$(qt_feature system-icu webengine_system_icu)
-		$(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
-		-DQT_FEATURE_webengine_pepper_plugins=ON
-		-DQT_FEATURE_webengine_printing_and_pdf=ON
-		-DQT_FEATURE_webengine_spellchecker=ON
-		-DQT_FEATURE_webengine_webchannel=ON
-		-DQT_FEATURE_webengine_webrtc=ON
-
-		# needs a modified ffmpeg to be usable, and even then it may not
-		# cooperate with new major ffmpeg versions (bug #831487)
-		-DQT_FEATURE_webengine_system_ffmpeg=OFF
-
-		# preemptively using bundled to avoid complications, may revisit
-		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
-		-DQT_FEATURE_webengine_system_re2=OFF
-
-		# not necessary to pass these (default), but in case detection fails
-		$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
-			freetype glib harfbuzz lcms2 libevent libjpeg \
-			libopenjpeg2 libpci libpng libvpx libwebp libxml \
-			minizip opus poppler snappy zlib)
-
-		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
-		-DINSTALL_GN=OFF
-	)
-
-	local mygnargs=(
-		# prefer no dlopen where possible
-		link_pulseaudio=true
-		rtc_link_pipewire=true
-	)
-
-	if use !custom-cflags; then
-		strip-flags # fragile
-
-		if is-flagq '-g?(gdb)?([2-9])'; then #914475
-			replace-flags '-g?(gdb)?([2-9])' -g1
-			ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
-		fi
-	fi
-
-	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
-	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
-
-	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
-	einfo "Extra Gn args: ${EXTRA_GN}"
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		# almost every tests fail, so skip entirely
-		ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
-		return
-	fi
-
-	local CMAKE_SKIP_TESTS=(
-		# fails with network sandbox
-		tst_loadsignals
-		tst_qquickwebengineview
-		tst_qwebengineview
-		# certs verfication seems flaky and gives expiration warnings
-		tst_qwebengineclientcertificatestore
-	)
-
-	# prevent using the system's qtwebengine
-	# (use glob to avoid unnecessary complications with arch dir)
-	local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
-	[[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
-	local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
-	local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
-	local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
-
-	# random failures in several tests without -j1
-	qt6-build_src_test -j1
-}
-
-pkg_postinst() {
-	# plugin may also be found in $HOME if provided by chrome or firefox
-	use amd64 &&
-		optfeature "Widevine DRM support (protected media playback)" \
-			www-plugins/chrome-binary-plugins
-
-	elog
-	elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
-	elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
-	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 "tl;dr your web browsing experience will be compromised."
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
index d8260cb08d44..286f497b5721 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI+="
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="