From d5599da3055bf9b900513a61c3c6e4bdbb524503 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 8 Jun 2023 15:45:39 +0100
Subject: gentoo auto-resync : 08:06:2023 - 15:45:39

---
 eclass/ecm.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'eclass/ecm.eclass')

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 20a41300e5e0..ae7e44706b0e 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -29,6 +29,9 @@ esac
 if [[ -z ${_ECM_ECLASS} ]]; then
 _ECM_ECLASS=1
 
+inherit cmake flag-o-matic toolchain-funcs
+
+if [[ ${EAPI} == 8 ]]; then
 # @ECLASS_VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # For proper description see virtualx.eclass manpage.
@@ -36,7 +39,8 @@ _ECM_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : "${VIRTUALX_REQUIRED:=manual}"
 
-inherit cmake flag-o-matic toolchain-funcs virtualx
+inherit virtualx
+fi
 
 # @ECLASS_VARIABLE: ECM_NONGUI
 # @DEFAULT_UNSET
@@ -587,13 +591,15 @@ ecm_src_test() {
 		KDE_DEBUG=1 cmake_src_test
 	}
 
+	local -x QT_QPA_PLATFORM=offscreen
+
 	# When run as normal user during ebuild development with the ebuild command,
 	# tests tend to access the session DBUS. This however is not possible in a
 	# real emerge or on the tinderbox.
 	# make sure it does not happen, so bad tests can be recognized and disabled
 	unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
 
-	if [[ ${VIRTUALX_REQUIRED} = always || ${VIRTUALX_REQUIRED} = test ]]; then
+	if [[ ${EAPI} == 8 ]] && [[ ${VIRTUALX_REQUIRED} = always || ${VIRTUALX_REQUIRED} = test ]]; then
 		virtx _test_runner
 	else
 		_test_runner
-- 
cgit v1.2.3