gentoo resync : 18.11.2019

14 files changed, 205 insertions, 324 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 7a85ee2f1983..485e001f4768 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 40e7ab8c7d61..730310de56a5 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -2,6 +2,5 @@ AUX desmume-0.9.11-fix-pointer-conversion-warning.diff 370 BLAKE2B 8e019cf69a13b
 AUX desmume-0.9.11-gcc6.patch 1991 BLAKE2B ffb0a58f7317aa50fe17c4abe1ba6c9bbf9cb937736479214b86187c32af8c1659aa719eccce184a5f0fa1b31f15634276fb676bf97ec64feba603fa89ee289f SHA512 e9249a613f1bf3b6d72dcce47cbc39daeadb1b4f7b9be2748b537ec3389a61f46b5f15f5a10d55bc4b1dbd69dd87526b5ce79e58b539cf432679da9bc803e0cd
 AUX desmume-0.9.11-gcc7.patch 832 BLAKE2B 80accd7e22d22163692be58f2da288db4b4009603f9cf9fca4d709e44dfae4496c9b7610c82bf6bfc47c470837dccec83a95e124c3ad9a8cead654cd389a3476 SHA512 9c9b0452a6aaf860583ad97737fb7142601a5ff6f4b720037c9b4d2aeab533c12ffbb1a216753f7e9e4f04350a4e276c5606624ab633f4c2bea517ec0233db8f
 DIST desmume-0.9.11.tar.gz 5359305 BLAKE2B 31764dcb2d0facf32eddd5c66f40e2268f8afd5c2562bf246b93bb60c191d7888587991732014dee11417016515a4367bda9acf79f699703754aa904dcaeeb01 SHA512 160cb6ec0ede04ad1fbddde2b7b04aa41fa464c8338d7eb9d7536196a82d8d716889b40be4fb831a22e3fe8532b947f7f0b41311601b6842be2516dff7cae46c
-EBUILD desmume-0.9.11-r1.ebuild 800 BLAKE2B 5cf60a8343d47e2e7adce5697fe8904bc733f503d9d56a37515708def52dd403ae52bec61b20bb6183335266e61916b2d0591e6f89ca20ce5cdbff76c565cbd6 SHA512 91fc616b3935e92f6b1f88346a47b6683835d02a2a35f32fc2b2d127971546fe45ef3af8d1d690f9e39b595f51c405664cf29ae9b62e63f024e8c98214786e7d
 EBUILD desmume-0.9.11-r2.ebuild 778 BLAKE2B 43c3a3e4e773015deb7298a27c89afd385ee51f17609aae9690e429e70d81ab4db1123184f42fa0136fd6c6a1502e7e6f89a2f0067d0ab329d19820bc57c17ad SHA512 d8cedd2e9fc22ac1b57b3537387ea500055fc70bf07fc0e347af93a686f0867e9921a74dc44a3c01c60ebe344f8693ef65cdd2a74592ec173b8444c7f684e6b5
 MISC metadata.xml 407 BLAKE2B a64ba166734f13f34fec0ca394d4d51bc70f2cb9539981e068e544f3139584ee3ec2da89a02ef9203008cb73213213adb148c978311ae36d95749e553d10605b SHA512 89d3a5b608525bfa1f05503017619520d82c663241668c3d5fa5602e625cbfe02564b04d7bac0e97bbe53ff8eba08a6895fb0e8cd519d0d88efd29a0ca64ac4b
diff --git a/games-emulation/desmume/desmume-0.9.11-r1.ebuild b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
deleted file mode 100644
index e98e0846012b..000000000000
--- a/games-emulation/desmume/desmume-0.9.11-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg
-
-DESCRIPTION="Nintendo DS emulator"
-HOMEPAGE="http://desmume.org/"
-SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/zziplib
-	gnome-base/libglade
-	media-libs/libsdl[joystick,opengl,video]
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/agg
-	>=x11-libs/gtk+-2.8.0:2
-	x11-libs/gtkglext"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README README.LIN )
-
-# fix QA compiler warning, see
-# https://sourceforge.net/p/desmume/patches/172/
-PATCHES=(
-	"${FILESDIR}/${P}-fix-pointer-conversion-warning.diff"
-	"${FILESDIR}/${P}-gcc6.patch"
-	"${FILESDIR}/${P}-gcc7.patch"
-)
diff --git a/games-emulation/emutos/Manifest b/games-emulation/emutos/Manifest
index 15b6ffc7ccef..71b91f0cbaee 100644
--- a/games-emulation/emutos/Manifest
+++ b/games-emulation/emutos/Manifest
@@ -1,8 +1,6 @@
-DIST emutos-256k-0.9.4.zip 1600186 BLAKE2B 2c5243165d651a8f4f3b56d0b4bf30bbfd183e4c9d3ae2b1087c3864d540efe445cf10b68e98e862a12be9f34c388548959376a665aac91f09e05b4b39abce58 SHA512 ce7ce9e53c82f7861752ee454a4e3ce616bca73ce580e2b803deea22497de06e5ab49a69af6507ce98ab337312dbb879d258ba2acdf868443f406761caa69404
-DIST emutos-256k-0.9.9.1.zip 1913841 BLAKE2B 3f6093b5df9f694c8f75c07378bbb2e6326b4cf5235fd76059d6cd49701744e16b6fcbf8a92ece7d7bc67c480578f6245bd2e5d48a3e73240b7ae57f0c9ad4d6 SHA512 9ede677a53414bf86b111b3703386aea2b9600abbd6a4fd632b3549faa50f7308fcc7a0eb78626d59a4f2c7d8b844dc2ad5137d2b927f070ab1482799605a56d
-DIST emutos-512k-0.9.4.zip 314877 BLAKE2B 69388ce090c56c05861b859061a9b47998354dc240a0b482f616c5a2c9440ee897abdad96b946f922f77f60ee7d781e37538a42bfc778a6e15ab82225596d91b SHA512 00c8718f364712f5d346859dc40ed83c1792521c9600520aacf199f7d6b24d5cf7a3e2533e1e343d6aa9e77ed3056f8636713bb7c3e9739254e0658c921a78a8
-DIST emutos-512k-0.9.9.1.zip 273400 BLAKE2B baf7001b1150aa5aa5482920733c613c8ebc2d9eeb944de6c1cae471e6889062ed935a3bfe17d209a54733dd5ca453244fde6d906b7dd7f68772633d456df594 SHA512 38f5084df230883634715a1bd1ec542ed63027fae5690a7857986653a918f302126a288600aefa38bd12920d40c1a535cd467b66d55a1b0471364a590ca7986a
-DIST emutos-src-0.9.3.tar.gz 935570 BLAKE2B bcbf216e8bfbae681a404fdaa07e7bc00e1a865e4f6430bf70741ea9a92ee16ab90eef99140c29f3cf381bac93d72e20312e7f21b2e96bc23144c73af0b9191f SHA512 45e19a9f8ebbd1675059a78d1416d0571bc54c3979b36c684f2394f508f48f6f1dae10f4eb966e1757ff10698644302c788ee3e51bf42fe10d131d87508d9824
-EBUILD emutos-0.9.4-r1.ebuild 640 BLAKE2B 8a3f4bb6cfa1d3e87bb6d17f4d17e66d46c99f020824fb067dd865438414b28fb33f23d9a7d4bc2485403763aaf76fd7dbe5048bd54b4e2229eb8fe4dcb2f071 SHA512 2c5b4da9049091414ab55b0caf51953701fcec33742b66e0e78f1c030592d89d0fe51175bbf8275b2bb2956074091577522b92db4c88db258dd8b71ef8916d14
-EBUILD emutos-0.9.9.1.ebuild 587 BLAKE2B 828a08810fcd647a4dc5b06c48635c042b28b83f0b0cb6d67859f0d04c228c9d2eeb137d288f2b72550eeeff26a1f73b24ef3278832239383a64f2b620713d09 SHA512 adb1a1bffe4f24f784a2083d96d28eb20e1dade2b8f9917188db24a3a48ed0e5e46db8719e476aa010c46f7342c6eb2f3e39b27d990255dcbe7e03c4edac744e
+DIST emutos-192k-0.9.12.zip 1655923 BLAKE2B 2bc874c761d77d6b80e0ebf35e487951db866ce30c74bc91df155b3e6f58ec004de9fbb6e8402504eda2c3369ed783b8b53f8e80e7fcf05652c14dacd11eedc3 SHA512 7e75f645ff72a2dc7574cf005234261411b39af77113b329835d0d398e60c51d7451dd949f0cecdbdc4adc03561b43bb0449d1460f0dec547894b7bde29b01d1
+DIST emutos-256k-0.9.12.zip 2038241 BLAKE2B e287357877efe2346bd1936768f6c56e655e4b7d249545f4e3827e02c295817e6586477b68058e95690562c65a9085fa9e712da540727d93e12789f5bde325aa SHA512 18f43d2fc215e686fabafe0413b88d3593dc7ef931191541690527fbe7fcb4ff08ee946f75ceadf25d09c05fb69ae7d71230cc5b36ec42c7774fc5770b8a276d
+DIST emutos-512k-0.9.12.zip 301555 BLAKE2B 6341b4ac4fad707d81ab621e2952b2a92b139947b0ebc522983163fa86f308c595482f8b6caa23472bb022f1380f0a5963532b119c53676fe65b5115cde6d413 SHA512 0c68c76dede7d9a36c408f3a1bced2b710b1ad87fee5ba204e1b8c19a48ef1c51942eb766355c20f5cf95cc885423fd2750dc212c5dffe25b1d28620cc117854
+DIST emutos-aranym-0.9.12.zip 273147 BLAKE2B 863da12081f32ee665180d4536666a6558b475c6413e4f95aacd333f3a7d9a42820a04376b1b0484a975177abc3d41b2765c9147231829724e721dd477ebd328 SHA512 351104f097e5812be21fb30c41c829e62f127da39cc190ca60d26d20d94fedfb21493265b6b7113b9babb262dc30e0b87f1e235c90339f221b559578eacc5c44
+EBUILD emutos-0.9.12.ebuild 800 BLAKE2B a68f35c0129d8d578e37e9d06f466c72fd2d481b450836971dac42af502286abf19d441456288fdf3490b86e6d0a7fb5bed390c7353fe74f6c301b9a2e131265 SHA512 e88203235973df57707b72a345e3a3ba35ecb640704d0801d29d0470527bd59a4e1bff90319451e790904b7f5687180116d8c51d13bc4afbad8d812ff87cc64c
 MISC metadata.xml 329 BLAKE2B 3751df88821c56b414164dd686cc65be252f2968ecf92c93f2c6b3c6bd88a77bdc28a2fd33f4d08d2956e6e4d42c3304c0bc7a01226551850c44a438f1d2dd5e SHA512 5af91295f3ae78fb613b90a573aa870ac2e5e00623f305a00981637ac480320f2df7b16f35155e880344254521a0d08adf12ae92cffa15d4a3c3dab2aa8d661a
diff --git a/games-emulation/emutos/emutos-0.9.12.ebuild b/games-emulation/emutos/emutos-0.9.12.ebuild
new file mode 100644
index 000000000000..538e577b77ad
--- /dev/null
+++ b/games-emulation/emutos/emutos-0.9.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERSIONS=(
+	192k
+	256k
+	512k
+	aranym
+)
+
+DESCRIPTION="Single-user single-tasking operating system for 32-bit Atari computer emulators"
+HOMEPAGE="http://emutos.sourceforge.net"
+SRC_URI=$(printf "mirror://sourceforge/emutos/${PN}-%s-${PV}.zip\n" "${VERSIONS[@]}")
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/${PN}
+
+	doins */*.img
+	use debug && doins */*.sym
+
+	local VERSION
+	for VERSION in "${VERSIONS[@]}"; do
+		newdoc "${PN}-${VERSION}-${PV}"/readme.txt readme-"${VERSION}".txt
+	done
+
+	dodoc "${PN}-512k-${PV}"/doc/{announce,authors,bugs,changelog,emudesk,incompatible,status,todo,xhdi}.txt
+}
diff --git a/games-emulation/emutos/emutos-0.9.4-r1.ebuild b/games-emulation/emutos/emutos-0.9.4-r1.ebuild
deleted file mode 100644
index 0e2acfe94e1c..000000000000
--- a/games-emulation/emutos/emutos-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Single-user single-tasking operating system for 32 bit Atari computer emulators"
-HOMEPAGE="http://emutos.sourceforge.net"
-SRC_URI="mirror://sourceforge/emutos/emutos-src-0.9.3.tar.gz
-	mirror://sourceforge/emutos/emutos-512k-${PV}.zip
-	mirror://sourceforge/emutos/emutos-256k-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	dolib */*.img
-	dodoc emutos-512k-${PV}/{readme.txt,doc/{announce,authors,changelog,status}.txt}
-}
diff --git a/games-emulation/emutos/emutos-0.9.9.1.ebuild b/games-emulation/emutos/emutos-0.9.9.1.ebuild
deleted file mode 100644
index 10bd4656d74a..000000000000
--- a/games-emulation/emutos/emutos-0.9.9.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Single-user single-tasking operating system for 32 bit Atari computer emulators"
-HOMEPAGE="http://emutos.sourceforge.net"
-SRC_URI="mirror://sourceforge/emutos/${PN}-512k-${PV}.zip
-	mirror://sourceforge/emutos/${PN}-256k-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins */*.img
-	dodoc ${PN}-512k-${PV}/{readme,doc/{announce,authors,changelog,status}}.txt
-}
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index 8dd62b3390a2..18e198986552 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,4 +1,5 @@
-AUX hatari-2.1.0_caps5_files.patch 5268 BLAKE2B 8562fee9d01377f368fd5062a26df00297a67eef64fbec5dfdbb789638148f9bcd4ed35132d8b26e6432eb151964a835d96ed828bc151518e4bc19af4f71569c SHA512 9148368f98bddb1083735a9ac9077cf830436c31b69b8e0138080325136f76c65957ca450306fc07ab07c5a47b827a9d2fad026c49af35263f7b0ab070de5358
-DIST hatari-2.1.0.tar.bz2 4072778 BLAKE2B 934ab28e799d0d13c26c291005513511367eb2ddbeda0f9756c19f10fa9e6bb8e10451057fa7e0b49a30e3f562eb5f327057d324b2a92e09b1115f63132dca97 SHA512 d1fbf6e60e2df2c43d070bee6a9c1dc93c36a8ea7f75bbf2a67790840952661cee136ebccd6b2ed523ef9b7b56391e058384f2e3f46acb609bb362cac05b9753
-EBUILD hatari-2.1.0-r1.ebuild 2061 BLAKE2B b26dde3a994f4666c25755c3ba79ae8e51c7030f523cfdd7f3d6f4004a7a325479c95df51e0225efdcba190f118dd1d7be9b46f69a08773b0bac99221852217d SHA512 13ca2eec6272b5f40970a6217285c3d850412e3709b484812bb75b5105428546f9c1d589ceba18ceefa1e8b9d0e62eb4316d0e20576ec317d0cb5b8d69d3a977
-MISC metadata.xml 318 BLAKE2B be4d8512e3f8fe751fc03aeae422216c9a366fc4cea3a49e4b8050f2a8280054fcc335f820718743fdf49cdb9a1fb73633e596ac8bf989b22f0f5a5fa33bd93b SHA512 2e304611622c91d0bd54f986ac3f02fc504bbd28e5ce03e5b958100b8567012ea0fe2a46884d29dfa18c6a4408fd0283679eb4a4f62c80a40ad748f5c811d943
+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.ebuild 2153 BLAKE2B 81234fc342de6c37d0fe7a375186e87bdbe2269424fc9e461091d624c98a6e60e1752192055af18bbcde22d1831728dd3c72c0cfec9bdaa1cae1e8f9029655d5 SHA512 4bcb95ac273b48ed1668afc36acd959867e94f3aba4d1bbd84ff80802ca7599f6db8e58847648528bd8f872292281a20b39e3e2ab222abce698895e1d01e380d
+MISC metadata.xml 619 BLAKE2B 452a04b03222a27e8790a2ce0b38d81899baaf65c9fcdeb22dcec9950cc0fddf027525b23bdb7739fee45ed1daec47071b3d1262006fc3f10c6ff07a8b1bd148 SHA512 6d87d6ab08072cc43e1f42160d0df993dfba7b2f5480261024bdb637f3169062e530029a248c7bee514c604629f6c04c80dd5c609d23bca639a5ef720c266e42
diff --git a/games-emulation/hatari/files/hatari-2.1.0_caps5_files.patch b/games-emulation/hatari/files/hatari-2.1.0_caps5_files.patch
deleted file mode 100644
index cac630f66f44..000000000000
--- a/games-emulation/hatari/files/hatari-2.1.0_caps5_files.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -Nuar hatari-2.1.0-orig/cmake/FindCapsImage.cmake hatari-2.1.0/cmake/FindCapsImage.cmake
---- hatari-2.1.0-orig/cmake/FindCapsImage.cmake	2018-07-28 20:32:59.164780571 +0300
-+++ hatari-2.1.0/cmake/FindCapsImage.cmake	2018-07-28 20:33:16.130781607 +0300
-@@ -1,22 +1,18 @@
--
- IF (CAPSIMAGE_INCLUDE_DIR)
--  # Already in cache, be silent
--  SET(CAPSIMAGE_FIND_QUIETLY TRUE)
-+	# Already in cache, be silent
-+	SET(CAPSIMAGE_FIND_QUIETLY TRUE)
- ENDIF (CAPSIMAGE_INCLUDE_DIR)
- 
--
--# Choose the library version to use : 4 or 5
--SET(CAPSIMAGE_VERSION 5)
--
--
--if(CAPSIMAGE_VERSION STREQUAL 4)
--	SET(CAPSIMAGE_DIR caps)
--	FIND_PATH(CAPSIMAGE_INCLUDE_DIR ${CAPSIMAGE_DIR}/capsimage.h)
-+if(ENABLE_CAPSIMAGE5)
-+	SET(CAPSIMAGE_VERSION 5)
-+	FIND_PATH(CAPSIMAGE_INCLUDE_DIR NAMES CapsAPI.h PATH_SUFFIXES caps5)
- else()
--	SET(CAPSIMAGE_DIR caps5)
--	FIND_PATH(CAPSIMAGE_INCLUDE_DIR ${CAPSIMAGE_DIR}/CapsAPI.h)
-+	SET(CAPSIMAGE_VERSION 4)
-+	FIND_PATH(CAPSIMAGE_INCLUDE_DIR NAMES capsimage.h PATH_SUFFIXES caps)
- endif()
- 
-+message(${CAPSIMAGE_INCLUDE_DIR})
-+
- if(WIN32)
- 	FIND_LIBRARY(CAPSIMAGE_LIBRARY NAMES capsimg PATH_SUFFIXES ${CAPSIMAGE_DIR} )
- else()
-diff -Nuar hatari-2.1.0-orig/src/CMakeLists.txt hatari-2.1.0/src/CMakeLists.txt
---- hatari-2.1.0-orig/src/CMakeLists.txt	2018-07-28 20:32:59.152780571 +0300
-+++ hatari-2.1.0/src/CMakeLists.txt	2018-07-28 20:33:16.131781607 +0300
-@@ -55,6 +55,10 @@
- 	include_directories(${PNG_INCLUDE_DIR})
- endif(PNG_FOUND)
- 
-+if(CAPSIMAGE_FOUND)
-+	include_directories(${CAPSIMAGE_INCLUDE_DIR})
-+endif(CAPSIMAGE_FOUND)
-+
- if(X11_FOUND)
- 	include_directories(${X11_INCLUDE_DIR})
- endif(X11_FOUND)
-diff -Nuar hatari-2.1.0-orig/src/floppy_ipf.c hatari-2.1.0/src/floppy_ipf.c
---- hatari-2.1.0-orig/src/floppy_ipf.c	2018-07-28 20:32:59.152780571 +0300
-+++ hatari-2.1.0/src/floppy_ipf.c	2018-07-28 20:34:32.782786288 +0300
-@@ -30,9 +30,9 @@
- 
- #ifdef HAVE_CAPSIMAGE
- #if CAPSIMAGE_VERSION == 5
--#include <caps5/CapsLibAll.h>
-+#include <CapsLibAll.h>
- #else
--#include <caps/fdc.h>
-+#include <fdc.h>
- #define CAPS_LIB_RELEASE	4
- #define CAPS_LIB_REVISION	2
- #endif
-@@ -61,8 +61,8 @@
- 
- 	struct CapsFdc		Fdc;				/* Fdc state */
- 	struct CapsDrive 	Drive[ MAX_FLOPPYDRIVES ];	/* Physical drives */
--	CapsLong		CapsImage[ MAX_FLOPPYDRIVES ];	/* Image Id or -1 if drive empty */
--	CapsLong		CapsImageType[ MAX_FLOPPYDRIVES ]; /* ImageType or -1 if not known */
-+	Sint32			CapsImage[ MAX_FLOPPYDRIVES ];	/* Image Id or -1 if drive empty */
-+	Sint32			CapsImageType[ MAX_FLOPPYDRIVES ]; /* ImageType or -1 if not known */
- 
- 	int			Rev_Track[ MAX_FLOPPYDRIVES ];	/* Needed to handle CAPSSetRevolution for type II/III commands */
- 	int			Rev_Side[ MAX_FLOPPYDRIVES ];
-@@ -83,9 +83,9 @@
- static char	*IPF_FilenameFindTrackSide (char *FileName);
- static bool	IPF_Insert_RawStreamImage ( int Drive );
- 
--static void	IPF_CallBack_Trk ( struct CapsFdc *pc , CapsULong State );
--static void	IPF_CallBack_Irq ( struct CapsFdc *pc , CapsULong State );
--static void	IPF_CallBack_Drq ( struct CapsFdc *pc , CapsULong State );
-+static void	IPF_CallBack_Trk ( struct CapsFdc *pc , Uint32 State );
-+static void	IPF_CallBack_Irq ( struct CapsFdc *pc , Uint32 State );
-+static void	IPF_CallBack_Drq ( struct CapsFdc *pc , Uint32 State );
- static void	IPF_Drive_Update_Enable_Side ( void );
- static void	IPF_FDC_LogCommand ( Uint8 Command );
- #endif
-@@ -419,8 +419,8 @@
- 	return false;
- 
- #else
--	CapsLong	ImageId;
--	CapsLong	ImageType;
-+	Sint32		ImageId;
-+	Sint32		ImageType;
- 
- 	ImageId = CAPSAddImage();
- 	if ( ImageId < 0 )
-@@ -470,7 +470,7 @@
- 	ImageType = -1;
- #endif
- 
--	if ( CAPSLockImageMemory ( ImageId , pImageBuffer , (CapsULong)ImageSize , DI_LOCK_MEMREF ) == imgeOk )
-+	if ( CAPSLockImageMemory ( ImageId , pImageBuffer , (Uint32)ImageSize , DI_LOCK_MEMREF ) == imgeOk )
- 	{
- 		struct CapsImageInfo cii;
- 		int		i;
-@@ -703,7 +703,7 @@
-  * We need to update the track data by calling CAPSLockTrack
-  */
- #ifdef HAVE_CAPSIMAGE
--static void	IPF_CallBack_Trk ( struct CapsFdc *pc , CapsULong State )
-+static void	IPF_CallBack_Trk ( struct CapsFdc *pc , Uint32 State )
- {
- 	int	Drive = State;				/* State is the drive number in that case */
- 	struct CapsDrive *pd = pc->drive+Drive;		/* Current drive where the track change occurred */
-@@ -732,7 +732,7 @@
-  * Callback function used when the FDC change the IRQ signal
-  */
- #ifdef HAVE_CAPSIMAGE
--static void	IPF_CallBack_Irq ( struct CapsFdc *pc , CapsULong State )
-+static void	IPF_CallBack_Irq ( struct CapsFdc *pc , Uint32 State )
- {
- 	LOG_TRACE(TRACE_FDC, "fdc ipf callback irq state=0x%x VBL=%d HBL=%d\n" , (int)State , nVBLs , nHBL );
- 
-@@ -751,7 +751,7 @@
-  * -> copy the byte to/from the DMA's FIFO if it's a read or a write to the disk
-  */
- #ifdef HAVE_CAPSIMAGE
--static void	IPF_CallBack_Drq ( struct CapsFdc *pc , CapsULong State )
-+static void	IPF_CallBack_Drq ( struct CapsFdc *pc , Uint32 State )
- {
- 	Uint8	Byte;
- 
-diff -Nuar hatari-2.1.0-orig/src/uae-cpu/newcpu.c hatari-2.1.0/src/uae-cpu/newcpu.c
---- hatari-2.1.0-orig/src/uae-cpu/newcpu.c	2018-07-28 20:32:59.158780571 +0300
-+++ hatari-2.1.0/src/uae-cpu/newcpu.c	2018-07-28 20:33:16.132781607 +0300
-@@ -167,7 +167,7 @@
- 
- #ifdef HAVE_CAPSIMAGE
- #if CAPSIMAGE_VERSION == 5
--#include <caps5/CapsLibAll.h>
-+#include <CapsLibAll.h>
- #endif
- #endif
- 
diff --git a/games-emulation/hatari/files/hatari-2.2.1-default-rom.patch b/games-emulation/hatari/files/hatari-2.2.1-default-rom.patch
new file mode 100644
index 000000000000..c42f67f733c1
--- /dev/null
+++ b/games-emulation/hatari/files/hatari-2.2.1-default-rom.patch
@@ -0,0 +1,16 @@
+Use etos512k.img from the emutos package rather than tos.img.
+
+diff -Naur a/src/configuration.c b/src/configuration.c
+--- a/src/configuration.c	2019-02-08 08:30:11.000000000 +0000
++++ b/src/configuration.c	2019-11-10 21:19:31.712605716 +0000
+@@ -841,8 +841,8 @@
+ 	ConfigureParams.Sound.YmVolumeMixing = YM_TABLE_MIXING;
+ 
+ 	/* Set defaults for Rom */
+-	sprintf(ConfigureParams.Rom.szTosImageFileName, "%s%ctos.img",
+-	        Paths_GetDataDir(), PATHSEP);
++	sprintf(ConfigureParams.Rom.szTosImageFileName, "%s%c..%cemutos%cetos512k.img",
++	        Paths_GetDataDir(), PATHSEP, PATHSEP, PATHSEP);
+ 	ConfigureParams.Rom.bPatchTos = true;
+ 	strcpy(ConfigureParams.Rom.szCartridgeImageFileName, "");
+ 
diff --git a/games-emulation/hatari/files/hatari-2.2.1-joystick.patch b/games-emulation/hatari/files/hatari-2.2.1-joystick.patch
new file mode 100644
index 000000000000..193bb7206c31
--- /dev/null
+++ b/games-emulation/hatari/files/hatari-2.2.1-joystick.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/689538
+
+diff -ruN hatari-2.1.0.old/src/gui-sdl/sdlgui.c hatari-2.1.0/src/gui-sdl/sdlgui.c
+--- hatari-2.1.0.old/src/gui-sdl/sdlgui.c	2018-02-07 18:33:56.000000000 +0000
++++ hatari-2.1.0/src/gui-sdl/sdlgui.c	2019-07-08 23:55:50.481270799 +0100
+@@ -1329,12 +1329,28 @@
+ 				}
+ 				break;
+ 
++			 case SDL_JOYHATMOTION:
++				if (sdlEvent.jhat.value & SDL_HAT_LEFT)
++					retbutton = SDLGui_HandleShortcut(dlg, SG_SHORTCUT_LEFT);
++				else if (sdlEvent.jhat.value & SDL_HAT_RIGHT)
++					retbutton = SDLGui_HandleShortcut(dlg, SG_SHORTCUT_RIGHT);
++				if (sdlEvent.jhat.value & SDL_HAT_UP)
++				{
++					SDLGui_RemoveFocus(dlg, focused);
++					focused = SDLGui_FocusNext(dlg, focused, -1);
++				}
++				else if (sdlEvent.jhat.value & SDL_HAT_DOWN)
++				{
++					SDLGui_RemoveFocus(dlg, focused);
++					focused = SDLGui_FocusNext(dlg, focused, +1);
++				}
++				break;
++
+ 			 case SDL_JOYBUTTONDOWN:
+ 				retbutton = SDLGui_HandleSelection(dlg, focused, focused);
+ 				break;
+ 
+ 			 case SDL_JOYBALLMOTION:
+-			 case SDL_JOYHATMOTION:
+ 			 case SDL_MOUSEMOTION:
+ 				break;
+ 
+diff -ruN hatari-2.1.0.old/src/joy.c hatari-2.1.0/src/joy.c
+--- hatari-2.1.0.old/src/joy.c	2018-02-07 18:33:56.000000000 +0000
++++ hatari-2.1.0/src/joy.c	2019-07-09 14:46:36.502410790 +0100
+@@ -199,9 +199,20 @@
+  */
+ static bool Joy_ReadJoystick(int nSdlJoyID, JOYREADING *pJoyReading)
+ {
++	unsigned hat = SDL_JoystickGetHat(sdlJoystick[nSdlJoyID], 0);
++
+ 	/* Joystick is OK, read position from the configured joystick axis */
+ 	pJoyReading->XPos = SDL_JoystickGetAxis(sdlJoystick[nSdlJoyID], pJoyReading->XAxisID);
+ 	pJoyReading->YPos = SDL_JoystickGetAxis(sdlJoystick[nSdlJoyID], pJoyReading->YAxisID);
++	/* Similarly to other emulators that support hats, override axis readings with hats */
++	if (hat & SDL_HAT_LEFT)
++		pJoyReading->XPos = -32768;
++	if (hat & SDL_HAT_RIGHT)
++		pJoyReading->XPos = 32767;
++	if (hat & SDL_HAT_UP)
++		pJoyReading->YPos = -32768;
++	if (hat & SDL_HAT_DOWN)
++		pJoyReading->YPos = 32767;
+ 	/* Sets bit #0 if button #1 is pressed: */
+ 	pJoyReading->Buttons = SDL_JoystickGetButton(sdlJoystick[nSdlJoyID], 0);
+ 	/* Sets bit #1 if button #2 is pressed: */
diff --git a/games-emulation/hatari/hatari-2.1.0-r1.ebuild b/games-emulation/hatari/hatari-2.1.0-r1.ebuild
deleted file mode 100644
index 7bb3815e13af..000000000000
--- a/games-emulation/hatari/hatari-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="Atari ST emulator"
-HOMEPAGE="http://hatari.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sdl2"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/spsdeclib-5.1-r1
-	sdl2? ( media-libs/libsdl2[X,sound,video] )
-	!sdl2? ( media-libs/libsdl[X,sound,video] )
-	media-libs/portaudio
-	media-libs/portmidi
-	sys-libs/readline:0=
-	media-libs/libpng:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
-	>=games-emulation/emutos-0.9.9.1"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation,
-has been installed in /usr/lib*/hatari with a .img extension (there
-are several from which to choose).
-Another option is to go to http://www.atari.st/ and get a real TOS:
-http://www.atari.st/
-The first time you run hatari, you should configure it to find the
-TOS you prefer to use.  Be sure to save your settings.
-"
-
-PATCHES=( "${FILESDIR}/${P}_caps5_files.patch" )
-DOCS="readme.txt doc/*.txt"
-HTML_DOCS="doc/"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die
-	sed -i -e "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
-	sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		"-DDOCDIR=/usr/share/doc/${PF}"
-		"-DENABLE_SDL2=$(usex sdl2)"
-		"-DENABLE_CAPSIMAGE5=ON"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED%/}"/usr/share/hatari/{hatariui,hconsole}/
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-emulation/hatari/hatari-2.2.1.ebuild b/games-emulation/hatari/hatari-2.2.1.ebuild
new file mode 100644
index 000000000000..a8f84107c83e
--- /dev/null
+++ b/games-emulation/hatari/hatari-2.2.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit cmake-utils 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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	capsimage? ( >=dev-libs/spsdeclib-5.1-r1 )
+	microphone? ( media-libs/portaudio )
+	png? ( media-libs/libpng:0= )
+	portmidi? ( media-libs/portmidi )
+	readline? ( sys-libs/readline:0= )
+	sdl2? ( media-libs/libsdl2[sound,video,X] )
+	!sdl2? ( media-libs/libsdl[sound,video,X] )
+	udev? ( virtual/udev )
+	zlib? ( sys-libs/zlib )
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=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
+)
+
+DOCS=(
+	readme.txt
+	doc/{changelog,coding,scsi-driver,thanks,video-recording}.txt
+)
+
+src_prepare() {
+	xdg_environment_reset
+	cmake-utils_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
+
+	# Use emutos package rather than bundled ROM.
+	rm src/tos.img || die
+}
+
+src_configure() {
+	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_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)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED}"/usr/share/${PN}/
+}
diff --git a/games-emulation/hatari/metadata.xml b/games-emulation/hatari/metadata.xml
index d4511e749d48..f17253687ee3 100644
--- a/games-emulation/hatari/metadata.xml
+++ b/games-emulation/hatari/metadata.xml
@@ -6,6 +6,9 @@
 	<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>
 	<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
 </use>
 </pkgmetadata>