gentoo auto-resync : 12:07:2022 - 01:31:22

6 files changed, 113 insertions, 75 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 9090eb1bcbb3..158399052198 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index 3a404a11f1de..08716e75f1c4 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,5 +1,7 @@
 AUX hatari-2.3.1-caps5-include-path.patch 500 BLAKE2B 9462c680cf22368e06f37d313d0d0917b5904977ab0001fc3427bb8532d611481e0414c7a9c76a83f8c3a00691dd702c22a4c27eb3d1ef0a8bfbd5d48d636895 SHA512 53230cfbfc1904fba1af3d9a7554425d76e75f4a4fa51906ebfe12c9f178633bc63334036f3192643dfa2a3d51e5729c7932a58ca009902585a1653b44c28457
 AUX hatari-2.3.1-cmake-include-checksym.patch 388 BLAKE2B 45bc03fc6be8feae6d16083ea6fd5c2fbe1f63103c8a274e9e2104d39cb4050dd5cb0ac51e679fbb65c17d0e2df080245e0e5800f14578e956cbff2dd6c3e9f5 SHA512 b9afa6022e7be9dfe9ab47b791d5e7a64e835ae2098f5b04737b2ffc952598bc0e90a181609629d03f9568c8dcd4e5772cb96bd1416531ccba6c66a1d33c439e
 DIST hatari-2.3.1.tar.bz2 4334129 BLAKE2B f309a31cbf181135b02858ebefa4d70116e66d252ef5de03cffa8254c0e86e4eeebfbf626613103790fb803d08028b318721020b292ea748c79e4d008e6d503d SHA512 78a6c7d80bfcd9b3a85a82754f4180cfd906eb95c6a44c8fbb92c2a648dc9c21c74c9dd18db4783d87259a3061b39e639c54cdd6c033d83de1252afef811382f
+DIST hatari-2.4.0.tar.bz2 4452205 BLAKE2B fe53b4dac688720372386fc83a83996e2cc83d74fd20f71db5e60f773561dc51d33f3560c1625913a896a9592650460604e821c9f7f07e5bd50d1775b49dfea5 SHA512 8ec542b2f7e27cd185ff8725e8d31ba7f1de709fa638b6162d17b6f1163158cbd16fc2738aa6b073a71cd990a72f305b5322f754faef34399cdca8685a7bf08c
 EBUILD hatari-2.3.1-r1.ebuild 2496 BLAKE2B 4100c61b4aadcd00138988bfefd565374237f610975d4ded8874dcf14ff2421f8eaf76897995bdd3107982aec75bd68eee3a3492c7a7f742f482e44170bd19cc SHA512 e3c32883e6d2cb967ef5f892a2656f7894f07af37d30cf5ac78fa68b09cd86229f7d7812414af5342b3b3bd7306f53a4559ce878ffe5ca46e5b7214cb4423291
-MISC metadata.xml 564 BLAKE2B 1048b1c97dffd67eff94b4b244e2a2bedccf9f20e68f438f7989ed9b4812d8ac562e915c43beab4e3d42d0d989d96b3fb8c2fb58db274afae11066c3bdde00ce SHA512 d61a6d9fe1dc63dc99f9d589cec2138ee95f2e0eeab0866108864b172a0c331d468b8f1cfcb0644bcc6f01f4f632aa73db6c16922acd4f8df8a4a97a35ce4c5c
+EBUILD hatari-2.4.0.ebuild 2450 BLAKE2B 307f2a6995a4c51ad8b30ee1a618be15f883e0fdb751d72f71930243cd957c6bafd7bfe574e9f66b9c7c5fb746ef13b74c42240cb18291586f37f134e7a30487 SHA512 536959b1800e71fc12347a27ea01920b1db8f596d20bc86907f4b9be81f0866985f808bcdaed72f89d1723af8a8e1e552510f6b7848a72c3c196ab321c46027d
+MISC metadata.xml 651 BLAKE2B 0441d6a9feb7099c4edb1d520ea425215e69a9c4a79df7f0cdb6e782dba80db7b61258977d7584acf50a19bb5171d956fc94c8a839db799728e17390c3e7d1c9 SHA512 805c0e4e3761e109a29a3d8361d0db02db3ac522a09b5f3223de9edfe19d4ddbadfa0088bc02d573e1a79700c5a6ef43901ca6b7cb5423f6aafdd572fe9f4ed1
diff --git a/games-emulation/hatari/hatari-2.4.0.ebuild b/games-emulation/hatari/hatari-2.4.0.ebuild
new file mode 100644
index 000000000000..db2b63faf515
--- /dev/null
+++ b/games-emulation/hatari/hatari-2.4.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-single-r1 xdg
+
+DESCRIPTION="Atari ST emulator"
+HOMEPAGE="https://hatari.tuxfamily.org/"
+SRC_URI="https://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X capsimage gui png portmidi readline udev zlib"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	png? ( zlib )"
+
+COMMON_DEPEND="
+	media-libs/libsdl2[X?,joystick,sound,video]
+	X? ( x11-libs/libX11 )
+	capsimage? ( >=dev-libs/spsdeclib-5.1-r1 )
+	png? ( media-libs/libpng:= )
+	portmidi? ( media-libs/portmidi )
+	readline? ( sys-libs/readline:= )
+	udev? ( virtual/udev )
+	zlib? ( sys-libs/zlib:= )"
+RDEPEND="
+	${PYTHON_DEPS}
+	${COMMON_DEPEND}
+	gui? (
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+	)
+	>=games-emulation/emutos-1.1.1"
+DEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-caps5-include-path.patch
+	"${FILESDIR}"/${PN}-2.3.1-cmake-include-checksym.patch
+)
+
+DOCS=(
+	readme.txt
+	doc/{bugs,changelog,scsi-driver,thanks,video-recording}.txt
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i "s/\.1\.gz\b/.1/;T;s/gzip[^\$]*/cat /" {*/,}*/CMakeLists.txt || die
+	sed -i "s:doc/${PN}:doc/${PF}/html:" python-ui/uihelpers.py || die
+	sed -e "s/python3/${EPYTHON}/" \
+		-e 's/mkdosfs/mkfs.fat/' \
+		-i tools/atari-hd-image.sh || die
+
+	# use emutos package rather than bundled ROM
+	rm src/tos.img || die
+	cat <<-EOF > hatari.cfg || die
+		[ROM]
+		szTosImageFileName = ${EPREFIX}/usr/share/emutos/etos1024k.img
+	EOF
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+		-DETCDIR="${EPREFIX}"/etc
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package capsimage CapsImage)
+		$(cmake_use_find_package png PNG)
+		$(cmake_use_find_package portmidi PortMidi)
+		$(cmake_use_find_package readline Readline)
+		$(cmake_use_find_package udev Udev)
+		$(cmake_use_find_package zlib ZLIB)
+		$(usev !gui -DPYTHON_EXECUTABLE=false) # only disables python-ui/
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc
+	doins hatari.cfg
+
+	mv "${ED}"/usr/share/doc/${PF}/{html/*.txt,} || die
+
+	python_fix_shebang "${ED}"/usr/bin
+	use gui && python_fix_shebang "${ED}"/usr/share/${PN}/${PN}ui
+}
diff --git a/games-emulation/hatari/metadata.xml b/games-emulation/hatari/metadata.xml
index 9257dac2b8a5..e85494419618 100644
--- a/games-emulation/hatari/metadata.xml
+++ b/games-emulation/hatari/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="capsimage">Use <pkg>dev-libs/spsdeclib</pkg> to read .IPF, .RAW, and .CTR disk images</flag>
-	<flag name="microphone">Use <pkg>media-libs/portaudio</pkg> for Falcon microphone handling</flag>
-	<flag name="portmidi">Use <pkg>media-libs/portmidi</pkg> as an alternative MIDI backend</flag>
-</use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="capsimage">Use <pkg>dev-libs/spsdeclib</pkg> to read .IPF, .RAW, and .CTR disk images</flag>
+		<flag name="microphone">Use <pkg>media-libs/portaudio</pkg> for Falcon microphone handling</flag>
+		<flag name="portmidi">Use <pkg>media-libs/portmidi</pkg> as an alternative MIDI backend</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">hatari/hatari</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 60f40266236a..0a38e036308d 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,7 +1,5 @@
 AUX zsnes-2.0.9-cc-quotes.patch 375 BLAKE2B 8d9295648dbed975c36494f6d8f8253d40e03b21d41ee41d306439411fb989962ea787c231b00b0f61ddeef459b7cead357b01c49df281380cd8a10b3983fc32 SHA512 554b3634edb5a4d542b359e4a3bd248ecaa3888e273d04d846389716b637bb167e1b8eb19abcaf025051a31a1b459d3fb84a648f413f0654265d1ca30c0e5448
 AUX zsnes-2.0.9-gentoo-zlib.patch 310 BLAKE2B de05b0595eb37fad0eebed9b4c667bc4f21c3b1445864c0c9e2142d457ee7adda87ff283ad183698bc60ceb4a40766804da21640ec600a9af5100796405ee9de SHA512 5f7852a818ae55e15f7d81df34be56f756e2c4a7c2c4084a417cdba847ea50a94f04a184c85305005400a285f05966d08e234c16c0ec3c7508e9c6741e84459e
 DIST zsnes-2.0.10.tar.gz 926347 BLAKE2B b9ab4701290ae802cb35045e0a3d4ff5268f96f7dc84614f39e950a6273a8477d5e2dca0598e3448744486de31caf692d44d36fe284f6f20697a5b4e92c908f8 SHA512 513e350198a944af47accedc6d3c14405898c753bb8168871d323c11f8c1253d8d7e247759a13e40a3b5eda195824e4862bb1fc093a3db9a75c8bb2e0bef728e
-DIST zsnes-2.0.9.tar.gz 935183 BLAKE2B a9b72ed15b2ed6d9e4631b4f12b2291ddca76a7236da008eba0f8b3ee27c94b98f00ff16a4929929adf484bc16554474b942b9f8306f46ab713e8a40e1f64624 SHA512 ea9244e98a175db9bceddf14e8212b3474ddaba1f508d698d8cfc43270fa3dabf51dca43dd30255272aba3cd061bf450bef04e005ce8087d550400e66faea565
 EBUILD zsnes-2.0.10.ebuild 1826 BLAKE2B a4070075f430d25cf5e03aa6209d4a695cf903d6590dd7544403ae43dca1be5fb88a2df2daf8bb049a55400b21745feadf8d0125f909c986aebc17376b0087e1 SHA512 a590167075d01469287074e85f4daef2cab72bd9445d23764860cdbba72f921ed0329e5af280a2c5751ed393b81b153765e4aef26c7e9446b49960c12a8b605d
-EBUILD zsnes-2.0.9.ebuild 1761 BLAKE2B 82f2fd40b0b20f2fe6977b0b86788bd6524dd02337fd8816cd7cc788a8a732284820864bf9da5ed84674465c9d86d994871d8a3012a351ae13d7e82c554297e6 SHA512 e60f4b88e425d46cec5e32b3ec0b5bf82fd0e1b95f67c100fbef26874b3af44a7287902448fd5daf0b68d358bdf0965c263ed12ab36c8bfbb214720f3fb771c4
 MISC metadata.xml 382 BLAKE2B 7e932fa492112a2a6b697f1abe12fda2c22992e079211e561fa6c0ea0ae0949503251193975a10848c6ba464e82e3306edb594269bea681e2106872304d26614 SHA512 16503e242acdd3ac96aaffc2df7521f936e5eaebccac4b409ecd4780cf5fb823a3a851df387b0035db749a2cf4d2e05276ffe7075d5f4834b1cf63f39adb8988
diff --git a/games-emulation/zsnes/zsnes-2.0.9.ebuild b/games-emulation/zsnes/zsnes-2.0.9.ebuild
deleted file mode 100644
index 02f1b45b2615..000000000000
--- a/games-emulation/zsnes/zsnes-2.0.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Fork of the classic Super Nintendo emulator"
-HOMEPAGE="https://github.com/xyproto/zsnes/ https://www.zsnes.com/"
-SRC_URI="https://github.com/xyproto/zsnes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="custom-cflags"
-
-RDEPEND="
-	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl[abi_x86_32(-),joystick,opengl,sound,video]
-	sys-libs/zlib:=[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="
-	dev-lang/nasm
-	sys-libs/zlib
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.9-cc-quotes.patch
-	"${FILESDIR}"/${PN}-2.0.9-gentoo-zlib.patch
-)
-
-src_compile() {
-	# config.linux forces many CFLAGS that are questionable, but zsnes'
-	# ancient x86 asm is very fragile, not pic safe (bug #427104), broken
-	# by FORTIFY_SOURCE (bug #257963), and can be affected by -march=* and
-	# similar. Stick to upstream's choices, this is non-portable either way.
-	use custom-cflags || strip-flags
-	append-cppflags -U_FORTIFY_SOURCE
-
-	# used to build and run parsegen at build time (uses zlib wrt BDEPEND)
-	tc-export_build_env BUILD_CXX
-	local buildcxx="${BUILD_CXX} ${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS}"
-
-	use amd64 && multilib_toolchain_setup x86
-	tc-export CC CXX
-	append-cflags "${CPPFLAGS}"
-	append-cxxflags "${CPPFLAGS}"
-
-	emake CXX_HOST="${buildcxx}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-
-	dodoc README.md TODO.md
-
-	newicon icons/64x64x32.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^^}
-}