gentoo resync : 08.07.2021

3 files changed, 60 insertions, 65 deletions

diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index 55b8af59e950..d0ddff80cc51 100644
--- a/games-emulation/stella/Manifest
+++ b/games-emulation/stella/Manifest
@@ -1,5 +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 1353 BLAKE2B 4e9d723e1cf6b68e3c4acc2f5fb87fcd0af30989cb907dc43bbad83c3b8670f70b622486c8ad23a5c7e38f93b09303c0bd5c5182c91757782392da6203f6227e SHA512 9f39dc63c241d9fc4be281f3ba14f44bbfe935fca41ce16aa53c8284b770ae9a9f92de387f13b4f37e6225a0346b683ed51a1b74d000cd81124f22dde2a15f6a
+DIST stella-6.5.3-src.tar.xz 6221588 BLAKE2B 1cee75cd27c14db5a2eaf3a6d88af5b3d081c2577afd4b46b27ef33dd11d676cd5fe981d8ae918373b16d7f50e0151a9e0fc00765fb39370ea50f8322a90b963 SHA512 67fe45c0be510494e4c3ead91ee5f7c9a8ba7059b76beb15e794ef49144c8f0fb57d7c7476f4f299e573e37ea1c41f2fb094ca10974f3bcda797fc69c9bd2986
 EBUILD stella-6.5.2.ebuild 1359 BLAKE2B b3eb5d424060af0ab7aefe4d6cf2c7762bc61b3c304cd288d4206364c144e6cd08f03bb000c97f0844f590ad8ce142717c95aa6c868d145b1bc5985c93944150 SHA512 d80e24ded2edac83a45e0acd21529e2b5337c6ee73e435ef46a3747a13010e3eb01beb328d86821a1bc6f61875f014b82dfac3c9d77dc6cf219a8667ef5e7b3f
+EBUILD stella-6.5.3.ebuild 1181 BLAKE2B af98eb95d88bfd591afba8d05b2da853a053f2b1627a9d3325c3e6211e1eaa043a4793f46d7f8c75957768529b13f6d957eab08c1020140a2980c9d466ff5695 SHA512 5e590e83b530038a79fee476ec4fab0373d3ca725431586e443f9ff426cb29c0a01c42841b347a4c608d669710e60fda748a4a8336fe367d551b22f0f3b73daf
 MISC metadata.xml 386 BLAKE2B 23b063450bf4b6915ed443ff8e9cc0c24858144c867085a6416f73b2299026ab85d4b07f18bbd54db37ce420803eb81561e87323e5eee0cdb99652de2c15d153 SHA512 6d69c2c3b88a206faaf9d80c1c1d8de01d1865bf800e4d4b7997dae4641f99665c0692251cf3d045e766be045069548e42cdb3303cb698f093501f2e79124fa1
diff --git a/games-emulation/stella/stella-5.1.3.ebuild b/games-emulation/stella/stella-5.1.3.ebuild
deleted file mode 100644
index e1a6bdf39dd8..000000000000
--- a/games-emulation/stella/stella-5.1.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop 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; }
diff --git a/games-emulation/stella/stella-6.5.3.ebuild b/games-emulation/stella/stella-6.5.3.ebuild
new file mode 100644
index 000000000000..0834d742503d
--- /dev/null
+++ b/games-emulation/stella/stella-6.5.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg
+
+DESCRIPTION="Multi-platform Atari 2600 VCS Emulator"
+HOMEPAGE="https://stella-emu.github.io"
+SRC_URI="https://github.com/stella-emu/stella/releases/download/${PV}/${P}-src.tar.xz"
+
+LICENSE="BSD GPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+joystick png zlib"
+REQUIRED_USE="png? ( zlib )"
+
+RDEPEND="
+	media-libs/libsdl2[joystick?,opengl,sound,video]
+	png? ( media-libs/libpng:= )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	Announce.txt Changes.txt README-SDL.txt
+	Readme.txt docs/R77_readme.txt Todo.txt
+)
+
+src_prepare() {
+	default
+
+	sed -i '/CXXFLAGS+=/s/-fomit-frame-pointer//' Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	# not an autotools generated script
+	local configure=(
+		./configure
+		--host=${CHOST}
+		--prefix="${EPREFIX}"/usr
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+		$(use_enable joystick)
+		$(use_enable png)
+		$(use_enable zlib zip)
+		${EXTRA_ECONF}
+	)
+
+	echo ${configure[*]}
+	"${configure[@]}" || die
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/share/doc/${PF}/html/*.txt || die
+}