gentoo resync : 27.03.2021

8 files changed, 73 insertions, 96 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index cc71fd50a7f9..8626f0fe395a 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index e742f30423a8..b945b190645d 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -2,5 +2,4 @@ AUX fceux-2.2.2-warnings.patch 1174 BLAKE2B 5b2076015d005a75ab97b586bb2af022b53a
 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
 EBUILD fceux-2.2.3-r100.ebuild 1461 BLAKE2B fb9e6e142dde088ba609a2fbaeb735656b9db3959cd6cee1ca8ea62c50b2833af1834382ddf2d259b2ddb8da3f02fce79e0a9ad50b251aa72c8419e6c24c12ae SHA512 f0c5f23a10685695b49a90f793db8096ea5f0e5fef75951ebeb1bd7f9dca778a1fd5adfacacd5e7c21c9f0de16358436eea95da6e4b01a2604ff5038722c1ba9
-EBUILD fceux-2.2.3-r2.ebuild 1310 BLAKE2B a9c4fde73a2791be90a06fb8d3a1a694cd489428ba643a1eb4ea0511deb8bcaf41c3f4c90a51304b55bf21f26df1f98d22c016fd399c24789ea1c2b729114330 SHA512 c1926ef8bfd0659fbc9a10b227f4ae0dc4065985b6bb534576aceeac72cd188f2cc12af5104e89f0abec5e23c1f51393f80a6f44c1331a96e5d4ba7c3b8e84f2
 MISC metadata.xml 432 BLAKE2B 69c86fec99d0d08d0672142afbb39b2f2c352af4a8ff953516522f721e2482a4624b542593c8eac0be3570a75037cf27b0c48bd19033429d1c5d66e85fcdb952 SHA512 f6f073a198d89d195daa4da1c4c8bdf631258db0ff8cc5fefd9d8a6d93beb38081d37a70df0d0f62d7bf79f7595a3456d88ac0c724535d8c453f3096d2256b96
diff --git a/games-emulation/fceux/fceux-2.2.3-r2.ebuild b/games-emulation/fceux/fceux-2.2.3-r2.ebuild
deleted file mode 100644
index 5c5d141a8039..000000000000
--- a/games-emulation/fceux/fceux-2.2.3-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-any-r1 desktop scons-utils toolchain-funcs
-
-DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
-HOMEPAGE="http://fceux.com/"
-SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk logo +lua +opengl"
-
-RDEPEND="
-	lua? ( dev-lang/lua:0 )
-	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"
-)
-
-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/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 65d6a0089a47..612747d4a964 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,4 +1,3 @@
-AUX ppsspp-1.4-O2.patch 1576 BLAKE2B 5831befac76d1a674c0bf453043c1ac36435c76f04ec5bd95885582c9f44c283232a9dbbea629433629d9fbfd5cc1415f5e0f47c50dbbdb9e834891280e98a49 SHA512 39f18c074e56aa823b223a78b099771257b4a5672a41c6d271cee5b817a2a63d17f57ad9f936da41185dae5b4bf2a94cc62cf92596d94b6e0660f1b05bf9ac2f
 DIST ppsspp-1.11.3-assets_lang.tar.gz 662203 BLAKE2B 0c1e0852c9ab3b3146f149713710e969c685a89deb68e5853f53426973563908350b9aca9994202ee3d435229bd7992ad5385a63fe87956c2ca142b2d5ca754e SHA512 8976b68ebc8b83ca34be1abe4499ca39c21c21af38b977925cd0d5ef456518fbb3670e8a5f35320bb5037a1dda4603614fadb7abafad8378f45f7713743fe39b
 DIST ppsspp-1.11.3-ext_SPIRV-Cross.tar.gz 814213 BLAKE2B cfed78ac0ae4e6e7d82874b4fec2b5475063b09f8c8a3bef9bd23024978820dfbee68209a3ebbd3b883e8c2011d4353e1c0c1b543578d860cde8d20a0b304440 SHA512 b3faff10e2578a27740a013e463750c5244796e651b9586f900a3c97adba060f5e978d47a411f9fb255dd8314e21ea54cccbf90f726d1779448d5dc030f64b65
 DIST ppsspp-1.11.3-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
diff --git a/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch b/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch
deleted file mode 100644
index 55954c7c7389..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 19038c88a436..bf50f5cf52fb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,11 +195,11 @@ if(NOT MSVC)
- 
- 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
- 	set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
--	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -D_NDEBUG")
-+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -D_NDEBUG")
- 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
- 	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
- 	set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
--	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -D_NDEBUG")
-+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -D_NDEBUG")
- 	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
- 	#TODO: Remove this and include the file properly everywhere it makes sense
- 	# First step is too use the macros everywhere
-@@ -509,10 +509,10 @@ include_directories(ext/cityhash)
- 
- if (NOT MSVC)
- 	# These can be fast even for debug.
--	set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O3")
--	set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
-+	set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O2")
-+	set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O2")
- 	if(NOT ZLIB_FOUND)
--		set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
-+		set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O2")
- 	endif()
- endif()
- 
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index db3942c22fe5..5adc192bd5be 100644
--- a/games-emulation/stella/Manifest
+++ b/games-emulation/stella/Manifest
@@ -1,3 +1,5 @@
 DIST stella-5.1.3-src.tar.xz 1828448 BLAKE2B 1588e4da3c21ab51d967aa3fae49b14ef5f3121e3907aa83629dbabeab5c190660ad5a53319429f721cc93560c212f530a58675b7c543c9a3fed3e395669c145 SHA512 9aaf6118c999e90e4947e490f61ccebb82ba1ebeccb29b2e4ec1226bdeef83bb36d944791d6f915522c5c6fec74a0bd17ac5ce8fcc5f369281f9cedf06a380a5
+DIST stella-6.5.2-src.tar.xz 6220652 BLAKE2B 8bb51ff15b28436eb83b918ca6123956482e4342c4f9560dcea608a856899a65176c9012146d1a2affe22ee0a589e945424e897853890e23ff503d97b893e32f SHA512 dc7685fd166fad578bce62c961419755db7c4b8ac6e6e2e10f0edfa3b0f63bf43d64119483cc47fc86dfe95e09bc800c27392239aeb68a2ccf37d0f224d6493c
 EBUILD stella-5.1.3.ebuild 1366 BLAKE2B 0f23954bd4cba97df44df95de1a7d7339bae942e782251222dffdb0f99f3aab64bc351ef049582c0958f9219e64ac3909b096e634b6cc798f0c5b6ed4701eda0 SHA512 66a059738abbe5f6ddd75487fc0b6cf71c478b699ce2c0c00280ecc550b4794b082c8a3a902ee300d74922e296a69d5d08e8c06ad1f994a1d3152f0ff18e055d
-MISC metadata.xml 329 BLAKE2B 3ee498d6ed1bda6ccdd1e6e6a7eae732766c005ae6bf4c02b09f8f5de417d9f4c20ae925a2d7d148204f0c43a4c4ef1310cd6d925dee4beb2ede0c74ae34b636 SHA512 80e6880e6edea2eab64504d6cdf4496f94f9bfb6a4ea63da347b9fb05ca3fa999d646406e22563799d8ba40c1d3d095094ea8d86a500bb490ce2034c3ff38182
+EBUILD stella-6.5.2.ebuild 1372 BLAKE2B e962a52d6fbc74cae9072f1e481c6e1eb1a91efca6a632c1733943a22146cf424bb802c67f854886e4e27c37fbb959a8cc282182dd94a3233883214f5721558a SHA512 b2560e7a120194c17993c6658ad50b23f2f77991e48d0512b6d9df199706713fdc5e58f298aeb7f3b59ada158e5dbe51d84ec237d8cba53a086da2a3f7463f7e
+MISC metadata.xml 386 BLAKE2B 23b063450bf4b6915ed443ff8e9cc0c24858144c867085a6416f73b2299026ab85d4b07f18bbd54db37ce420803eb81561e87323e5eee0cdb99652de2c15d153 SHA512 6d69c2c3b88a206faaf9d80c1c1d8de01d1865bf800e4d4b7997dae4641f99665c0692251cf3d045e766be045069548e42cdb3303cb698f093501f2e79124fa1
diff --git a/games-emulation/stella/metadata.xml b/games-emulation/stella/metadata.xml
index 2fd0b9ad7a0a..81f3553d0752 100644
--- a/games-emulation/stella/metadata.xml
+++ b/games-emulation/stella/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">stella-emu/stella</remote-id>
 		<remote-id type="sourceforge">stella</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/stella/stella-6.5.2.ebuild b/games-emulation/stella/stella-6.5.2.ebuild
new file mode 100644
index 000000000000..c27cb7cd25bf
--- /dev/null
+++ b/games-emulation/stella/stella-6.5.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic gnome2-utils toolchain-funcs
+
+DESCRIPTION="Multi-platform Atari 2600 VCS Emulator"
+HOMEPAGE="https://stella-emu.github.io"
+SRC_URI="https://github.com/stella-emu/${PN}/releases/download/${PV}/${P}-src.tar.xz"
+
+LICENSE="GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="joystick"
+
+RDEPEND="
+	media-libs/libsdl2[joystick?,opengl,video]
+	media-libs/libpng:0=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( Announce.txt Changes.txt Copyright.txt README-SDL.txt Readme.txt Todo.txt )
+HTML_DOCS=( docs/. )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/INSTALL/s/-s //' \
+		-e '/STRIP/d' \
+		-e "/icons/d" \
+		-e '/INSTALL.*DOCDIR/d' \
+		-e '/INSTALL.*\/applications/d' \
+		-e '/CXXFLAGS+=/s/-fomit-frame-pointer//' \
+		Makefile || die
+}
+
+src_configure() {
+	# not an autoconf script
+	CXX="$(tc-getCXX)" ./configure \
+		--prefix="/usr" \
+		--bindir="/usr/bin" \
+		--docdir="/usr/share/doc/${PF}" \
+		--datadir="/usr/share" \
+		$(use_enable joystick) \
+		|| die
+}
+
+src_install() {
+	default
+
+	local i
+	for i in 16 22 24 32 48 64 128 ; do
+		newicon -s ${i} src/common/stella-${i}x${i}.png stella.png
+	done
+
+	domenu src/unix/stella.desktop
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}