dev-games/openscenegraph: Drop USE gtk

Reported-by: David Heidelberg (okias) <david@ixit.cz>
Closes: https://bugs.gentoo.org/703674
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
index 29582ffe909813adf7c3286e43c186bf85b6a946..ab15331d995cca21ace477ae9d0d47c359e93a23 100644 (file)
--- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 x86"
-IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg
+IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer jpeg
 las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
 truetype vnc wxwidgets xine xrandr zlib"
 
@@ -34,7 +34,6 @@ RDEPEND="
                fltk? ( x11-libs/fltk:1[opengl] )
                fox? ( x11-libs/fox:1.6[opengl] )
                glut? ( media-libs/freeglut )
-               gtk? ( x11-libs/gtkglext )
                sdl2? ( media-libs/libsdl2 )
                wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
        )
@@ -109,7 +108,7 @@ src_configure() {
                -DWITH_GIFLIB=$(usex gif)
                -DWITH_GStreamer=$(usex gstreamer)
                -DWITH_GLIB=$(usex gstreamer)
-               -DWITH_GtkGl=$(usex gtk)
+               -DWITH_GtkGl=OFF
                -DWITH_JPEG=$(usex jpeg)
                -DWITH_Jasper=OFF
                -DWITH_LIBLAS=$(usex las)

diff --git a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
index 1e0f1b579dc26fe1be78068b4128e7a4a20e0d4d..2cf82085b9d3040a46073d5d3e4e5f067c3e4dd1 100644 (file)
--- a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
-gstreamer gtk jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2
+gstreamer jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2
 svg tiff truetype vnc wxwidgets xrandr +zlib"
 
 REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )"
@@ -39,7 +39,6 @@ RDEPEND="
                fltk? ( x11-libs/fltk:1[opengl] )
                fox? ( x11-libs/fox:1.6[opengl] )
                glut? ( media-libs/freeglut )
-               gtk? ( x11-libs/gtkglext )
                sdl2? ( media-libs/libsdl2 )
                wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
        )
@@ -112,7 +111,7 @@ src_configure() {
                $(cmake_use_find_package gif GIFLIB)
                $(cmake_use_find_package gstreamer GLIB)
                $(cmake_use_find_package gstreamer GStreamer)
-               $(cmake_use_find_package gtk GtkGl)
+               -DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
                $(cmake_use_find_package jpeg JPEG)
                -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
                $(cmake_use_find_package las LIBLAS)