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

3 files changed, 113 insertions, 10 deletions

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>