gentoo resync : 15.06.2021

5 files changed, 3 insertions, 193 deletions

diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index 1fff737798c8..d8e200ebc7a0 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,7 +1,4 @@
 AUX fceux-2.2.2-warnings.patch 1174 BLAKE2B 5b2076015d005a75ab97b586bb2af022b53a8d1724ef0becac808606366f3ba2f64e97c7073bb3f152d337c248ea91cfb15df81e2d1c5f3ebaf94f0defea3ae1 SHA512 03f7ff47f18982eb5fc7b0c942313fb6328412fe64c9b07bf97a85e25eb73c926b362ce5da789ebc7dff70f9d3d11e9df9e033e5a3ddd8fdee6c712471806b97
-AUX fceux-2.2.3-python3.patch 4392 BLAKE2B a71d108fee4aa1881cede5ffe484f0940ed3d6d3416a4849e4e3db1636ffd4112533954602781e928dafcffaee1f835972f2adf9b9fb465429d6abaf238a4042 SHA512 ca1026e02107ad64a36498f2e6eb8c0b814a75bad2a43717098a229a239123a306778d2ec669a4f0948a144f206c684858fd923cc7256e698816b2a0471d4c8f
-DIST fceux-2.2.3.src.tar.gz 9292792 BLAKE2B 44412934a50f2cab581cb194932a079071e8c7c1cb4cb4d173e9d7cf4898806fe1b0948d6e86fd70d1265eb596c47f77f751e3a113f03aba9b95e1f5def9c2a8 SHA512 6deb83e9e773694f4040f5f325b0b5b4f45d58bb3481db67b4659c940d90c4c87e3ffeac712b72ddb3f5d089cd9fc7b55b497db61f708c23a7c43c17eda55c7b
 DIST fceux-2.3.0.src.tar.gz 20779030 BLAKE2B 0d9a0e1f326bdcde4e360a03755c9d807a59e3f3826017e2923527f3ec214bec4c9737f98a8abc4e4971098d127ce8e95eb4142fa8d0bd71109190e6d2c93861 SHA512 46b53f0c4c790ae4f7d5e800adf81cce3c7ccf4b06f972d46e29c0170485e291516709a8c28b26c762d535453e280a6c6de935869c7674bb135c3dca2e266407
-EBUILD fceux-2.2.3-r100.ebuild 1461 BLAKE2B fb9e6e142dde088ba609a2fbaeb735656b9db3959cd6cee1ca8ea62c50b2833af1834382ddf2d259b2ddb8da3f02fce79e0a9ad50b251aa72c8419e6c24c12ae SHA512 f0c5f23a10685695b49a90f793db8096ea5f0e5fef75951ebeb1bd7f9dca778a1fd5adfacacd5e7c21c9f0de16358436eea95da6e4b01a2604ff5038722c1ba9
-EBUILD fceux-2.3.0.ebuild 1365 BLAKE2B 81727ead24f169c5f0c058a370a93eef45801cfbc40c8ab6b6fd5e010ad0ee98f6a7e24eb3f27cd00f442ec2c9b5283e740edca5888508018064648ba21e6e60 SHA512 74c253db00315b30b667ba055238519e6e01e98b8d04703f5c2e4f0e244b74d3e5bafe04a034c6560342dda5536a406817af2661d55aeba2086eb989c8f17d0b
-MISC metadata.xml 487 BLAKE2B 41b6ee780f57ccf7755027e6267ea0bffb92d971df83bd3d40580bb0e7f135c5dcb8e4bbb507b30e5a560cfc74abf0a2c1a0eb5aaefd1e34c11b4bf9e56803d1 SHA512 ce90a3403f05acd17ad52c7abbbec444c02e01b7ab2a8518f3a1978666a99af4684b36a7f4e7c2af79466879813cd7a667e4e37a65dfd434ea082377bf950132
+EBUILD fceux-2.3.0.ebuild 1378 BLAKE2B ce4eec0490df5b30a26ad8411bf8ca4c3687db5258c3b10f9660544bf922a15422deaa14be9d8b14f77e1308bd810976b9a8843bffe80c4e27ccd670101c980d SHA512 341834e56f3fa6a81c335364a0bc072bd1fe2b18a005b8a8996d62c263c208ead299de6ca69bd2724d5dd20a9b6671bd80c9f02bfddfb9266d16bfb748af04e7
+MISC metadata.xml 386 BLAKE2B 7d677f544e044d228273e576a0c61685180b3dbf785d58b1ec8c4b70b5c88ba741aba1e2c293a47e73a14834e83645e3455bb74207c67e6858bab5c9ab0dfb44 SHA512 376ec02a252d5915d5752f85924ce821d38e3da0f62ea18627bb00848aafd846e5c86cdc6cae824e08897b997ed90e1481ab1b831c23d0f4ceb5c5c9c0e35bfa
diff --git a/games-emulation/fceux/fceux-2.2.3-r100.ebuild b/games-emulation/fceux/fceux-2.2.3-r100.ebuild
deleted file mode 100644
index 710e02367ead..000000000000
--- a/games-emulation/fceux/fceux-2.2.3-r100.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-any-r1 desktop lua-single scons-utils toolchain-funcs
-
-DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
-HOMEPAGE="https://fceux.com/"
-SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk logo +lua +opengl"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	lua? ( ${LUA_DEPS} )
-	media-libs/libsdl[opengl?,video]
-	logo? ( media-libs/gd[png] )
-	opengl? ( virtual/opengl )
-	gtk? ( x11-libs/gtk+:3 )
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.2-warnings.patch
-	"${FILESDIR}/${P}-python3.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	tc-export CC CXX
-}
-
-src_compile() {
-	escons \
-		GTK=0 \
-		CREATE_AVI=1 \
-		SYSTEM_LUA=1 \
-		SYSTEM_MINIZIP=1 \
-		GTK3=$(usex gtk 1 0) \
-		LOGO=$(usex logo 1 0) \
-		OPENGL=$(usex opengl 1 0) \
-		LUA=$(usex lua 1 0)
-}
-
-src_install() {
-	dobin bin/fceux
-
-	doman documentation/fceux.6
-	docompress -x /usr/share/doc/${PF}/documentation /usr/share/doc/${PF}/fceux.chm
-	dodoc -r Authors changelog.txt TODO-SDL bin/fceux.chm documentation
-	rm -f "${D}/usr/share/doc/${PF}/documentation/fceux.6"
-	make_desktop_entry fceux FCEUX
-	doicon fceux.png
-}
diff --git a/games-emulation/fceux/fceux-2.3.0.ebuild b/games-emulation/fceux/fceux-2.3.0.ebuild
index 94313a079d6c..c62cda8abd5f 100644
--- a/games-emulation/fceux/fceux-2.3.0.ebuild
+++ b/games-emulation/fceux/fceux-2.3.0.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	${LUA_DEPS}
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
+	dev-qt/qtopengl:5[-gles2-only]
 	dev-qt/qtwidgets:5
 	media-libs/libglvnd
 	media-libs/libsdl2[joystick,sound,threads,video]
diff --git a/games-emulation/fceux/files/fceux-2.2.3-python3.patch b/games-emulation/fceux/files/fceux-2.2.3-python3.patch
deleted file mode 100644
index c08c67058d22..000000000000
--- a/games-emulation/fceux/files/fceux-2.2.3-python3.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-This is upstream's patch to fix Python 3 building, modified to apply against 2.2.3.
-
-https://github.com/TASVideos/fceux/commit/878245fedf028f8c9373be128dbea01f65d4a8b7
-
-diff --git a/SConstruct b/SConstruct
-index be84421..4b60484 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -46,30 +46,30 @@ if platform.system == "ppc":
- # Default compiler flags:
- env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare'])
- 
--if os.environ.has_key('PLATFORM'):
-+if 'PLATFORM' in os.environ:
-   env.Replace(PLATFORM = os.environ['PLATFORM'])
--if os.environ.has_key('CC'):
-+if 'CC' in os.environ:
-   env.Replace(CC = os.environ['CC'])
--if os.environ.has_key('CXX'):
-+if 'CXX' in os.environ:
-   env.Replace(CXX = os.environ['CXX'])
--if os.environ.has_key('WINDRES'):
-+if 'WINDRES' in os.environ:
-   env.Replace(WINDRES = os.environ['WINDRES'])
--if os.environ.has_key('CFLAGS'):
-+if 'CFLAGS' in os.environ:
-   env.Append(CCFLAGS = os.environ['CFLAGS'].split())
--if os.environ.has_key('CXXFLAGS'):
-+if 'CXXFLAGS' in os.environ:
-   env.Append(CXXFLAGS = os.environ['CXXFLAGS'].split())
--if os.environ.has_key('CPPFLAGS'):
-+if 'CPPFLAGS' in os.environ:
-   env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split())
--if os.environ.has_key('LDFLAGS'):
-+if 'LDFLAGS' in os.environ:
-   env.Append(LINKFLAGS = os.environ['LDFLAGS'].split())
--if os.environ.has_key('PKG_CONFIG_PATH'):
-+if 'PKG_CONFIG_PATH' in os.environ:
-   env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
--if not os.environ.has_key('PKG_CONFIG_PATH') and env['PLATFORM'] == 'darwin':
-+if 'PKG_CONFIG_PATH' not in os.environ and env['PLATFORM'] == 'darwin':
-   env['ENV']['PKG_CONFIG_PATH'] = "/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig"
--if os.environ.has_key('PKG_CONFIG_LIBDIR'):
-+if 'PKG_CONFIG_LIBDIR' in os.environ:
-   env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR']
- 
--print "platform: ", env['PLATFORM']
-+print("platform: ", env['PLATFORM'])
- 
- # compile with clang
- if env['CLANG']:
-@@ -103,18 +103,18 @@ else:
-     assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
-   if env['SDL2']:
-     if not conf.CheckLib('SDL2'):
--      print 'Did not find libSDL2 or SDL2.lib, exiting!'
-+      print('Did not find libSDL2 or SDL2.lib, exiting!')
-       Exit(1)
-     env.Append(CPPDEFINES=["_SDL2"])
-     env.ParseConfig('pkg-config sdl2 --cflags --libs')
-   else:
-     if not conf.CheckLib('SDL'):
--      print 'Did not find libSDL or SDL.lib, exiting!'
-+      print('Did not find libSDL or SDL.lib, exiting!')
-       Exit(1)
-     env.ParseConfig('sdl-config --cflags --libs')
-   if env['GTK']:
-     if not conf.CheckLib('gtk-x11-2.0'):
--      print 'Could not find libgtk-2.0, exiting!'
-+      print('Could not find libgtk-2.0, exiting!')
-       Exit(1)
-     # Add compiler and linker flags from pkg-config
-     config_string = 'pkg-config --cflags --libs gtk+-2.0'
-@@ -153,7 +153,7 @@ else:
-         env.Append(CCFLAGS = ["-I/usr/include/lua"])
-         lua_available = True
-       if lua_available == False:
--        print 'Could not find liblua, exiting!'
-+        print('Could not find liblua, exiting!')
-         Exit(1)
-     else:
-       env.Append(CCFLAGS = ["-Isrc/lua/src"])
-@@ -167,7 +167,7 @@ else:
-     gd = conf.CheckLib('gd', autoadd=1)
-     if gd == 0:
-       env['LOGO'] = 0
--      print 'Did not find libgd, you won\'t be able to create a logo screen for your avis.'
-+      print('Did not find libgd, you won\'t be able to create a logo screen for your avis.')
-    
-   if env['OPENGL'] and conf.CheckLibWithHeader('GL', 'GL/gl.h', 'c', autoadd=1):
-     conf.env.Append(CCFLAGS = "-DOPENGL")
-@@ -181,8 +181,8 @@ if sys.byteorder == 'little' or env['PLATFORM'] == 'win32':
- if env['FRAMESKIP']:
-   env.Append(CPPDEFINES = ['FRAMESKIP'])
- 
--print "base CPPDEFINES:",env['CPPDEFINES']
--print "base CCFLAGS:",env['CCFLAGS']
-+print("base CPPDEFINES:",env['CPPDEFINES'])
-+print("base CCFLAGS:",env['CCFLAGS'])
- 
- if env['DEBUG']:
-   env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g', '-O0'])
-diff --git a/src/SConscript b/src/SConscript
-index 4713e15..2001146 100644
---- a/src/SConscript
-+++ b/src/SConscript
-@@ -33,7 +33,7 @@ else:
-   platform_files = SConscript('drivers/sdl/SConscript')
- file_list.append(platform_files)
- 
--print env['LINKFLAGS']
-+print(env['LINKFLAGS'])
- 
- if env['PLATFORM'] == 'win32':
-   fceux = env.Program('fceux.exe', file_list)
diff --git a/games-emulation/fceux/metadata.xml b/games-emulation/fceux/metadata.xml
index 4c416fd6a7a3..87755bab0ade 100644
--- a/games-emulation/fceux/metadata.xml
+++ b/games-emulation/fceux/metadata.xml
@@ -5,9 +5,6 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="logo">Enable the ability to add a logo screen when creating AVIs</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">TASVideos/fceux</remote-id>
 		<remote-id type="sourceforge">fceultra</remote-id>