[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/

["Sam James" <sam@gentoo.org>]

commit:     1f693e0323f6bf0be380c1dfbedab4fe22561ac7
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Jan 26 17:03:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 07:53:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f693e03

sci-libs/vtk: fix build with USE=offscreen

The package can be built with either USE=offscreen, or with USE=X
enabled, but not with both simultaneously.

Closes: https://bugs.gentoo.org/830774
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23970
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/vtk/{vtk-9.0.3-r3.ebuild => vtk-9.0.3-r4.ebuild} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-libs/vtk/vtk-9.0.3-r3.ebuild b/sci-libs/vtk/vtk-9.0.3-r4.ebuild
similarity index 99%
rename from sci-libs/vtk/vtk-9.0.3-r3.ebuild
rename to sci-libs/vtk/vtk-9.0.3-r4.ebuild
index db7df9ecb55d..578cf8ade8fb 100644
--- a/sci-libs/vtk/vtk-9.0.3-r3.ebuild
+++ b/sci-libs/vtk/vtk-9.0.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,7 @@ REQUIRED_USE="
 	qt5? ( X rendering )
 	tk? ( X rendering python )
 	web? ( python )
+	^^ ( X offscreen )
 "
 
 RDEPEND="
@@ -358,9 +359,9 @@ src_configure() {
 
 	if use offscreen; then
 		mycmakeargs+=(
-			-DVTK_OPENGL_HAS_OSMESA=ON
 			-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=ON
 			-DVTK_DEFAULT_RENDER_WINDOW_HEADLESS=ON
+			-DVTK_OPENGL_HAS_OSMESA=ON
 		)
 	fi