gentoo resync : 15.01.2020

3 files changed, 39 insertions, 41 deletions

diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 0af7bcebc39d..576f19ecfce2 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -4,6 +4,6 @@ AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107b
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827
 DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab25147826a40655bfa0eca2b0765f775d1fca53c090b77c9963b392bb73b405150f64f1b3bdc57ac6ef59de7f88bf9fd208b2ff6e SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19
-EBUILD openscenegraph-3.5.5.ebuild 3735 BLAKE2B c5c689c98f6246042225f7b85e4695d0d610b65ea86def9500a1ccaa9f5bef419d33cc653d3553ff9149da58a625e2d9d179397303ff6cf0b0c0af0299f900fc SHA512 8b49334b93e1ad3033ffbec3a486705492d2275b266fd942a591b0709d854d24b5cfe65c56a1f3f47d6ddd3d308d646b126e46a4e80a60c7cc44f33b538d21c0
-EBUILD openscenegraph-3.6.4.ebuild 4367 BLAKE2B 1930c78b3acd013db72e0da9aaac68bb3cfbab3d22e61e3d8cebdadf0418272164239aaca4a9b8b0c2116966f8d63239360b18798f0d5d79a6297b03b7b3c7d4 SHA512 0eb995ab288bb43232abe95bc36423cb89bcf7292bb2b6c07a4a5aae279270602fd95556e58e1e4046d158ec6c929ad2aa5160861a299c6da567d987db8905f3
+EBUILD openscenegraph-3.5.5.ebuild 3694 BLAKE2B 0a9e624b716e34af2dd99f76cc7e5a638b559db2cabf34aa8d5a775c6a4bc0a700245030fa0a5d63614bec67d0e065c2ef0e23c69d43329afc2ea0576b9b3ab5 SHA512 6ba1a7f5086288253738bbda9990170f50a9c04f8b50142521456c4152e1c185938e173622688692364178a9992241748ce4394812b446814bb30905cd990916
+EBUILD openscenegraph-3.6.4.ebuild 4144 BLAKE2B 99e37784f69d6f1b72e089e6b8762bd73413fe2272d420f17b0af84b84cc57e07c1cb21f637345ede7c474a5c4d58718d8f54989dcf8be95c3f392bac2d0f2a1 SHA512 bf8bedefbed0474fa104ec2bd57a62f5bfa2735dd26ca35e901d03884c94986fe5d090d7fe2bb8e48c3619db58fe0d4febbfed65e780da7a3ceb09ba66161d1e
 MISC metadata.xml 1759 BLAKE2B 6cdfd94a0888ac7716c282b7a473fdc23b00542bf55fe0b7b271d81dac36e1dbe6ef6923a3f6a48d6730b27fccbe6a197ebdce0c3611d736cd6674aec9ae35a8 SHA512 48f68b29d2d8ab7aeb31bdd7322ba39f1c5f9c4c14a301c828c084a774e80a818e2366bbaf2728d1a32a9d20b62bda2a45ab49a331c160d4359c1175787a9999
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
index 29582ffe9098..ab15331d995c 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 1f0f59ca8e4f..2cf82085b9d3 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
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="OpenSceneGraph"
 MY_P=${MY_PN}-${PV}
 WX_GTK_VER="3.0"
-inherit cmake-utils flag-o-matic wxwidgets
+inherit cmake flag-o-matic wxwidgets
 
 DESCRIPTION="Open source high performance 3D graphics toolkit"
 HOMEPAGE="http://www.openscenegraph.org/"
@@ -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] )
 	)
@@ -101,51 +100,51 @@ src_configure() {
 		-DOSG_ENVVAR_SUPPORTED=ON
 		-DOSG_PROVIDE_READFILE=ON
 		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
-		$(cmake-utils_use_find_package asio Asio)
-		$(cmake-utils_use_find_package curl CURL)
+		$(cmake_use_find_package asio Asio)
+		$(cmake_use_find_package curl CURL)
 		-DBUILD_DOCUMENTATION=$(usex doc)
-		$(cmake-utils_use_find_package dicom DCMTK)
-		$(cmake-utils_use_find_package egl EGL)
+		$(cmake_use_find_package dicom DCMTK)
+		$(cmake_use_find_package egl EGL)
 		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package ffmpeg FFmpeg)
-		$(cmake-utils_use_find_package gdal GDAL)
-		$(cmake-utils_use_find_package gif GIFLIB)
-		$(cmake-utils_use_find_package gstreamer GLIB)
-		$(cmake-utils_use_find_package gstreamer GStreamer)
-		$(cmake-utils_use_find_package gtk GtkGl)
-		$(cmake-utils_use_find_package jpeg JPEG)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package gdal GDAL)
+		$(cmake_use_find_package gif GIFLIB)
+		$(cmake_use_find_package gstreamer GLIB)
+		$(cmake_use_find_package gstreamer GStreamer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
+		$(cmake_use_find_package jpeg JPEG)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		$(cmake-utils_use_find_package las LIBLAS)
-		$(cmake-utils_use_find_package lua Lua51)
+		$(cmake_use_find_package las LIBLAS)
+		$(cmake_use_find_package lua Lua51)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package openinventor Inventor)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package openinventor Inventor)
 		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-		$(cmake-utils_use_find_package pdf Poppler-glib)
-		$(cmake-utils_use_find_package png PNG)
-		$(cmake-utils_use_find_package sdl SDL)
-		$(cmake-utils_use_find_package sdl2 SDL2)
-		$(cmake-utils_use_find_package svg RSVG)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package truetype Freetype)
-		$(cmake-utils_use_find_package vnc LibVNCServer)
+		$(cmake_use_find_package pdf Poppler-glib)
+		$(cmake_use_find_package png PNG)
+		$(cmake_use_find_package sdl SDL)
+		$(cmake_use_find_package sdl2 SDL2)
+		$(cmake_use_find_package svg RSVG)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package truetype Freetype)
+		$(cmake_use_find_package vnc LibVNCServer)
 		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
-		$(cmake-utils_use_find_package zlib ZLIB)
+		$(cmake_use_find_package zlib ZLIB)
 	)
 	if use examples; then
 		mycmakeargs+=(
-			$(cmake-utils_use_find_package fltk FLTK)
-			$(cmake-utils_use_find_package fox FOX)
-			$(cmake-utils_use_find_package glut GLUT)
-			$(cmake-utils_use_find_package wxwidgets wxWidgets)
+			$(cmake_use_find_package fltk FLTK)
+			$(cmake_use_find_package fox FOX)
+			$(cmake_use_find_package glut GLUT)
+			$(cmake_use_find_package wxwidgets wxWidgets)
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
+	cmake_src_compile
+	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
 }