From 4351c64bb21453c4774944c1e6e714b08ffbee95 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Sun, 17 Mar 2024 13:35:26 +0100
Subject: [PATCH] media-libs/openexr: 3.2.2 rework x86 test skip

Closes: https://bugs.gentoo.org/927173
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35800
Signed-off-by: Sam James <sam@gentoo.org>
---
 media-libs/openexr/openexr-3.2.2.ebuild | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/media-libs/openexr/openexr-3.2.2.ebuild b/media-libs/openexr/openexr-3.2.2.ebuild
index 71b9a4937dcb7..84a97d580e9f4 100644
--- a/media-libs/openexr/openexr-3.2.2.ebuild
+++ b/media-libs/openexr/openexr-3.2.2.ebuild
@@ -52,10 +52,6 @@ src_prepare() {
 	sed -e "s:if(INSTALL_DOCS):if(OPENEXR_INSTALL_DOCS):" \
 		-i docs/CMakeLists.txt || die
 
-	if use x86; then
-		eapply "${FILESDIR}/${PN}-3.1.5-drop-failing-testDwaLookups.patch"
-	fi
-
 	cmake_src_prepare
 
 	if use test; then
@@ -123,6 +119,16 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+    local CMAKE_SKIP_TESTS=()
+
+    use x86 && CMAKE_SKIP_TESTS+=(
+        '^OpenEXR.testDwaLookups$'
+    )
+
+    cmake_src_test
+}
+
 src_install() {
 	use examples && docompress -x "/usr/share/doc/${PF}/examples"