gentoo resync : 15.06.2021

5 files changed, 70 insertions, 31 deletions

diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index 032b982332b4..a8b801bff3b2 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,5 +1,7 @@
 AUX hatari-2.2.1-default-rom.patch 698 BLAKE2B 5830bf75aa9039f0fda3f354bef50fa5dc6c7bea658c2f540a39f21f9b52fbb51447d1f1819ca3eebd248a93f7d255e9ef98a912aa908fbb15277a9ed106b853 SHA512 24659ea52cccb641010b08778608d87b4849b605b2825804f63f1285483605fdc2559f6ce6e17a5a71f801981c7bcf5d429dfc84f6dc6e5ed4cad9f1d957482f
 AUX hatari-2.2.1-joystick.patch 2172 BLAKE2B 67be6915d79612d851bcd617637e05d076f8a498194957a21ee6213c77fc0c7b718220afb0749bb2ccfa9322af34b020391fd8be9540dd1f7ed694f510215c2d SHA512 54b73d294dcc061abc4e037515f18bd0aa2e311c97010b687fce5cd90e427aac431bf820a1dd9ce2b2632e1662496e423582d80b1d55f23eef0734f03adfb2b8
-DIST hatari-2.2.1.tar.bz2 4162798 BLAKE2B 51938a649957779652b0debf7f867b2abe2d54fd3bb31086542f9f5970d01a120455e4381a9cb173724fbc7c45359d4009377bfe99038b338142fa5b82723533 SHA512 0e4c148a355a53c9cf79bdd28e5d7bb5f3389c780576017c6ebe2b69465d67522f373945f0e51681120ece24f5f08442265515486d2d7df7a02d9cd94cc44f1e
-EBUILD hatari-2.2.1-r1.ebuild 2161 BLAKE2B 3c1fd9de60d4b7fe8e79e49b0e42e31a57a7aa40357756678f8bdddec7a200886989d2821914b73e585f96b9b87af855a03160526d22a4b5fb2fcc3c994c17db SHA512 29b2311a64c968f6050825ec5a5ab050aaf45f2218ec2918fcbbb2d8f2c2b4203cff1312a66e8d61d8eb4e88a75c5c955e89642fca9208b721e59248a32f1e23
-MISC metadata.xml 619 BLAKE2B 452a04b03222a27e8790a2ce0b38d81899baaf65c9fcdeb22dcec9950cc0fddf027525b23bdb7739fee45ed1daec47071b3d1262006fc3f10c6ff07a8b1bd148 SHA512 6d87d6ab08072cc43e1f42160d0df993dfba7b2f5480261024bdb637f3169062e530029a248c7bee514c604629f6c04c80dd5c609d23bca639a5ef720c266e42
+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
+EBUILD hatari-2.3.1.ebuild 2449 BLAKE2B 32ba57e52127c2bb01541fac8178e542398e92315a68749d7decc544eee620c14a344fe1ea0c7d90286a6351ea0460d3687b365bbc16ae58cca69ddbbd929c44 SHA512 66ecbe53cc3792b1a06b6664f3480366514e2f807b6be01e5aaff7c2a304a3fb7ea1d5baf8a125cd11ae09bb74f48822a8f7d5130d08280f8638b7fbacd533ce
+MISC metadata.xml 563 BLAKE2B e3361a33fead8a835f7eebab0c8ec6be82f43a12dfb053643b82368a03b123a25841ae76e2f4c1e7046721f2b21895762603ce1b0ec6a3ca4decc4db5747d1ab SHA512 9ba66a561368fafa4298886a2a055c71ddbf4991ce114645fa9123077a32d0e0ea3b264f260f4700c9037b0710721f1bae948ede50fee2fc75ea4033ece39b6c
diff --git a/games-emulation/hatari/files/hatari-2.3.1-caps5-include-path.patch b/games-emulation/hatari/files/hatari-2.3.1-caps5-include-path.patch
new file mode 100644
index 000000000000..a12207b09583
--- /dev/null
+++ b/games-emulation/hatari/files/hatari-2.3.1-caps5-include-path.patch
@@ -0,0 +1,18 @@
+Gentoo's spsdeclib ebuild installs headers in caps5/
+while upstream now expects them in caps/
+
+See: https://github.com/hatari/hatari/commit/367a87b
+--- a/cmake/FindCapsImage.cmake
++++ b/cmake/FindCapsImage.cmake
+@@ -6,3 +6,3 @@
+ 
+-SET(CAPSIMAGE_DIR caps)
++SET(CAPSIMAGE_DIR caps5)
+ FIND_PATH(CAPSIMAGE_INCLUDE_DIR ${CAPSIMAGE_DIR}/CapsAPI.h)
+--- a/src/floppy_ipf.c
++++ b/src/floppy_ipf.c
+@@ -34,3 +34,3 @@
+ #endif
+-#include <caps/CapsLibAll.h>
++#include <caps5/CapsLibAll.h>
+ #define CapsLong SDWORD
diff --git a/games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch b/games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch
new file mode 100644
index 000000000000..39da11ea307d
--- /dev/null
+++ b/games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch
@@ -0,0 +1,12 @@
+Fix edge case build failure triggered by passing every
+DISABLE_FIND_PACKAGE, including disabling the normally
+always-enabled readline.
+
+CMake Error at CMakeLists.txt:229 (check_symbol_exists):
+  Unknown CMake command "check_symbol_exists".
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,2 +12,3 @@
+ include(CheckStructHasMember)
++include(CheckSymbolExists)
+ include(CheckCCompilerFlag)
diff --git a/games-emulation/hatari/hatari-2.2.1-r1.ebuild b/games-emulation/hatari/hatari-2.3.1.ebuild
index 25be1987275d..2512ca06655f 100644
--- a/games-emulation/hatari/hatari-2.2.1-r1.ebuild
+++ b/games-emulation/hatari/hatari-2.3.1.ebuild
@@ -3,80 +3,88 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 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="capsimage microphone png portmidi readline +sdl2 udev zlib"
+IUSE="capsimage gui microphone png portmidi readline udev zlib"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
+	media-libs/libsdl2[sound,video]
 	capsimage? ( >=dev-libs/spsdeclib-5.1-r1 )
 	microphone? ( media-libs/portaudio )
-	png? ( media-libs/libpng:0= )
+	png? ( media-libs/libpng:= )
 	portmidi? ( media-libs/portmidi )
-	readline? ( sys-libs/readline:0= )
-	sdl2? ( media-libs/libsdl2[sound,video,X] )
-	!sdl2? ( media-libs/libsdl[sound,video,X] )
+	readline? ( sys-libs/readline:= )
 	udev? ( virtual/udev )
-	zlib? ( sys-libs/zlib )
-"
-
+	zlib? ( sys-libs/zlib:= )"
 RDEPEND="
 	${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=games-emulation/emutos-0.9.9.1
-"
-
+	gui? (
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+		x11-libs/gtk+:3[introspection]
+	)
+	>=games-emulation/emutos-0.9.9.1"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.1-default-rom.patch
-	"${FILESDIR}"/${PN}-2.2.1-joystick.patch
+	"${FILESDIR}"/${P}-caps5-include-path.patch
+	"${FILESDIR}"/${P}-cmake-include-checksym.patch
 )
-
 DOCS=(
 	readme.txt
-	doc/{changelog,coding,scsi-driver,thanks,video-recording}.txt
+	doc/{bugs,changelog,scsi-driver,thanks,video-recording}.txt
 )
 
 src_prepare() {
-	xdg_environment_reset
 	cmake_src_prepare
 
 	sed -i "s/\.1\.gz\b/.1/g;T;s/gzip[^\$]*/cat /g" {*/,}*/CMakeLists.txt || die
-	sed -i "s:\"doc\" + sep + \"hatari\":\"doc/${PF}\":" python-ui/uihelpers.py || die
-	sed -i "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
+	sed -i "s:doc/${PN}:doc/${PF}:" python-ui/uihelpers.py || die
+	# Note: >2.3.1 renames /python/ to /python3/, update accordingly
+	sed -i "s/python/${EPYTHON}/;s/dosfs/fs.fat/" 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/etos512k.img
+	EOF
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-		-DENABLE_SDL2=$(usex sdl2)
 		-DCMAKE_DISABLE_FIND_PACKAGE_CapsImage=$(usex !capsimage)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
 		-DCMAKE_DISABLE_FIND_PACKAGE_PortAudio=$(usex !microphone)
 		-DCMAKE_DISABLE_FIND_PACKAGE_PortMidi=$(usex !portmidi)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Readline=$(usex !readline)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Udev=$(usex !udev)
 		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DETCDIR="${EPREFIX}"/etc
+		$(usex gui '' -DPYTHON_EXECUTABLE=false) # disables python-ui/
 	)
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/${PN}/
+
+	insinto /etc
+	doins hatari.cfg
+
+	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 f17253687ee3..848e8b086ce0 100644
--- a/games-emulation/hatari/metadata.xml
+++ b/games-emulation/hatari/metadata.xml
@@ -9,6 +9,5 @@
 	<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>
-	<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
 </use>
 </pkgmetadata>