gentoo resync : 03.03.2021

5 files changed, 4 insertions, 299 deletions

diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 35a3bf30ed49..5cf26f515e75 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -2,9 +2,6 @@ AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107b
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 AUX openscenegraph-3.6.5-cmake_lua_version.patch 440 BLAKE2B 51a35309b01a096f9423ff64e66d62f99d3e26bd898db0b53c135dc99318b236a1b129211f51de9b1a29d054e0810aa4ff2a7c307dc4b4a606eb4075a60748d9 SHA512 a41c7a65b1cfd0dabc080f509cf288f575b3ec5d7666a4a889a8c3156e9d32559e1f802e23783c5c70376c82a24dd87813e9bfde0876085e0e3967b47852059a
 AUX openscenegraph-3.6.5-use_boost_asio.patch 9659 BLAKE2B b4ee11d6a69367e47b8a0f4fb9af81fafdf59d5358caaa0f096e0fd1d3ef08c88c1b52a43b32db2c79fceb0aca888c2dca64d90409de5249d0eab8cf5e659792 SHA512 2cd9454b13428811aac5e9a9d167265479b9368deac0e1676ccc51292f74740b9f26ab82d0f4ba074dcb454c3958bfaa8cc1a783bd6abd6161b2d9cea849ec03
-DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab25147826a40655bfa0eca2b0765f775d1fca53c090b77c9963b392bb73b405150f64f1b3bdc57ac6ef59de7f88bf9fd208b2ff6e SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19
 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
-EBUILD openscenegraph-3.6.4.ebuild 4085 BLAKE2B b3f1ee722bb06cdd03cd1da9a4b316449b7ba53a58701c4b03407b3f740ebe3e17b30d9a94c4daf53b5ebf8e3fae08d1a4b83503bc9a7eeb7352a6784d7dc256 SHA512 a9c2c6c0f2cbe41a1f6c8793ddf362e7b831edf28ac2ef02fdf573883b8d53d9e057df71e8d047e9a0be25ae7eec7ed81425c6365df25ba4f671d28d6822322b
-EBUILD openscenegraph-3.6.5-r1.ebuild 4008 BLAKE2B 16bf125eaa67e3c737b76b55ee716562f2411d7e1b3cc0576ef5262e61d6e760377583be0c60aaec47936599c39e382d3764716087cd35456191c7f3a168d610 SHA512 d624c2bcf360f23bda06173aa68eab6a45a82efb22990d9dee9137017648aa72212be18939fd6c8021413b70713cc1d175771faed7ca281b8e6141413de4b402
-EBUILD openscenegraph-3.6.5-r100.ebuild 4239 BLAKE2B 1976d0b5a010067cf4d1bf1529b8d68f854ef0b7627c99d7d11c2d45964ddeea51031b7aecc7e0c9aea95ba1493d1774334476ba120e94783e67c2b3033c5e15 SHA512 a0c91939ba0dd2145d6ec8a5c9c7d18ae8e1e8105ec7fdb489086ce162d9b4efd72d60e86e5427ab9eddf6e17fc7a3665774fee5927318f0d69003480785901c
-MISC metadata.xml 1853 BLAKE2B 038f64d567fb10f67d1b004d704ed6cc43e95bd5396f10b486e98e95dfb61bb21c15081044c07faa95397f7f57220e7575113507f5a3d0eff256a06b6b791b18 SHA512 1fb1aa5e600d15060f84e68748b8c86266788f859f847a6789896aad1129b88e546f631fc38532d5c4f95d1eeec6195a8eb7137c45701cb4b84e0e72ce234f99
+EBUILD openscenegraph-3.6.5-r100.ebuild 4235 BLAKE2B 538b4b6911772a30b079a92afe68317a215f7da154d9bbcf7296d5332e6bea78c81bde6e13a88980b314de7ae263ad130ad8f77eabc530a394d4ca888d38e452 SHA512 b13dbcb3a0cb8c2a0a05d5b908a7246bcfc85eddfd56859c6c647e79c05aed6e3f6a2a22e6f05515229b1f0f49bfeab0a88feb4fee6b838616985442bb543d49
+MISC metadata.xml 1775 BLAKE2B 9646f239533a57882812428670fdc532671a096a476b9ad01904405ca5aa15316b6f43bf46588f72e19640be9ba5a179a471f11260a9250e090cda9f8fffde4d SHA512 4efe38c8f3be0ba9a3ff42290f7b9042740479474df73bdb4d2c73ef158cf79d9f0704eb5cb5b1ee0f80a3cfb1a13f96f7610753b0a55aa87ef22e92a922888d
diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
index 9345e47b8272..0f8459428abd 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -13,7 +13,6 @@
 		The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries.
 	</longdescription>
 	<use>
-		<flag name="asio">Enable support for <pkg>dev-cpp/asio</pkg> library</flag>
 		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
 		<flag name="egl">Enable EGL support</flag>
 		<flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
deleted file mode 100644
index 3d55a64b0147..000000000000
--- a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="OpenSceneGraph"
-MY_P=${MY_PN}-${PV}
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic wxwidgets
-
-DESCRIPTION="Open source high performance 3D graphics toolkit"
-HOMEPAGE="http://www.openscenegraph.org/"
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
-gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2
-svg tiff truetype vnc wxwidgets xrandr +zlib"
-
-REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )"
-
-# TODO: COLLADA, FBX, GTA, NVTT, OpenVRML, Performer
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	media-libs/mesa[egl?]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libXext
-	asio? ( dev-cpp/asio )
-	curl? ( net-misc/curl )
-	examples? (
-		fltk? ( x11-libs/fltk:1[opengl] )
-		fox? ( x11-libs/fox:1.6[opengl] )
-		glut? ( media-libs/freeglut )
-		sdl2? ( media-libs/libsdl2 )
-		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	gdal? ( sci-libs/gdal:= )
-	gif? ( media-libs/giflib:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jpeg? ( virtual/jpeg:0 )
-	las? ( >=sci-geosciences/liblas-1.8.0 )
-	lua? ( >=dev-lang/lua-5.1.5:0= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	openinventor? ( media-libs/coin )
-	pdf? ( app-text/poppler[cairo] )
-	png? ( media-libs/libpng:0= )
-	sdl? ( media-libs/libsdl )
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vnc? ( net-libs/libvncserver )
-	xrandr? ( x11-libs/libXrandr )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
-	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
-)
-
-src_configure() {
-	if use examples && use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-
-	# Needed by FFmpeg
-	append-cppflags -D__STDC_CONSTANT_MACROS
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDYNAMIC_OPENSCENEGRAPH=ON
-		-DLIB_POSTFIX=${libdir/lib}
-		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
-		-DOSG_ENVVAR_SUPPORTED=ON
-		-DOSG_PROVIDE_READFILE=ON
-		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
-		$(cmake_use_find_package asio Asio)
-		$(cmake_use_find_package curl CURL)
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		$(cmake_use_find_package dicom DCMTK)
-		$(cmake_use_find_package egl EGL)
-		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(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_use_find_package las LIBLAS)
-		$(cmake_use_find_package lua Lua51)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package openinventor Inventor)
-		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-		$(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_use_find_package zlib ZLIB)
-	)
-	if use examples; then
-		mycmakeargs+=(
-			$(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_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
-}
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r1.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r1.ebuild
deleted file mode 100644
index 9c7feb6d7c83..000000000000
--- a/dev-games/openscenegraph/openscenegraph-3.6.5-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="OpenSceneGraph"
-MY_P=${MY_PN}-${PV}
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic wxwidgets
-
-DESCRIPTION="Open source high performance 3D graphics toolkit"
-HOMEPAGE="http://www.openscenegraph.org/"
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
-gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2
-svg tiff truetype vnc wxwidgets xrandr +zlib"
-
-REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )"
-
-# TODO: COLLADA, FBX, GTA, NVTT, OpenVRML, Performer
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	media-libs/mesa[egl?]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libXext
-	curl? ( net-misc/curl )
-	examples? (
-		fltk? ( x11-libs/fltk:1[opengl] )
-		fox? ( x11-libs/fox:1.6[opengl] )
-		glut? ( media-libs/freeglut )
-		sdl2? ( media-libs/libsdl2 )
-		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	gdal? ( sci-libs/gdal:= )
-	gif? ( media-libs/giflib:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jpeg? ( virtual/jpeg:0 )
-	las? ( >=sci-geosciences/liblas-1.8.0 )
-	lua? ( >=dev-lang/lua-5.1.5:0= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	openinventor? ( media-libs/coin )
-	pdf? ( app-text/poppler[cairo] )
-	png? ( media-libs/libpng:0= )
-	sdl? ( media-libs/libsdl )
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vnc? ( net-libs/libvncserver )
-	xrandr? ( x11-libs/libXrandr )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.37.0:*
-	x11-base/xorg-proto
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
-	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
-	"${FILESDIR}"/${PN}-3.6.5-use_boost_asio.patch
-)
-
-src_configure() {
-	if use examples && use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-
-	# Needed by FFmpeg
-	append-cppflags -D__STDC_CONSTANT_MACROS
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDYNAMIC_OPENSCENEGRAPH=ON
-		-DLIB_POSTFIX=${libdir/lib}
-		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
-		$(cmake_use_find_package curl CURL)
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		$(cmake_use_find_package dicom DCMTK)
-		$(cmake_use_find_package egl EGL)
-		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(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_use_find_package las LIBLAS)
-		$(cmake_use_find_package lua Lua51)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package openinventor Inventor)
-		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-		$(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_use_find_package zlib ZLIB)
-	)
-	if use examples; then
-		mycmakeargs+=(
-			$(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_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
-}
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r100.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r100.ebuild
index 59773cf373c1..219fe815ef6d 100644
--- a/dev-games/openscenegraph/openscenegraph-3.6.5-r100.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
 gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2
 svg tiff truetype vnc wxwidgets xrandr +zlib"