commit: cfece1167cece8d8aa2775cb149579804cca4a8f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jan 10 22:38:09 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jan 10 22:43:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfece116
dev-games/openscenegraph: Drop USE gtk Reported-by: David Heidelberg (okias) <david <AT> ixit.cz> Closes: https://bugs.gentoo.org/703674 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-games/openscenegraph/openscenegraph-3.5.5.ebuild | 7 +++---- dev-games/openscenegraph/openscenegraph-3.6.4.ebuild | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild index 29582ffe909..ab15331d995 100644 --- 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 1e0f1b579dc..2cf82085b9d 100644 --- 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)
