gentoo auto-resync : 26:02:2025 - 19:26:07

6 files changed, 10 insertions, 380 deletions

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 6558304d4abc..693524d0a989 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -5,11 +5,9 @@ AUX qtbase-6.6.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f75
 AUX qtbase-6.8.0-qcontiguouscache.patch 526 BLAKE2B b701f92d8365e8408a2ff79c812c397ac0042aa6b6316cf167a7877d48044ffaa0d2683fa27ffcbe80c8e74f8ff0c8af220b927889e83340c6b5325b1fbf16ab SHA512 19f33f2dd856c8328b9175458250929f3da34cde179d5f52ec1982e5e5f1772412f2541e146763a6258ce3377e0b624f07926fe4af56de7364c34835151b8995
 AUX qtbase-6.8.2-QTBUG-133500.patch 1800 BLAKE2B cc5af9a4d2a6956589bab2d1e9f669a4fd8e33f76c0ca713ed1309870fc35155c4b447feb4e9708d723aff18947ac2245913eccb726631c2b210751a719fb3ab SHA512 ed68106db666693f48215e3053ba3b40d78713661e081aaa23e6e0cd380b8d13374f92fb22df049a04e21b6265781c44160758e4613114f645275e5e388ead4a
 AUX qtbase-6.8.2-QTBUG-133808.patch 321 BLAKE2B d2821e62ae8cb14160def02c3b8bdcf881afc8a78330f2c7c4195ba5e063e9435592307c50f2270bcf2a34b111f60c4aaafd1374e8aba53e32f12e579029136f SHA512 8db39eee8ed1e1a16626744a93d08abc8597142ead2289792c4713937d6815e23355c7ea0851afe2b709f073d52015da16b43159880a90bc6220e8243195e934
-DIST qtbase-everywhere-src-6.8.1.tar.xz 48220752 BLAKE2B b42d562f9069cf3d68807c63492f0ae1dcb9cb9a057a8d8548a7d134b36af169e403324e2902fa59c6c82ce087add107173c7606dff952dbbbc06c33b056ddff SHA512 87b7df95a63f7c28bfc7659f19658e4151b9da55b0dc4d34dc0e04c5270254b01a72f8deac0b2fc5543fce8d7542128addb398833de9c3248196aa96b2dd1601
 DIST qtbase-everywhere-src-6.8.2.tar.xz 48264736 BLAKE2B 3c4a71a0c515d7433eda3a6155a0499ea43ce708fb25614843499bf8a7a71ef06ba93dad9e7dd04a28b86a88eea00151ad3500d06bd09b9b37a4e070774e2684 SHA512 4a074aca1c8bcca536fd428c969c0119f5131d0d52b67028edbb75a81dc6e0c15394f69e29cef513e6d8c6e93384cedc38dd03b0eed6ab1bbafbe2b5bbc85799
-EBUILD qtbase-6.8.1.ebuild 10455 BLAKE2B 47d0e9fda4aa3a2347b6feeddccc820f528849cd32ec707175cd243a5c390b99fa78bccd23054ad5f14e15ab1ba457f9ac1af6ae3bf0477f646a179aa6692f42 SHA512 d9a21714af5063b3b2c76eb2606ea6d597cfdabc9c3ab3edb36df547d55ce15d38e605c8b54cc9da257237b209b72c6c06c3eac0477bc95dfcb2756f6ebbad87
-EBUILD qtbase-6.8.2-r2.ebuild 10684 BLAKE2B 0215794870b75da7b91fbc34f27963ba29935a64461273b4c5ab3c6253e560c2c63e6d79f67a8298bf7f22e64d192ca9596a5b26c12922d5ab19aea338ae2d4b SHA512 258adcdaf5bd01acb3714487b80678b30b1b9a6aca52f1f2bcf090a5995a7dc0662fe7867253975d04679e39184320342ddcf213abc39ad85bd33a8016a2a46e
-EBUILD qtbase-6.8.9999.ebuild 10612 BLAKE2B 305f1eeb30ab271780351100716af9635d9f1aa1c0fe9665bb16588951b2208c40f303296a32429a7e8d69b9f0f41fe05fbb63bda9023a377e40d57e95347c82 SHA512 13f2519f275fa15c5bc862683327259b291e4eb41339371ff7d57e9424104467286ad2b69650041878da8abbff83c7995250c8489f02413e0220bb0ef2a1500c
-EBUILD qtbase-6.9.9999.ebuild 10598 BLAKE2B 7badb3f74912090077a4620d90fb8a5cc3d670bc894e2a21c4552cee29bfd345a561c5187825c28f0cd17d916d8fa3ccb57b9d7b49a26e279b60df8fb0bd3157 SHA512 49913c97896e940eec68e1fe009043394e6576a7bdffe851521860d10ab75e9a36f1c53df88586b4995f21e1458d2a0942958ef1a9b78616b94b5148defb5c56
-EBUILD qtbase-6.9999.ebuild 10598 BLAKE2B 7badb3f74912090077a4620d90fb8a5cc3d670bc894e2a21c4552cee29bfd345a561c5187825c28f0cd17d916d8fa3ccb57b9d7b49a26e279b60df8fb0bd3157 SHA512 49913c97896e940eec68e1fe009043394e6576a7bdffe851521860d10ab75e9a36f1c53df88586b4995f21e1458d2a0942958ef1a9b78616b94b5148defb5c56
+EBUILD qtbase-6.8.2-r2.ebuild 10742 BLAKE2B 2b870441c980245a6424e95f318426736e2070955dade204965188a18c2ada0fe90cfc0c4decca290cad1fb57416d30591cd15b8c555237ef2f19b0209c5cbf2 SHA512 cc40690e9d81f8185b227eada3981fb7f3e8d567f982ffeb09cba113ca86aeadc0b22956ee3359049fd58461ab5f3f85e147d13e38e15992f2b962d24a03a459
+EBUILD qtbase-6.8.9999.ebuild 10670 BLAKE2B 12e92ffbc770715f5d28b4664eb1c64139a83de3fb217ef031969fc388b47ca3d42bd383fda7eac11d753ea920909f076a6537dc2e88c84026d1798e5354637c SHA512 a6277c0a7f003ee9a2d6e7a3f759728baa7ff39a6b25a79bf084f53d5f5b6c0a1cf0c5ec1a94bee4a4ed2cbfcc94cc9f45952c1577e279ffce17ae3296d44b7f
+EBUILD qtbase-6.9.9999.ebuild 10666 BLAKE2B fbd5f6a55f2edba9c72745289a53e151d10e741763850c3e421da894ed96610c8dab1dc002dc70335b301618a12490137913fc10dd080ba4467651a14409fdff SHA512 699329866a1cc86b575ff542d0a13c13d27f6c9260c626a36aa7bdb05c4d15cd37680c462924e1bcc74bc73ab94b44f231cb8559a996346ed23c61fd906fc9f5
+EBUILD qtbase-6.9999.ebuild 10666 BLAKE2B fbd5f6a55f2edba9c72745289a53e151d10e741763850c3e421da894ed96610c8dab1dc002dc70335b301618a12490137913fc10dd080ba4467651a14409fdff SHA512 699329866a1cc86b575ff542d0a13c13d27f6c9260c626a36aa7bdb05c4d15cd37680c462924e1bcc74bc73ab94b44f231cb8559a996346ed23c61fd906fc9f5
 MISC metadata.xml 1965 BLAKE2B e91aa3bc2379fa587766cfc7c4053b382a8894c0092d075543b2a5d466dfa001105bb0f564008fab8e71d4517954e527618896de41069c6bafb4258f6201cdbe SHA512 a71f6fe0fb01e60716aa6632605a423f765983f41da2c8ca761afca548cd061bd52bc328f7441fa831e890d75bcfc2820112c946802588dab1de706fbb7ac531
diff --git a/dev-qt/qtbase/qtbase-6.8.1.ebuild b/dev-qt/qtbase/qtbase-6.8.1.ebuild
deleted file mode 100644
index e322427fd8fd..000000000000
--- a/dev-qt/qtbase/qtbase-6.8.1.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build toolchain-funcs
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-declare -A QT6_IUSE=(
-	[global]="+ssl +udev zstd"
-	[core]="icu journald syslog"
-	[modules]="+concurrent +dbus +gui +network +sql +xml"
-
-	[gui]="
-		+X accessibility eglfs evdev gles2-only +libinput
-		opengl renderdoc tslib vulkan wayland +widgets
-	"
-	[network]="brotli gssapi libproxy sctp"
-	[sql]="mysql oci8 odbc postgres +sqlite"
-	[widgets]="cups gtk"
-
-	[optfeature]="nls" #810802
-)
-IUSE="${QT6_IUSE[*]}"
-REQUIRED_USE="
-	?? ( journald syslog )
-	$(
-		printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
-		printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
-		printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
-		printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
-	)
-	accessibility? ( dbus )
-	eglfs? ( opengl )
-	gles2-only? ( opengl )
-	gui? ( || ( X eglfs wayland ) )
-	libinput? ( udev )
-	sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
-	test? ( icu sql? ( sqlite ) )
-"
-
-# groups:
-# - global (configure.cmake)
-# - qtcore (src/corelib/configure.cmake)
-# - qtgui (src/gui/configure.cmake)
-# - qtnetwork (src/network/configure.cmake)
-# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
-# - qtsql (src/plugins/sqldrivers/configure.cmake)
-# nolink: renderdoc, systemd
-COMMON_DEPEND="
-	sys-libs/zlib:=
-	ssl? ( dev-libs/openssl:= )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-
-	app-crypt/libb2
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2:=[pcre16,unicode(+)]
-	icu? ( dev-libs/icu:= )
-	journald? ( sys-apps/systemd )
-
-	dbus? ( sys-apps/dbus )
-	gui? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		media-libs/harfbuzz:=
-		media-libs/libjpeg-turbo:=
-		media-libs/libpng:=
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[X?]
-		X? (
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libX11
-			x11-libs/libxcb:=
-			x11-libs/xcb-util-cursor
-			x11-libs/xcb-util-image
-			x11-libs/xcb-util-keysyms
-			x11-libs/xcb-util-renderutil
-			x11-libs/xcb-util-wm
-		)
-		accessibility? ( app-accessibility/at-spi2-core:2 )
-		eglfs? ( media-libs/mesa[gbm(+)] )
-		evdev? ( sys-libs/mtdev )
-		libinput? ( dev-libs/libinput:= )
-		opengl? (
-			gles2-only? ( media-libs/libglvnd )
-			!gles2-only? ( media-libs/libglvnd[X?] )
-		)
-		renderdoc? ( media-gfx/renderdoc )
-		tslib? ( x11-libs/tslib )
-		widgets? (
-			cups? ( net-print/cups )
-			gtk? (
-				x11-libs/gdk-pixbuf:2
-				>=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
-				x11-libs/pango
-			)
-		)
-	)
-	network? (
-		brotli? ( app-arch/brotli:= )
-		gssapi? ( virtual/krb5 )
-		libproxy? ( net-libs/libproxy )
-	)
-	sql? (
-		mysql? ( dev-db/mysql-connector-c:= )
-		oci8? ( dev-db/oracle-instantclient:=[sdk] )
-		odbc? ( dev-db/unixODBC )
-		postgres? ( dev-db/postgresql:* )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	syslog? ( virtual/logger )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	X? ( x11-base/xorg-proto )
-	gui? (
-		vulkan? ( dev-util/vulkan-headers )
-	)
-	network? (
-		sctp? ( net-misc/lksctp-tools )
-	)
-	test? (
-		elibc_musl? ( sys-libs/timezone-data )
-	)
-"
-BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392
-PDEPEND="
-	nls? ( ~dev-qt/qttranslations-${PV}:6 )
-	wayland? ( ~dev-qt/qtwayland-${PV}:6 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
-	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
-	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
-	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
-	"${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch
-)
-
-src_prepare() {
-	qt6-build_src_prepare
-
-	if use test; then
-		# test itself has -Werror=strict-aliasing issues, drop for simplicity
-		sed -e '/add_subdirectory(qsharedpointer)/d' \
-			-i tests/auto/corelib/tools/CMakeLists.txt || die
-
-		# workaround for __extendhfxf2 being used for tst_qfloat16.cpp
-		# which is unavailable with compiler-rt (assume used if clang)
-		if tc-is-clang; then
-			sed -e '/add_subdirectory(qfloat16)/d' \
-				-i tests/auto/corelib/global/CMakeLists.txt || die
-		fi
-	fi
-}
-
-src_configure() {
-	if use gtk; then
-		# defang automagic dependencies (bug #624960)
-		use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
-		use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_WITH_PCH=OFF
-
-		-DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}"
-		-DINSTALL_BINDIR="${QT6_BINDIR}"
-		-DINSTALL_DATADIR="${QT6_DATADIR}"
-		-DINSTALL_DOCDIR="${QT6_DOCDIR}"
-		-DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}"
-		-DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}"
-		-DINSTALL_LIBDIR="${QT6_LIBDIR}"
-		-DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}"
-		-DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}"
-		-DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}"
-		-DINSTALL_QMLDIR="${QT6_QMLDIR}"
-		-DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}"
-		-DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}"
-
-		-DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
-
-		-DQT_FEATURE_relocatable=OFF #927691
-		$(qt_feature ssl openssl)
-		$(qt_feature ssl openssl_linked)
-		$(qt_feature udev libudev)
-		$(qt_feature zstd)
-
-		# qtcore
-		$(qt_feature icu)
-		$(qt_feature journald)
-		$(qt_feature syslog)
-
-		# tools
-		-DQT_FEATURE_androiddeployqt=OFF
-
-		# modules
-		$(qt_feature concurrent)
-		$(qt_feature dbus)
-		$(qt_feature gui)
-		$(qt_feature network)
-		$(qt_feature sql)
-		# trivial, and is often needed (sometimes even when not building tests)
-		-DQT_FEATURE_testlib=ON
-		$(qt_feature xml)
-
-		# let gentoo's defaults and/or users control security *FLAGS
-		-DQT_FEATURE_glibc_fortify_source=OFF
-		-DQT_FEATURE_intelcet=OFF
-		-DQT_FEATURE_libcpp_hardening=OFF
-		-DQT_FEATURE_libstdcpp_assertions=OFF
-		-DQT_FEATURE_relro_now_linker=OFF
-		-DQT_FEATURE_stack_clash_protection=OFF
-		-DQT_FEATURE_stack_protector=OFF
-		-DQT_FEATURE_trivial_auto_var_init_pattern=OFF
-
-		-DQT_INTERNAL_AVOID_OVERRIDING_SYNCQT_CONFIG=ON # would force -O3
-	)
-
-	use gui && mycmakeargs+=(
-		$(qt_feature X xcb)
-		$(qt_feature X system_xcb_xinput)
-		$(qt_feature X xkbcommon_x11)
-		$(cmake_use_find_package X X11) # needed for truly no automagic
-		$(qt_feature accessibility accessibility_atspi_bridge)
-		$(qt_feature eglfs)
-		$(qt_feature evdev)
-		$(qt_feature evdev mtdev)
-		$(qt_feature libinput)
-		$(qt_feature renderdoc graphicsframecapture)
-		$(qt_feature tslib)
-		$(qt_feature vulkan)
-		$(qt_feature wayland)
-		$(qt_feature widgets)
-		-DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no)
-		-DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c
-	) && use widgets && mycmakeargs+=(
-		# note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
-		$(qt_feature cups)
-		$(qt_feature gtk gtk3)
-	)
-
-	use network && mycmakeargs+=(
-		$(qt_feature brotli)
-		$(qt_feature gssapi)
-		$(qt_feature libproxy)
-		$(qt_feature sctp)
-		$(usev test -DQT_SKIP_DOCKER_COMPOSE=ON)
-	)
-
-	use sql && mycmakeargs+=(
-		-DQT_FEATURE_sql_db2=OFF # unpackaged
-		-DQT_FEATURE_sql_ibase=OFF # unpackaged
-		-DQT_FEATURE_sql_mimer=OFF # unpackaged
-		$(qt_feature mysql sql_mysql)
-		$(qt_feature oci8 sql_oci)
-		$(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
-		$(qt_feature odbc sql_odbc)
-		$(qt_feature postgres sql_psql)
-		$(qt_feature sqlite sql_sqlite)
-		$(qt_feature sqlite system_sqlite)
-	)
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	local -x TZ=UTC
-	local -x LC_TIME=C
-
-	local CMAKE_SKIP_TESTS=(
-		# broken with out-of-source + if qtbase is not already installed
-		tst_moc
-		tst_qmake
-		# similarly broken when relocatable=OFF (bug #927691)
-		tst_qapplication
-		tst_qt_cmake_create
-		tst_uic
-		# needs x11/opengl, we *could* run these but tend to be flaky
-		# when opengl rendering is involved (even if software-only)
-		tst_qopengl{,config,widget,window}
-		tst_qgraphicsview
-		tst_qx11info
-		# fails with network sandbox
-		tst_qdnslookup
-		# fails with sandbox
-		tst_qsharedmemory
-		# typical to lack SCTP support on non-generic kernels
-		tst_qsctpsocket
-		# randomly fails without -j1, and not worth it over this (bug #916181)
-		tst_qfiledialog{,2}
-		# may randomly hang+timeout, perhaps related to -j as well
-		tst_qprocess #936484
-		tst_qtimer
-		# haystacksWithMoreThan4GiBWork can easily OOM (16GB ram not enough)
-		tst_qlatin1stringmatcher
-		# these can be flaky depending on the environment/toolchain
-		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
-		# known failing when using clang+glibc+stdc++, needs looking into
-		tst_qthread
-		# partially failing on x86 chroots and seemingly(?) harmless (dev-qt
-		# revdeps tests pass), skip globally to avoid keywording flakiness
-		tst_json
-		tst_qcolorspace
-		tst_qdoublevalidator
-		tst_qglobal
-		tst_qglyphrun
-		tst_qvectornd
-		tst_rcc
-		# similarly, but on armv7 and potentially others (bug #914028)
-		tst_qlineedit
-		tst_qpainter
-		# likewise, known failing on BE arches (bug #914033,914371,918878)
-		tst_qimagereader
-		tst_qimagewriter
-		tst_qpluginloader
-		tst_quuid # >=6.6.2 had related fixes, needs retesting
-		# partially broken on llvm-musl, needs looking into but skip to have
-		# a baseline for regressions (rest of dev-qt still passes with musl)
-		$(usev elibc_musl '
-			tst_qicoimageformat
-			tst_qimagereader
-			tst_qimage
-		')
-		# fails due to hppa's NaN handling, needs looking into (bug #914371)
-		$(usev hppa '
-			tst_qcborvalue
-			tst_qnumeric
-		')
-		# note: for linux, upstream only really runs+maintains tests for amd64
-		# https://doc.qt.io/qt-6/supported-platforms.html
-	)
-
-	qt6-build_src_test
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete_bins=( # need a better way to handle this
-			clientserver copier crashingServer desktopsettingsaware_helper
-			echo fileWriterProcess modal_helper nospace 'one space'
-			paster qcommandlineparser_test_helper qfileopeneventexternal
-			socketprocess syslocaleapp tst_qhashseed_helper 'two space s'
-			write-read-write
-		)
-		local delete=( # sigh
-			"${D}${QT6_BINDIR}"/test*
-			"${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild
index f0f9a8a30e5e..08f1610075ec 100644
--- a/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild
@@ -372,6 +372,7 @@ src_install() {
 		)
 		local delete=( # sigh
 			"${D}${QT6_BINDIR}"/test*
+			"${D}${QT6_LIBDIR}/objects-${CMAKE_BUILD_TYPE}"/*test*
 			"${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
 		)
 		# using -f given not tracking which tests may be skipped or not
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 7e7d1bd57609..6eeb224df3dd 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -370,6 +370,7 @@ src_install() {
 		)
 		local delete=( # sigh
 			"${D}${QT6_BINDIR}"/test*
+			"${D}${QT6_LIBDIR}/objects-${CMAKE_BUILD_TYPE}"/*test*
 			"${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
 		)
 		# using -f given not tracking which tests may be skipped or not
diff --git a/dev-qt/qtbase/qtbase-6.9.9999.ebuild b/dev-qt/qtbase/qtbase-6.9.9999.ebuild
index 8a4abb2947a4..b27a756c0106 100644
--- a/dev-qt/qtbase/qtbase-6.9.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9.9999.ebuild
@@ -362,7 +362,7 @@ src_install() {
 
 	if use test; then
 		local delete_bins=( # need a better way to handle this
-			clientserver copier crashingServer desktopsettingsaware_helper
+			apphelper clientserver copier crashingServer desktopsettingsaware_helper
 			echo fileWriterProcess modal_helper nospace 'one space'
 			paster qcommandlineparser_test_helper qfileopeneventexternal
 			socketprocess syslocaleapp tst_qhashseed_helper 'two space s'
@@ -370,6 +370,7 @@ src_install() {
 		)
 		local delete=( # sigh
 			"${D}${QT6_BINDIR}"/test*
+			"${D}${QT6_LIBDIR}/objects-${CMAKE_BUILD_TYPE}"/*test*
 			"${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
 		)
 		# using -f given not tracking which tests may be skipped or not
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 8a4abb2947a4..b27a756c0106 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -362,7 +362,7 @@ src_install() {
 
 	if use test; then
 		local delete_bins=( # need a better way to handle this
-			clientserver copier crashingServer desktopsettingsaware_helper
+			apphelper clientserver copier crashingServer desktopsettingsaware_helper
 			echo fileWriterProcess modal_helper nospace 'one space'
 			paster qcommandlineparser_test_helper qfileopeneventexternal
 			socketprocess syslocaleapp tst_qhashseed_helper 'two space s'
@@ -370,6 +370,7 @@ src_install() {
 		)
 		local delete=( # sigh
 			"${D}${QT6_BINDIR}"/test*
+			"${D}${QT6_LIBDIR}/objects-${CMAKE_BUILD_TYPE}"/*test*
 			"${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
 		)
 		# using -f given not tracking which tests may be skipped or not