gentoo resync : 27.03.2021

7 files changed, 2 insertions, 283 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 2b27afbd002e..6bc896763eff 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index 16dae9f14954..2ad267e1752c 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -2,6 +2,5 @@ AUX cegui-0.8.7-icu-59.patch 444 BLAKE2B 7ba31c1a856638be317c0d3166159bea14be9f3
 AUX cegui-0.8.7-musl.patch 2017 BLAKE2B a7735ce19c17505be2ba1da5c0aa8fde00ed6cca9926a1586a426a6b56d0fa9bb402a54a8c99b79f58a8adde3edfb79856a2766ca28f8ac92930d4e4004b4dc1 SHA512 c9bece96a6f7600cc59b94391b774acc016e2f33fb608d33aa25ef603b5782f47d338cad6ad244224c861fa00a8ebc0f80f7aa1df4800a7c8347029f2b5e996d
 AUX cegui-0.8.7-python3.patch 1045 BLAKE2B 702c30e85d08e117888d56adaf2c131f9c6410916f08b03ac66efd69230e14b53ee05975e04489f3526fba964a372b340b86acf5a31dda36ddbab40d7f65d944 SHA512 9870e996697775938ca9ba6708dc93d5e59e8a640dd2542c1e8cc8b903ebd1738b11e733f2e9d012f932558a6f77ee8014f0d98133252e2cee2025e664a38e61
 DIST cegui-0.8.7.tar.bz2 18114465 BLAKE2B cf0a4867f0e32c6a6b585821c915dc1fbd532e0f95effe28f6d3e4f1a2bccd23f47c7c33a3115befdf8b3f094d49a5af042d28c1e1fbb88e7c7f6da7f3fa173b SHA512 271ff2a1e19f46c7d40cbc210bc665666e45b56cd0efea460db4d08df134d929337846eaf923db1b915597965aab27ad39512d6567cc63ef883555cbff542e56
-EBUILD cegui-0.8.7-r1.ebuild 3218 BLAKE2B dd05fabf6a65d69c1752077df3cab2e951db311931324e88b0437992c1e3b20b96779d6b4eff9c44eff4888a587931a697f975d12186918cc8d8165678e753ff SHA512 bf51d3acdbb65d3f96154bb4b0ec0b958a2d3c4a02b825729506e9e7d649685a7b8daf8d9cdc0ec255baea8e081a82c76ffae985867bcf8c10a631fd5365df8a
 EBUILD cegui-0.8.7-r100.ebuild 3333 BLAKE2B fb413b80a0341228b6c38ae78ffbcd5e81ab009c9de5596bd585c001b217d5c397006275904ad74180bb4d8518e3eeda2033d0b27033fc02c4da9d9677c60688 SHA512 c88db516a7fdcc587aa78f917d47ad3dcd7af9ec374cf705c2ee5f8a808164f745d82698c4f69e1925393184d4b317e432446516c632092d999d15b8c0412fd1
 MISC metadata.xml 803 BLAKE2B da9534a051925be6cd6d285ce3335c65ba799481840f95aadedb2f81f7a06e05253e8949bf77e7626635437bc5ad5b91af11d6aa452f3524669efdd6216b3bd6 SHA512 47d0eeed54ab5b192051b976a5e1a9790c9e0321753cdc8da73fda4131ac30e40fb57f418418ea7b2bbb30041f76def1a79803d699962488ea4dc1dad50c4996
diff --git a/dev-games/cegui/cegui-0.8.7-r1.ebuild b/dev-games/cegui/cegui-0.8.7-r1.ebuild
deleted file mode 100644
index 6e34ca1b15de..000000000000
--- a/dev-games/cegui/cegui-0.8.7-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: multiple ABI?
-PYTHON_COMPAT=( python3_8 )
-inherit flag-o-matic cmake python-single-r1
-
-DESCRIPTION="Crazy Eddie's GUI System"
-HOMEPAGE="http://www.cegui.org.uk/"
-SRC_URI="mirror://sourceforge/crayzedsgui/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bidi debug devil doc freeimage expat irrlicht lua ogre opengl pcre python static-libs tinyxml truetype xerces-c +xml zip"
-REQUIRED_USE="|| ( expat tinyxml xerces-c xml )
-	python? ( ${PYTHON_REQUIRED_USE} )" # bug 362223
-
-# gles broken
-#	gles? ( media-libs/mesa[gles1] )
-# directfb broken
-#	directfb? ( dev-libs/DirectFB )
-RDEPEND="
-	dev-libs/boost:=
-	virtual/libiconv
-	bidi? ( dev-libs/fribidi )
-	devil? ( media-libs/devil )
-	expat? ( dev-libs/expat )
-	freeimage? ( media-libs/freeimage )
-	irrlicht? ( dev-games/irrlicht )
-	lua? (
-		dev-lang/lua:0
-		dev-lua/toluapp
-	)
-	ogre? ( >=dev-games/ogre-1.7:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		media-libs/glew:=
-	)
-	pcre? ( dev-libs/libpcre )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	tinyxml? ( dev-libs/tinyxml )
-	truetype? ( media-libs/freetype:2 )
-	xerces-c? ( dev-libs/xerces-c )
-	xml? ( dev-libs/libxml2:2 )
-	zip? ( sys-libs/zlib[minizip] )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opengl? ( media-libs/glm )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-icu-59.patch
-	"${FILESDIR}"/${P}-python3.patch
-	"${FILESDIR}"/${P}-musl.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# http://www.cegui.org.uk/mantis/view.php?id=991
-	append-ldflags $(no-as-needed)
-
-	local mycmakeargs=(
-		-DCEGUI_BUILD_IMAGECODEC_CORONA=OFF
-		-DCEGUI_BUILD_IMAGECODEC_DEVIL=$(usex devil)
-		-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=$(usex freeimage)
-		-DCEGUI_BUILD_IMAGECODEC_PVR=OFF
-		-DCEGUI_BUILD_IMAGECODEC_SILLY=OFF
-		-DCEGUI_BUILD_IMAGECODEC_STB=ON
-		-DCEGUI_BUILD_IMAGECODEC_TGA=ON
-		-DCEGUI_BUILD_LUA_GENERATOR=$(usex lua)
-		-DCEGUI_BUILD_LUA_MODULE=$(usex lua)
-		-DCEGUI_BUILD_PYTHON_MODULES=$(usex python)
-		-DCEGUI_BUILD_RENDERER_DIRECTFB=OFF
-		-DCEGUI_BUILD_RENDERER_IRRLICHT=$(usex irrlicht)
-		-DCEGUI_BUILD_RENDERER_NULL=ON
-		-DCEGUI_BUILD_RENDERER_OGRE=$(usex ogre)
-		-DCEGUI_BUILD_RENDERER_OPENGL=$(usex opengl)
-		-DCEGUI_BUILD_RENDERER_OPENGL3=$(usex opengl)
-		-DCEGUI_BUILD_RENDERER_OPENGLES=OFF
-		-DCEGUI_BUILD_STATIC_CONFIGURATION=$(usex static-libs)
-		-DCEGUI_BUILD_TESTS=OFF
-		-DCEGUI_BUILD_XMLPARSER_EXPAT=$(usex expat)
-		-DCEGUI_BUILD_XMLPARSER_LIBXML2=$(usex xml)
-		-DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
-		-DCEGUI_BUILD_XMLPARSER_TINYXML=$(usex tinyxml)
-		-DCEGUI_BUILD_XMLPARSER_XERCES=$(usex xerces-c)
-		-DCEGUI_HAS_FREETYPE=$(usex truetype)
-		-DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=$(usex zip)
-		-DCEGUI_HAS_PCRE_REGEX=$(usex pcre)
-		-DCEGUI_SAMPLES_ENABLED=OFF
-		-DCEGUI_USE_FRIBIDI=$(usex bidi)
-		-DCEGUI_USE_MINIBIDI=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all $(usex doc html "")
-}
-
-src_install() {
-	cmake_src_install
-	docinto html
-	use doc && dodoc -r "${BUILD_DIR}"/doc/doxygen/html/*
-}
diff --git a/dev-games/ois/Manifest b/dev-games/ois/Manifest
index b795032d52f9..cce0163d2090 100644
--- a/dev-games/ois/Manifest
+++ b/dev-games/ois/Manifest
@@ -4,5 +4,5 @@ AUX ois-1.5-libdir.patch 759 BLAKE2B 76d81ea7ee45bfcdb508fd83707e750992561037613
 DIST ois-1.5.tar.gz 552786 BLAKE2B 2ac2d1d74c03804cdc1c0b8cd1e2a3661d9edfc8ae230d036f108dbffd6d8aa5778e2f708b468fd3364c0ba403d07b04c1744eb5a11b39d658ef5a21943a9df3 SHA512 5ab1dda7c25c1959ccbbb758ea3fda36bd62ad65f46e2c6b418317a5eb39e0bace52a44ae079dfb69fc58c90df54f8e50d589daae1100ec615325363c9d77513
 DIST ois_v1-3.tar.gz 136739 BLAKE2B 88dd3af2c8b253d9cacc5c65510c150ba50c6a47c1c2cd241bf366f38fba0560a7cef08392e338984e8b172020c4a4c37e5eab024fabc695b2f06f93393850ed SHA512 48b7355a9be9c66233691aa5461192fb6e537d284e4366ebf931a76ee3be30f2cf17a4aa350fce6b433eaecf4259414062b9dd5854eaf872b9a18294cfc640c3
 EBUILD ois-1.3-r1.ebuild 613 BLAKE2B 7f3c42b517ec592d693c0ce54a7cf0582ca181a3f8049f466b8465e0e9edcecfdf67d3092707e4c7a1f1eb1b7ee394bdb26ef5b9b8da0bc466e221f34869f119 SHA512 b7afdadc166810462135c61a1b067c11637688392765a7e874cf548129073a467d6a2b53ea731a3ba91c8f67259ccfe9c62fca2ef65d8f01328e7df34c5cfba5
-EBUILD ois-1.5.ebuild 500 BLAKE2B d1ed0ec853adfdb037d0f00adb4eeee9a73975affd2b6df10584e70488b9925ea402f1cca3eef6fd1f50839316f26f43d1c5ba4d5b1c70bc497a99fc2aae89c4 SHA512 9211784fb799175b0f954543471b8569896eacc31ed94d809ecf21596fce23367e7fb852414efdd3a33792f3b2678cabaaa0445bc55b685a5ff14563aab1e73d
+EBUILD ois-1.5.ebuild 498 BLAKE2B d15400a1caf013163870b17c3fe1848e7173a6f302854baa4d91b0f179452276248c22888e695ac80cd47cbae5b20f303f6f1e41e0754d9315cbc97f8298efb8 SHA512 d1bc5f379067bf033896fd43e943d6aa1976965cd93b35cfea808572e64ad0f52ae7a520c8b80bc96e3bd8a6dc36b9d3c493dc2ae7a20055d13163568b752afc
 MISC metadata.xml 377 BLAKE2B 6bf12a2da0459bbe02d99361f77fa759217ede6da059fe7f23c97436c45927cc481cbc910af4509f4e432a0bf3dd98a4d534600f406721a5e36bb74bc9e24ff8 SHA512 646270ba21d37a69e9aa1880851af5fa729b64848a60e298bba684af783185ec73e9a6013176fb758acfd782af7f044aee54f2539fd11f64ba8e190f0dccc262
diff --git a/dev-games/ois/ois-1.5.ebuild b/dev-games/ois/ois-1.5.ebuild
index 2b19afc068f1..a19595f71612 100644
--- a/dev-games/ois/ois-1.5.ebuild
+++ b/dev-games/ois/ois-1.5.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P^^}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND="
 	x11-libs/libXaw
diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index fbd4e9e624d1..cedf64396d50 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -3,5 +3,4 @@ AUX openscenegraph-3.5.1-jpeg-9.patch 1211 BLAKE2B 7fedf10332a13270a489c5d2e6629
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 DIST openscenegraph-openmw-3.4_p20200425.tar.gz 5698786 BLAKE2B 43684fa898912434dae9a7b41070a893c407dceba7e468a3f3dede32e24aea55d921098faf8d9d05708d2ef01a3507b2f126939dc13b8693002a0bec189bbaf7 SHA512 9bb4d2a6ca4694ee22a29508b74a095a483584ea801dc8298ec8a9b41c4d4fe18c52a21849ae9ec1065060479dcad5156227f82feed13c177415662ecba1da70
 EBUILD openscenegraph-openmw-3.4_p20200425-r100.ebuild 4316 BLAKE2B c5d475494f271839ad50da59caf9b9f07d5144841d64741fc4266b2f1b5eba1aca98ba8ad954a41e99bd01fefdbeb3d93b21fc7f78e0b45da75b9825314a08e4 SHA512 171d766ff3083009f2abe54a55a580d77e56f117072dd78e76f7a81c90d671387a54716ef45ff0923379bccc8ef540275fd99b7636ce936a284bf2c19a166332
-EBUILD openscenegraph-openmw-3.4_p20200425.ebuild 4067 BLAKE2B 3c61a5c3eb1b0929c774d4d39317ec8ae0a5901cff5757b8f266a1fe8166b99da72d515d6d5ce4e6eaf69be0f52a7e9086e9f4cbd1fdba0ebd4141f314e4d5c0 SHA512 9c2be14d5055410290af536dcaa69c1b278e010c79dd4bdc3a4a78c4640a82b8293d4dcb2576a0498598c3f6cac624e77c92988b4b00a42ec53fb1ee43f4a75e
 MISC metadata.xml 1690 BLAKE2B 4c99a953f827084c2a9d848f1bed0f1b7c885343ac2bb8ca57b2ada30ab8901e56ff1f7a37e97394c2fd0f8b0eff452ac0dc2a5fcab270ea8781999fd4bd45f6 SHA512 44a3d3a9af55c002330282ce036c3c455ffd7e9800c854657bd643fb3033645217e365a1a8dc8c7dbbff0d7038a9c6b0265fc824af71404a5b42d9a26a147645
diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild
deleted file mode 100644
index 42fc8ce26dc5..000000000000
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic wxwidgets
-
-DESCRIPTION="OpenMW-specific fork of OpenSceneGraph"
-HOMEPAGE="https://github.com/OpenMW/osg"
-MY_COMMIT="8b07809fa674ecffe77338aaea2e223b3aadff0e"
-SRC_URI="https://github.com/OpenMW/osg/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/osg-${MY_COMMIT}"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0/132" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug doc examples egl ffmpeg fltk fox gdal gif glut gstreamer jpeg
-	lua openexr openinventor osgapps pdf png qt5 sdl sdl2 svg tiff
-	truetype vnc wxwidgets xine xrandr zlib"
-
-REQUIRED_USE="
-	sdl2? ( sdl )
-	openexr? ( zlib )
-"
-
-# TODO: COLLADA, FBX, GTA, OpenVRML, Performer, DCMTK
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	!dev-games/openscenegraph
-	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 )
-	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= )
-	qt5? (
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-	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
-"
-
-PATCHES=(
-	"${FILESDIR}"/openscenegraph-3.4-cmake.patch
-	"${FILESDIR}"/openscenegraph-3.5.1-jpeg-9.patch
-	"${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
-)
-
-src_prepare() {
-	sed -i "s/ FIND_PACKAGE/ MACRO_OPTIONAL_FIND_PACKAGE/g" CMakeLists.txt || die "can't replace FIND_PACKAGE"
-	cmake_src_prepare
-}
-
-src_configure() {
-	if use examples && use wxwidgets; then
-		setup-wxwidgets
-	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_PROVIDE_READFILE=ON
-		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
-		-DWITH_Lua51=OFF # We use CMake-version FindLua52.cmake instead which can find any lua
-		-DWITH_Lua52=$(usex lua)
-		-DWITH_Asio=OFF # Fails to build, similar to https://github.com/chriskohlhoff/asio/issues/316
-		-DWITH_CURL=$(usex curl)
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		-DWITH_FFmpeg=$(usex ffmpeg)
-		-DWITH_GDAL=$(usex gdal)
-		-DWITH_GIFLIB=$(usex gif)
-		-DWITH_GStreamer=$(usex gstreamer)
-		-DWITH_GLIB=$(usex gstreamer)
-		-DWITH_GtkGl=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_Jasper=OFF
-		-DWITH_LIBLAS=OFF # dep failed to build https://bugs.gentoo.org/725938
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Inventor=$(usex openinventor)
-		-DWITH_Poppler-glib=$(usex pdf)
-		-DWITH_PNG=$(usex png)
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_SDL2=$(usex sdl2)
-		-DWITH_RSVG=$(usex svg rsvg)
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_Freetype=$(usex truetype)
-		-DWITH_LibVNCServer=$(usex vnc)
-		-DWITH_Xine=$(usex xine)
-		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
-		-DWITH_ZLIB=$(usex zlib)
-		-DOSG_USE_QT=$(usex qt5)
-		-DDESIRED_QT_VERSION=5
-	)
-	if use examples; then
-		mycmakeargs+=(
-			-DWITH_FLTK=$(usex fltk)
-			-DWITH_FOX=$(usex fox)
-			-DWITH_GLUT=$(usex glut)
-			-DWITH_wxWidgets=$(usex wxwidgets)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
-}