gentoo resync : 14.07.2018

12 files changed, 116 insertions, 227 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index f8222a5491a8..e802685c2e05 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index ee77c733c28d..41198106b068 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,5 +1,5 @@
 AUX dolphin-5.0-CHAR_WIDTH-collision.patch 2043 BLAKE2B d29f1f9ff360d79105d7020174bfc5063ad18c544d17056dca055174d8d0c837671f5d04f95de98e140d8634651f869e1a0d9e79b834f0f039ce59900c0696b0 SHA512 47c25a3fd5e6c47e34fe23d5faa71ea316c708fa2bbcbc5136a415fc25a0b207c4d18bfedb2d7c4e2a71394581d1e41fd7d4cca3544d34e3f4a6a84fee360314
 DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
-EBUILD dolphin-5.0.ebuild 4532 BLAKE2B 1938ea8a2833c7ea7193ba01957d2ebf9f362ce0ea7b37d908f0b7d12cc7a269ee46abb1c1d45024c56caa48a123dc1a206b4fc4c15d40e5f3c5a394ca8091ed SHA512 fd654aad5ae739a9381b07b6d3bab7e38ddc34b381de57f9685241c156760eb9d8241c52519171cf7dd8060749b36e4b628117a347a33be0da44028dcc3eb222
-EBUILD dolphin-9999.ebuild 4585 BLAKE2B 863f9e2639e4536e65d40563fda50efbe20afc497d249a3ec456d1e6f690cb98b59165889400fecc4fc5a8d1b76055a835a23b2807e477d52900612b5d97eefa SHA512 18860e2bf29b291fd6e50e8d97ab0a78931d40f11782e9b6f43273277f014932d9cf21b9815afe2eeb0e85cc5276f909956af1e8b8340563ba7bc53e8b10c30b
+EBUILD dolphin-5.0.ebuild 4538 BLAKE2B 2cdf537c696d52e637b644500fac6b5528f863104f9ffe8b8c30d9bcefd91a6309854ed744f8174766281266b3beac403ebeaa707749fbd03b1750990ec331c1 SHA512 8c3dff0ac08c394f05256b0736209425ec4e4a8d87299bd788e5b1df9ae01aafff61c6b4484b3f064b13d5fc0e999fc434aa162b2d70268d4293b6ab138c80ce
+EBUILD dolphin-9999.ebuild 4591 BLAKE2B ef1c50ccf6887336ba8aa86ff7e3e4a8c601d6ff15b54ee2ae9f0001dc5de1dae09a195bc224f8dbac51e261eb5f99dceb372ded1fe78ed81404231c49c6a77e SHA512 569cb7d38d0cc1900a52b0fec1fb1a82071d8923adf9bec703ffd6e935fbe471b9cd314babf2de2d569009d706367d4c93a198bb7e0fc187af3d822da5370635
 MISC metadata.xml 836 BLAKE2B 786a1a9f4e7d76c0111bd9755f784a0bba5607465e2693986c6e2f37e0a32f9ceea84c902464ea47b66f84c183660d5767f569ae933c6b8774d47a15de4c6f30 SHA512 7bdcb2ba2f3a1fa247080a08da495274bea1f61bec1a88e824ebd44fb7e21e74e7ef52855c1c6fba07f12b278df19c0014ba98a5b6ec50f62c08b0ee31e5fc6b
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild
index 56737af95d72..6110f03b0a04 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -22,11 +22,11 @@ IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch por
 RDEPEND="
 	>=media-libs/libsfml-2.1
 	>net-libs/enet-1.3.7
-	>=net-libs/mbedtls-2.1.1
+	>=net-libs/mbedtls-2.1.1:=
 	dev-libs/lzo
 	media-libs/libpng:0=
 	sys-libs/readline:0=
-	sys-libs/zlib
+	sys-libs/zlib:=
 	x11-libs/libXext
 	x11-libs/libXi
 	x11-libs/libXrandr
@@ -44,7 +44,7 @@ RDEPEND="
 		libav? ( media-video/libav:= )
 		!libav? ( media-video/ffmpeg:= )
 	)
-	llvm? ( sys-devel/llvm )
+	llvm? ( sys-devel/llvm:* )
 	openal? (
 		media-libs/openal
 		media-libs/libsoundtouch
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 1df45aa19853..78c1cdbac9d0 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -28,11 +28,11 @@ IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch por
 RDEPEND="
 	>=media-libs/libsfml-2.1
 	>net-libs/enet-1.3.7
-	>=net-libs/mbedtls-2.1.1
+	>=net-libs/mbedtls-2.1.1:=
 	dev-libs/lzo
 	media-libs/libpng:0=
 	sys-libs/readline:0=
-	sys-libs/zlib
+	sys-libs/zlib:=
 	x11-libs/libXext
 	x11-libs/libXi
 	x11-libs/libXrandr
@@ -50,7 +50,7 @@ RDEPEND="
 		libav? ( media-video/libav:= )
 		!libav? ( media-video/ffmpeg:= )
 	)
-	llvm? ( sys-devel/llvm )
+	llvm? ( sys-devel/llvm:* )
 	openal? (
 		media-libs/openal
 		media-libs/libsoundtouch
diff --git a/games-emulation/emutos/Manifest b/games-emulation/emutos/Manifest
index 9b9794dce74d..15b6ffc7ccef 100644
--- a/games-emulation/emutos/Manifest
+++ b/games-emulation/emutos/Manifest
@@ -1,5 +1,8 @@
 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
 MISC metadata.xml 329 BLAKE2B 3751df88821c56b414164dd686cc65be252f2968ecf92c93f2c6b3c6bd88a77bdc28a2fd33f4d08d2956e6e4d42c3304c0bc7a01226551850c44a438f1d2dd5e SHA512 5af91295f3ae78fb613b90a573aa870ac2e5e00623f305a00981637ac480320f2df7b16f35155e880344254521a0d08adf12ae92cffa15d4a3c3dab2aa8d661a
diff --git a/games-emulation/emutos/emutos-0.9.9.1.ebuild b/games-emulation/emutos/emutos-0.9.9.1.ebuild
new file mode 100644
index 000000000000..10bd4656d74a
--- /dev/null
+++ b/games-emulation/emutos/emutos-0.9.9.1.ebuild
@@ -0,0 +1,23 @@
+# 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 6c8229c4a34b..b004751ca1f6 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,5 +1,3 @@
-AUX hatari-1.8.0-gentoo-docdir.patch 583 BLAKE2B e7af3be7d340228970f255109f6e4b7c0cbbe7132c7c8d1162ca2f87acc923e7c0f9c810d0d1485ec5959e3b9fe46ba9e356d4bed2ccd6a2f3a1525a141b9035 SHA512 95ee37df0b0bca685c2e03f02bcbcced71eb8463c32356956b440cb53248accd970d63a77bbb072d2703201cc7d40de1d13bacab2e8c36370664f4d8e085ebb9
-AUX hatari-1.8.0-gentoo.patch 3174 BLAKE2B 7c2db291a8315c712e43dea6b9608edb0813bd466579b67f279d52de702aeb22de9825512f13a0023b4d49d3f432ea31a22a80455b89ec64312b7c86ace544e3 SHA512 d3b0240f657b219d7c770b8b64b0c904020036b71e4ebb7988b3f3f899010667cd4431db672b91f201ee16151ab1f278833e83c59decd9a4ce062930e8fda68e
-DIST hatari-1.8.0.tar.bz2 1985358 BLAKE2B 12fc000dd04c0f0dcead0b6713837a0d4c02df5ecdab9c2d4d2d91bd4cf6f8657acf2d97649a5704b646fae4fefe0626300e297b9e8698e7b8b72854d37b7097 SHA512 498a6636eef78e85a4715e9df169d928ce97c0548145a95b41aa3aae28817b8e843de1d1390893863be05e4e9981c89236571ab2eb9239faad23b711542e4fa0
-EBUILD hatari-1.8.0.ebuild 2427 BLAKE2B aaf6631792687d508cc00f03c94c876bfad511bc1f2f3e15adba7330665d7d420e995c4bcc21be131ddddcabc95921b0d889176f8bd67bf89659fc935aa19330 SHA512 f6241cbc74cb1293994d51a38e32fe945186ade50b006eadcabaafea740b0422dfc6a3d847ca4a4c2c286594b11ec29cdf017d4166bdbf4e5c9d65dda86ffd10
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+DIST hatari-2.1.0.tar.bz2 4072778 BLAKE2B 934ab28e799d0d13c26c291005513511367eb2ddbeda0f9756c19f10fa9e6bb8e10451057fa7e0b49a30e3f562eb5f327057d324b2a92e09b1115f63132dca97 SHA512 d1fbf6e60e2df2c43d070bee6a9c1dc93c36a8ea7f75bbf2a67790840952661cee136ebccd6b2ed523ef9b7b56391e058384f2e3f46acb609bb362cac05b9753
+EBUILD hatari-2.1.0.ebuild 1951 BLAKE2B 256870db02e0c0cb6402157af5dc1a108f9dba4b3dbb414a7fa7d0ab3692877dd9baf0462f6a044e027a5d92d313fa479cee7251da75c8a87ed38d140897462b SHA512 7d6b881dfe3d1fbffb800b5ae866699891ee3cdfdbc88dc9633a755b1361d003ef1617648b8b30d1c72b709dc700fb9db4e3b3a5abc030270598b0035cad90d3
+MISC metadata.xml 318 BLAKE2B be4d8512e3f8fe751fc03aeae422216c9a366fc4cea3a49e4b8050f2a8280054fcc335f820718743fdf49cdb9a1fb73633e596ac8bf989b22f0f5a5fa33bd93b SHA512 2e304611622c91d0bd54f986ac3f02fc504bbd28e5ce03e5b958100b8567012ea0fe2a46884d29dfa18c6a4408fd0283679eb4a4f62c80a40ad748f5c811d943
diff --git a/games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch b/games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch
deleted file mode 100644
index 715fb189143f..000000000000
--- a/games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- hatari-1.6.1/python-ui/uihelpers.py
-+++ hatari-1.6.1/python-ui/uihelpers.py
-@@ -97,9 +97,7 @@
-         # first try whether there are local Hatari docs in standard place
-         # for this Hatari/UI version
-         sep = os.sep
--        path = self.get_binary_path("hatari")
--        path = sep.join(path.split(sep)[:-2]) # remove "bin/hatari"
--        path = path + sep + "share" + sep + "doc" + sep + "hatari" + sep
-+        path = "@DOCDIR@"
-         if os.path.exists(path + "manual.html"):
-             return path
-         # if not, point to latest Hatari HG version docs
diff --git a/games-emulation/hatari/files/hatari-1.8.0-gentoo.patch b/games-emulation/hatari/files/hatari-1.8.0-gentoo.patch
deleted file mode 100644
index 4f10d6d9e3ce..000000000000
--- a/games-emulation/hatari/files/hatari-1.8.0-gentoo.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- hatari-1.4.0.orig/src/paths.c
-+++ hatari-1.4.0/src/paths.c
-@@ -109,71 +109,6 @@
- 	free(pTmpName);
- }
- 
--
--/**
-- * Locate the directory where the hatari executable resides
-- */
--static char *Paths_InitExecDir(const char *argv0)
--{
--	char *psExecDir;  /* Path string where the hatari executable can be found */
--
--	/* Allocate memory for storing the path string of the executable */
--	psExecDir = malloc(FILENAME_MAX);
--	if (!psExecDir)
--	{
--		fprintf(stderr, "Out of memory (Paths_Init)\n");
--		exit(-1);
--	}
--
--	/* Determine the bindir...
--	 * Start with empty string, then try to use OS specific functions,
--	 * and finally analyze the PATH variable if it has not been found yet. */
--	psExecDir[0] = '\0';
--
--#if defined(__linux__)
--	{
--		int i;
--		/* On Linux, we can analyze the symlink /proc/self/exe */
--		i = readlink("/proc/self/exe", psExecDir, FILENAME_MAX);
--		if (i > 0)
--		{
--			char *p;
--			psExecDir[i] = '\0';
--			p = strrchr(psExecDir, '/');    /* Search last slash */
--			if (p)
--				*p = 0;                     /* Strip file name from path */
--		}
--	}
--//#elif defined(WIN32) || defined(__CEGCC__)
--//	/* On Windows we can use GetModuleFileName for getting the exe path */
--//	GetModuleFileName(NULL, psExecDir, FILENAME_MAX);
--#endif
--
--	/* If we do not have the execdir yet, analyze argv[0] and the PATH: */
--	if (psExecDir[0] == 0)
--	{
--		if (strchr(argv0, PATHSEP) == 0)
--		{
--			/* No separator in argv[0], we have to explore PATH... */
--			Paths_GetExecDirFromPATH(argv0, psExecDir, FILENAME_MAX);
--		}
--		else
--		{
--			/* There was a path separator in argv[0], so let's assume a
--			 * relative or absolute path to the current directory in argv[0] */
--			char *p;
--			strncpy(psExecDir, argv0, FILENAME_MAX);
--			psExecDir[FILENAME_MAX-1] = 0;
--			p = strrchr(psExecDir, PATHSEP);  /* Search last slash */
--			if (p)
--				*p = 0;                       /* Strip file name from path */
--		}
--	}
--
--	return psExecDir;
--}
--
--
- /**
-  * Initialize the users home directory string
-  * and Hatari's home directory (~/.hatari)
-@@ -226,8 +161,6 @@
-  */
- void Paths_Init(const char *argv0)
- {
--	char *psExecDir;  /* Path string where the hatari executable can be found */
--
- 	/* Init working directory string */
- 	if (getcwd(sWorkingDir, FILENAME_MAX) == NULL)
- 	{
-@@ -238,27 +171,11 @@
- 	/* Init the user's home directory string */
- 	Paths_InitHomeDirs();
- 
--	/* Get the directory where the executable resides */
--	psExecDir = Paths_InitExecDir(argv0);
--
--	/* Now create the datadir path name from the bindir path name: */
--	if (psExecDir && strlen(psExecDir) > 0)
--	{
--		snprintf(sDataDir, sizeof(sDataDir), "%s%c%s",
--		         psExecDir, PATHSEP, BIN2DATADIR);
--	}
--	else
--	{
--		/* bindir could not be determined, let's assume datadir is relative
--		 * to current working directory... */
--		strcpy(sDataDir, BIN2DATADIR);
--	}
-+	strcpy(sDataDir, BIN2DATADIR);
- 
- 	/* And finally make a proper absolute path out of datadir: */
- 	File_MakeAbsoluteName(sDataDir);
- 
--	free(psExecDir);
--
- 	/* fprintf(stderr, " WorkingDir = %s\n DataDir = %s\n UserHomeDir = %s\n HatariHomeDir = %s\n",
- 	        sWorkingDir, sDataDir, sUserHomeDir, sHatariHomeDir); */
- }
diff --git a/games-emulation/hatari/hatari-1.8.0.ebuild b/games-emulation/hatari/hatari-1.8.0.ebuild
deleted file mode 100644
index 0ec9601e1835..000000000000
--- a/games-emulation/hatari/hatari-1.8.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils toolchain-funcs cmake-utils python-single-r1 games
-
-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=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-libs/libsdl[X,sound,video]
-	sys-libs/readline:0
-	media-libs/libpng:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	games-emulation/emutos"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-gentoo-docdir.patch
-)
-
-pkg_setup() {
-	games_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# build with newer zlib (bug #387829)
-	sed -i -e '1i#define OF(x) x' src/includes/unzip.h || die
-	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%conf=.*$%conf=\"${GAMES_SYSCONFDIR}\"%" \
-		-e "s%path=.*$%path=\"${GAMES_DATADIR}/${PN}/hatariui\"%" \
-		python-ui/hatariui || die
-	sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die
-	rm -f doc/CMakeLists.txt
-}
-
-src_configure() {
-	mycmakeargs=(
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		"-DCMAKE_BUILD_TYPE:STRING=Release"
-		"-DDATADIR=${GAMES_DATADIR}/${PN}"
-		"-DBIN2DATADIR=${GAMES_DATADIR}/${PN}"
-		"-DBINDIR=${GAMES_BINDIR}"
-		"-DICONDIR=/usr/share/pixmaps"
-		"-DDESKTOPDIR=/usr/share/applications"
-		"-DMANDIR=/usr/share/man/man1"
-		"-DDOCDIR=/usr/share/doc/${PF}"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	DOCS="readme.txt doc/*.txt" cmake-utils_src_install
-	dohtml -r doc/
-	python_fix_shebang "${ED%/}"/usr/share/games/hatari/{hatariui,hconsole}/
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation,"
-	elog "has been installed in $(games_get_libdir) with a .img extension (there"
-	elog "are several from which to choose)."
-	elog
-	elog "Another option is to go to http://www.atari.st/ and get a real TOS:"
-	elog "  http://www.atari.st/"
-	elog
-	elog "The first time you run hatari, you should configure it to find the"
-	elog "TOS you prefer to use.  Be sure to save your settings."
-	echo
-}
diff --git a/games-emulation/hatari/hatari-2.1.0.ebuild b/games-emulation/hatari/hatari-2.1.0.ebuild
new file mode 100644
index 000000000000..92eba857519e
--- /dev/null
+++ b/games-emulation/hatari/hatari-2.1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit toolchain-funcs cmake-utils python-single-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}
+	games-emulation/caps
+	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.
+"
+
+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)"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED%/}"/usr/share/hatari/{hatariui,hconsole}/
+}
+
+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/metadata.xml b/games-emulation/hatari/metadata.xml
index 78274e0fa550..d4511e749d48 100644
--- a/games-emulation/hatari/metadata.xml
+++ b/games-emulation/hatari/metadata.xml
@@ -5,4 +5,7 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
+<use>
+	<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
+</use>
 </pkgmetadata>