gentoo resync : 14.07.2018

67 files changed, 574 insertions, 495 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 73c33afd3e3f..53bbeeebfef3 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/chessx/Manifest b/games-board/chessx/Manifest
index b27bc4be6ef3..0bf9dd4cd84d 100644
--- a/games-board/chessx/Manifest
+++ b/games-board/chessx/Manifest
@@ -1,4 +1,5 @@
-AUX chessx-1.4.0-zlib.patch 1033 BLAKE2B 8869c2097f94f02ed6b821edbbaff055e76c9c9e9fb535cbdeaf0e22dddf6103e596ec3df96143d240d9364face53f116ecead564de74c9a3e5e3430fb61fdd0 SHA512 f1b0e4f388665740cb714286e8bbd885308f37629eaaf36f3572bcdd912b3d28417eb6859d9ed44687b87d6589396c9e72069e7c22b95adaa5e9410e8e821d68
-DIST chessx-1.4.0.tgz 4128967 BLAKE2B 651a83a280ac2766da8f265c59d7f9014d0a7e6988d0ab981e2d9b962ce8ed8e878322d4bca536c156bf4b145e19c661fb68bb8bd7bda7872bc6ac95dc2736e4 SHA512 24e3fc60cdddb8a0136f96d6aa07d92e443264ade513be88a8c2eeb2717e04739a9b5963a3536a77aa499a1288c6cd9b8dddb312aae3087979d740f8528ec855
-EBUILD chessx-1.4.0-r1.ebuild 793 BLAKE2B 78562a5e3414bd1e792bdb8a9cbe0ec054fa09589562770c070f28cfecd14033ca20e22bacedda239bcda1eae19375d8baa1cf1660dc17b508fb196ce656a84f SHA512 4bffcd408a244c5336384a11699f88a72be7f05edd933ddc02046fd6f88c17f551443b8341406313ccea94be2b52337432dac2d3a92fb3feef05940fbf1f5314
+AUX chessx-1.4.0-zlib.patch 883 BLAKE2B c03baa883587aac6f8abd6453f011387c772217aad235717b64d31eb97e828c9b7d868c72046c9148850c59b4d1d540b106ceb9f826b451e464c61bb44bba6d9 SHA512 326efb6ab3cca94849a1a89b2c51a18f2a6cb51d38cc11fd59e8d443034350851ffaf28412ba57a53a961900eaee4661b0035d8e7cbab2a1e99ea67eb4e2f2cf
+AUX chessx-1.4.6-qt-5.11.patch 1466 BLAKE2B b8b6fbe49be0f361fd0b19f53b55d75354813e65e286d0b031680f769c284d15d930b3fd5aeffefdae3e406ad4971742d378e04c38f7f249200fbe947a29520e SHA512 eeddea13a179b51f618f68a0505cdae6e3c0614f2c24ab01942df7b7f260e146cdbb1c7dae1efc8dbc9a70aebf11d664a9a9d5c3a0562267c8b9633a05702a1a
+DIST chessx-1.4.6.tgz 4223076 BLAKE2B 783ffe0a7396239066870dedcaa4b2b0c491db4f16871afe66bae7a82339916a8a574401499916fc63cf62478efb9b89c30ec85a7aa7c6d002d1119f1a6b23ef SHA512 cfa74e6423e1a2f9bca319e20645ddf8c8df6b46b64493777ca1cc93037e3f7cfc200f99a29236f7c5925448676c312abf34d395e795e7db6ef8a0832c3a523e
+EBUILD chessx-1.4.6.ebuild 927 BLAKE2B 3d1c8b359efe44451de7200c7b3ef77ec73a334839b3e412681598c6ca082a71cdea3af70c436aad92e84b54bb7d59c435594961486006f104ab79137e5fdcd2 SHA512 c5fbe061d17e9ea7956931262d68560f376c8a1df887b4d9f4e0022815510c9a2cbb14b297d63382aed9de58f840cbfeaca7121de873e454eece139d91594b42
 MISC metadata.xml 329 BLAKE2B 199a6f1de51ae4a4a1104bbd4419200e7440abafe3fc5dfe40eafc08c00449461c71131cfdf1d60a0b8375f575290bbdd0af6355ae10a9259c38728e3065e6cf SHA512 41215eff9af3f31175db0f20dd13574378e4124dda8a1670440897391a5b66423c953471d6e22984dbfb3e0abef8ea3d56fa3690b45c189fae2a3c26560ec1a8
diff --git a/games-board/chessx/chessx-1.4.0-r1.ebuild b/games-board/chessx/chessx-1.4.6.ebuild
index aef4137aa945..87b4a82b974f 100644
--- a/games-board/chessx/chessx-1.4.0-r1.ebuild
+++ b/games-board/chessx/chessx-1.4.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils qmake-utils
+EAPI=7
+
+inherit desktop qmake-utils
 
 DESCRIPTION="Qt5-based Chess Database Utility"
 HOMEPAGE="http://chessx.sourceforge.net/"
@@ -14,6 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
@@ -21,14 +23,20 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	sys-libs/zlib"
+	sys-libs/zlib:="
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-zlib.patch
+	"${FILESDIR}"/${PN}-1.4.0-zlib.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
 )
 
+src_prepare() {
+	default
+	"$(qt5_get_bindir)/lrelease" i18n/* || die
+}
+
 src_configure() {
 	eqmake5
 }
diff --git a/games-board/chessx/files/chessx-1.4.0-zlib.patch b/games-board/chessx/files/chessx-1.4.0-zlib.patch
index 36d685d9cba9..fe6bfb39d508 100644
--- a/games-board/chessx/files/chessx-1.4.0-zlib.patch
+++ b/games-board/chessx/files/chessx-1.4.0-zlib.patch
@@ -1,33 +1,33 @@
---- chessx-1.2.2/src/quazip/ioapi.h
-+++ chessx-1.2.2-patched/src/quazip/ioapi.h
+--- a/src/quazip/ioapi.h
++++ b/src/quazip/ioapi.h
 @@ -1,3 +1,4 @@
 +#define OF(x) x
  /* ioapi.h -- IO base function header for compress/uncompress .zip
     files using zlib + zip or unzip API
  
---- chessx-1.2.2/src/quazip/unzip.c
-+++ chessx-1.2.2-patched/src/quazip/unzip.c
+--- a/src/quazip/unzip.c
++++ b/src/quazip/unzip.c
 @@ -1,3 +1,4 @@
 +#define OF(x) x
  /* unzip.c -- IO for uncompress .zip files using zlib
     Version 1.01e, February 12th, 2005
  
---- chessx-1.2.2/src/quazip/unzip.h
-+++ chessx-1.2.2-patched/src/quazip/unzip.h
+--- a/src/quazip/unzip.h
++++ b/src/quazip/unzip.h
 @@ -1,3 +1,4 @@
 +#define OF(x) x
  /* unzip.h -- IO for uncompress .zip files using zlib
     Version 1.01e, February 12th, 2005
  
---- chessx-1.2.2/src/quazip/zip.c
-+++ chessx-1.2.2-patched/src/quazip/zip.c
+--- a/src/quazip/zip.c
++++ b/src/quazip/zip.c
 @@ -1,3 +1,4 @@
 +#define OF(x) x
  /* zip.c -- IO on .zip files using zlib
     Version 1.01e, February 12th, 2005
  
---- chessx-1.2.2/src/quazip/zip.h
-+++ chessx-1.2.2-patched/src/quazip/zip.h
+--- a/src/quazip/zip.h
++++ b/src/quazip/zip.h
 @@ -1,3 +1,4 @@
 +#define OF(x) x
  /* zip.h -- IO for compress .zip files using zlib
diff --git a/games-board/chessx/files/chessx-1.4.6-qt-5.11.patch b/games-board/chessx/files/chessx-1.4.6-qt-5.11.patch
new file mode 100644
index 000000000000..379de8836b94
--- /dev/null
+++ b/games-board/chessx/files/chessx-1.4.6-qt-5.11.patch
@@ -0,0 +1,44 @@
+From: Luigi Baldoni <aloisio@gmx.com>
+Date: 2018-06-18 13:16:31 +0200
+Subject: Add missing include statements
+References: https://sourceforge.net/p/chessx/bugs/254
+Upstream: submitted
+
+A few explicit include statements are required with Qt 5.11
+---
+Index: chessx-1.4.6/src/gui/gamewindow.cpp
+===================================================================
+--- chessx-1.4.6.orig/src/gui/gamewindow.cpp
++++ chessx-1.4.6/src/gui/gamewindow.cpp
+@@ -9,6 +9,7 @@
+ #include "settings.h"
+ 
+ #include <QToolButton>
++#include <QAction>
+ 
+ #if defined(_MSC_VER) && defined(_DEBUG)
+ #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
+Index: chessx-1.4.6/src/dialogs/savedialog.cpp
+===================================================================
+--- chessx-1.4.6.orig/src/dialogs/savedialog.cpp
++++ chessx-1.4.6/src/dialogs/savedialog.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <QLineEdit>
+ #include <QCompleter>
++#include <QButtonGroup>
+ 
+ #if defined(_MSC_VER) && defined(_DEBUG)
+ #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
+Index: chessx-1.4.6/src/dialogs/preferences.cpp
+===================================================================
+--- chessx-1.4.6.orig/src/dialogs/preferences.cpp
++++ chessx-1.4.6/src/dialogs/preferences.cpp
+@@ -33,6 +33,7 @@
+ #include <QFileDialog>
+ #include <QDesktopServices>
+ #include <QTextStream>
++#include <QAction>
+ 
+ #if defined(_MSC_VER) && defined(_DEBUG)
+ #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
diff --git a/games-board/peg-e/Manifest b/games-board/peg-e/Manifest
index 8ac80d21feac..98ea89d1a4a1 100644
--- a/games-board/peg-e/Manifest
+++ b/games-board/peg-e/Manifest
@@ -1,3 +1,4 @@
-DIST peg-e-1.2.3-src.tar.bz2 466872 BLAKE2B bcff7b31bc2281b24b6c54466aa14e6d200b14f9204437a66a84d180607e9e108be893e4da7dd722d17c1ea7490bac34fae08ddf2dcd89f696439d026e831e96 SHA512 775bab9512ec33ef31a1fb549af365ec3ae0e8d9533c2e05f438d3affa68e10786e043925bcdec67ebdb027559773582687dbdc625d3dca307c3aadde01686dd
-EBUILD peg-e-1.2.3.ebuild 749 BLAKE2B 60d9120862d8de5a6cc6412bde0fdbb1f41542d319c5139061f43398ef1606d809bdf8c927de4f5e2dba22d23d1dbc63761f9713f3264f137420fca279fae47e SHA512 5cb855dd92e9a0228ffe4dad7e4ccdd4258bca2e7fd121fd605d2a8ddd42cf898b700fd1ac4c7b47b4950a3fb6f207941aad00c7895e8502363f8eba25413eb0
+AUX peg-e-1.2.5-gentoo.patch 253 BLAKE2B e9bb860a02f87bc255b2161e3a98c860cde367fede9d5b9bc8bef52d4934cb959fbccb50fe4a79687670fb9a264ea038a37d67c14b2f60c51a59b4818c1ee602 SHA512 8c5952603a748ba7e156451c2d0338a6dd8b89d7f8485f4360b8d353993cfd7e6c03c7b9976c649059c788f80cc4a48441ff628b342e791ba833f2c700af505a
+DIST peg-e-1.2.5-src.tar.bz2 598322 BLAKE2B f717d3e378fe69e087631abd8f0cbe3cc3bf2479ab86a608c256100778bc94baa40752463a4cb511c4ffd431ce38333318803a1dc289be4bd7d3aad595cd76d1 SHA512 cfd15e2c8cba678d64c9289ab2aa3803af48aebb3e4e545439c247d622dd914dac0735a0fd786cdba1678b448c22a9e40f48a9a1db6391fa6532e3d918c0ca10
+EBUILD peg-e-1.2.5.ebuild 688 BLAKE2B ff8b8fc6a40e90aa69d2dc7513ca2e8b662f072d22bdff72a19591a16668912e186eed8239fae5e19d1271e034ffd63e8d4939adfc52b8819c7bcf2562b965d5 SHA512 c6c27f4aea964f185e2e49f1acbcf2533ea748ad0cde2800ec68c6cde83940d89a8488000e3313f6965c018af1c9d7db632926db0d11ad31e32226935a956402
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/peg-e/files/peg-e-1.2.5-gentoo.patch b/games-board/peg-e/files/peg-e-1.2.5-gentoo.patch
new file mode 100644
index 000000000000..e6430001cf35
--- /dev/null
+++ b/games-board/peg-e/files/peg-e-1.2.5-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/peg-e.pro	2018-05-29 13:01:32.000000000 +0200
++++ b/peg-e.pro	2018-07-11 20:15:46.151082792 +0200
+@@ -75,7 +75,7 @@
+ 	RESOURCES = icons/icon.qrc
+ 
+ 	isEmpty(PREFIX) {
+-		PREFIX = /usr/local
++		PREFIX = /usr
+ 	}
+ 	isEmpty(BINDIR) {
+ 		BINDIR = bin
diff --git a/games-board/peg-e/peg-e-1.2.3.ebuild b/games-board/peg-e/peg-e-1.2.5.ebuild
index adc3c90c22df..e53cb97a9303 100644
--- a/games-board/peg-e/peg-e-1.2.3.ebuild
+++ b/games-board/peg-e/peg-e-1.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils gnome2-utils qmake-utils
+inherit desktop gnome2-utils qmake-utils
 
 DESCRIPTION="A peg solitaire game"
 HOMEPAGE="https://gottcode.org/peg-e/"
@@ -23,19 +23,15 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 src_configure() {
 	eqmake5
 }
 
 src_install() {
-	dobin ${PN}
-	doicon -s 48 icons/hicolor/48x48/apps/${PN}.png
-	domenu icons/${PN}.desktop
-	dodoc CREDITS ChangeLog
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/games-board/simsu/Manifest b/games-board/simsu/Manifest
index 7a9b7f23911a..013b363497db 100644
--- a/games-board/simsu/Manifest
+++ b/games-board/simsu/Manifest
@@ -1,3 +1,3 @@
-DIST simsu-1.3.4-src.tar.bz2 465505 BLAKE2B ef958ab943acd0e012cd2b5e794662ca70e2e5a5f5f4dc3744960af6abe5ae429a39f6d76b8ffd28f71e996a589139dd490ffd03501be47d414784a022ce6940 SHA512 64a8337c522614c2a87f43daf5c0c95af42c623789df3d851c3d2aae06dc6ffccaa14361458de7410c939e4b60fa930af9883de5b7b25f2cea8092075fd80605
-EBUILD simsu-1.3.4.ebuild 764 BLAKE2B 4564efd4a6d6519ec1875b03ca96c55c59d47fc28319318fdbbf94e587821c70eabbf2ee5f147c3259ed9fff3c103671ed562ecfc0893da6d5a417827594426b SHA512 f6881a3c818fe9507a71d7c23c2329bd725bb75630eb8d8e8d02115f09b2758c28e2886e6cf1be809c8c0408260892f03664585753cea486d1092ba2d68c783c
+DIST simsu-1.3.6-src.tar.bz2 597982 BLAKE2B acf13fe4e3e228cecc76a16352a4df06f14cf58307008f5679b63f1209b4cf191b28544ed3b002375afdf0de8cd92ce179f3cb367f9a5201099da99a806d60c5 SHA512 04e60ccab8345002078b7dbd253bc2a9701f9b8edbbdd9a01ac3ddffd9a5f3ccd32399216b9e497b309b6718646db11a55717e5bd201bfd2aaa80ad9b171cb94
+EBUILD simsu-1.3.6.ebuild 764 BLAKE2B 4564efd4a6d6519ec1875b03ca96c55c59d47fc28319318fdbbf94e587821c70eabbf2ee5f147c3259ed9fff3c103671ed562ecfc0893da6d5a417827594426b SHA512 f6881a3c818fe9507a71d7c23c2329bd725bb75630eb8d8e8d02115f09b2758c28e2886e6cf1be809c8c0408260892f03664585753cea486d1092ba2d68c783c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/simsu/simsu-1.3.4.ebuild b/games-board/simsu/simsu-1.3.6.ebuild
index 75b793631b42..75b793631b42 100644
--- a/games-board/simsu/simsu-1.3.4.ebuild
+++ b/games-board/simsu/simsu-1.3.6.ebuild
diff --git a/games-board/tetzle/Manifest b/games-board/tetzle/Manifest
index 44c5c37ff821..e14f4d60b874 100644
--- a/games-board/tetzle/Manifest
+++ b/games-board/tetzle/Manifest
@@ -1,3 +1,4 @@
-DIST tetzle-2.1.1-src.tar.bz2 1246920 BLAKE2B dab8128b70fd6650da190b27f356b1db9d763b65b9192cb19140d81b5ae6aed8eadef19d5c5e36a9d223e5a9dee81c8c90b604a822df7dce725b4c98fbe139b0 SHA512 80022556ccadc19f0b4357b0f629b340cb040fdff927dccd540fba5383ae4638fcca020be020c78a3809d0ca70fae7d7f19342f3e2a162f53f5e5e3b83ddf11d
-EBUILD tetzle-2.1.1.ebuild 702 BLAKE2B 58b3a728c9f415b0260c0c1f45cea3b3dc84366fb1f4659ec7ab90461585397032fc409fa434ee3abecbb00b224497d68498a51b77a3f3f1953041ecdf73e090 SHA512 c8f3ef15c4c76482816aab9968670bede057b60da40a4dab662aa79b256f59bd875a5ec5f464bd11642b61fc845b06488c849af9de87654abc09807f436f4ff2
+AUX tetzle-2.1.3-gentoo.patch 267 BLAKE2B 7432663ff3ae333e4dcef46193da107436a30395f236e2aebe11c5b3c0efe2264303f50c6eabc92167b5ba36a2e8d64d9cd27e78dc1a3aa3ddebbb29d8d567f3 SHA512 92e4a48b88df690f75890cb969863006b6b7cb1476970d87c0fa7ae59bc5aaa591004e6e962bdf7d84bb1e9668eeed0bc7131269247d79e613b7cb252bbf194c
+DIST tetzle-2.1.3-src.tar.bz2 1022680 BLAKE2B 197e2a221a779734d3cd76d5600460df42014a31a032fca2f5c181d54c004f56e6beb9803c60fd53edf5b0d4a614b3d0709fd8913d561e49a938a2f6f1943001 SHA512 6f4541ad2f67ac8a98bd0e1683d4cb6131a85a4e9d31a9dae0a97177a721038750f4276fb3a592b97804daceb1b99f0117e14c6221a6a6ce74b852b00ed5c607
+EBUILD tetzle-2.1.3.ebuild 861 BLAKE2B 34d273e9f48fd29d2c97a91e05c23231f6e794e1e1d19be2451e0ccb9997a1cf1b87027eb75c2f708dc7ef5bde027450518e8a52325f24d3507d784d52b79950 SHA512 9d3de221ff94c0f8f85920734f70b288b622d11977f890be57700805a417d85911e7b36d63b0d56f07e433046d24b64261189f1e30ed332b170ac1d6f94e8e37
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/tetzle/files/tetzle-2.1.3-gentoo.patch b/games-board/tetzle/files/tetzle-2.1.3-gentoo.patch
new file mode 100644
index 000000000000..f7d76c1276bc
--- /dev/null
+++ b/games-board/tetzle/files/tetzle-2.1.3-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/tetzle.pro	2018-05-29 13:20:06.000000000 +0200
++++ b/tetzle.pro	2018-07-11 20:24:01.076668458 +0200
+@@ -104,7 +104,7 @@
+ 	RC_FILE = icons/icon.rc
+ } else:unix {
+ 	isEmpty(PREFIX) {
+-		PREFIX = /usr/local
++		PREFIX = /usr
+ 	}
+ 	isEmpty(BINDIR) {
+ 		BINDIR = bin
diff --git a/games-board/tetzle/tetzle-2.1.1.ebuild b/games-board/tetzle/tetzle-2.1.3.ebuild
index de1e76ffa68a..bc3518d35a8f 100644
--- a/games-board/tetzle/tetzle-2.1.1.ebuild
+++ b/games-board/tetzle/tetzle-2.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils qmake-utils
+inherit gnome2-utils qmake-utils xdg-utils
 
 DESCRIPTION="A jigsaw puzzle game that uses tetrominoes for the pieces"
 HOMEPAGE="https://gottcode.org/tetzle/"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
-DOCS=( ChangeLog CREDITS )
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
 	eqmake5
@@ -31,12 +31,17 @@ src_configure() {
 
 src_install(){
 	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+	einstalldocs
 }
 
 pkg_postinst() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
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>
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 6fda6fe7963d..9e9b81a2bf02 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest
index 767b0f668257..55569314e770 100644
--- a/games-engines/exult/Manifest
+++ b/games-engines/exult/Manifest
@@ -1,2 +1,2 @@
-EBUILD exult-9999.ebuild 1167 BLAKE2B 5d5ed418167d01d9456957bf87b3e7e54f4a565477b58c502c90ce92a3624f43ddba6af4a5cce484cf2432ba6c8f1eabaeed9c06c04daf60cba78cccd0307f5d SHA512 04cc291b2ffbb30abe155e529d375ed2447b8e2b714e9d1792169c6d486f47eece512c22d5ac03d5c70bc557fd68c6acf5715e54718df0ae04cb2e90f380ff78
-MISC metadata.xml 328 BLAKE2B b895ccfad252cbbeb8fe092b4416086fd43420976392111a9ee7b0f714ee22e32d64b651f7e2370466b32c840b1eb0de8702a6714b9718e6bc90fa4524b84ed0 SHA512 bf9ebdd6a99230e6cb155d0dc42b0d94aa1d15b64afc93420210b6763a46a4c8ab3f18cbc83e54068dc7c62df73baf28ee3cbc13a34c7824a724041ac13be16e
+EBUILD exult-9999.ebuild 1287 BLAKE2B 6185596314e1d416197f6b9416ab9c217bbcfdbdc131e3f7d9b771ee2dc7c2c79f6ff5b0ab232def81fa78e412ec085b1f0f74b577d4cd05e6ba64e64988c6d8 SHA512 a6716dbb375f4153bf109e7e8742e93b4802213040d288726b092087e487332140c5c7a273da4d52bc452fe80e7d9b1f31b55982921fd824d4311809c224c608
+MISC metadata.xml 451 BLAKE2B 60126c876c87417af2a8f3b28e30dd3a16ec6afb9bc3119a82de8846364c056091e754f35ba7db90acd2ab29a041463e4a0aae098e527d334ae7aaa72dfb362d SHA512 5ac44e7312b3dca5e663a98d0c67e2f8ee82df786121e21c1b1fbef541b2a83197f622048d8d977e61fe4e4dda43ea6c9b61f8cd1d9b78dbf9beb90ede8e77f2
diff --git a/games-engines/exult/exult-9999.ebuild b/games-engines/exult/exult-9999.ebuild
index 4efc34a2e5dd..3463a5baa5aa 100644
--- a/games-engines/exult/exult-9999.ebuild
+++ b/games-engines/exult/exult-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,18 +11,18 @@ EGIT_REPO_URI="https://github.com/exult/exult"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="timidity zlib"
+IUSE="+sdl2 timidity zlib"
 
 DEPEND="
 	>=media-libs/libpng-1.2.43-r2:0
 	games-misc/exult-sound
-	media-libs/libsdl[sound,video,X]
+	media-libs/libvorbis
+	sdl2? ( media-libs/libsdl2[sound,video,X] )
+	!sdl2? ( media-libs/libsdl[sound,video,X] )
 	timidity? ( >=media-sound/timidity++-2 )
 	zlib? ( sys-libs/zlib )
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P/_/}
 DOCS=(
@@ -42,6 +42,7 @@ src_configure() {
 		--enable-mods \
 		--with-desktopdir=/usr/share/applications \
 		--with-icondir=/usr/share/pixmaps \
+		--with-sdl=$(usex sdl2 sdl2 sdl12) \
 		$(use_enable timidity timidity-midi) \
 		$(use_enable zlib zip-support)
 }
diff --git a/games-engines/exult/metadata.xml b/games-engines/exult/metadata.xml
index c1a873a06ee8..a676c5e60d97 100644
--- a/games-engines/exult/metadata.xml
+++ b/games-engines/exult/metadata.xml
@@ -7,5 +7,9 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">exult</remote-id>
+		<remote-id type="github">exult/exult</remote-id>
 	</upstream>
+	<use>
+		<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-engines/gargoyle/Manifest b/games-engines/gargoyle/Manifest
index 5d8521d34e2c..44fcb1627a6a 100644
--- a/games-engines/gargoyle/Manifest
+++ b/games-engines/gargoyle/Manifest
@@ -1,4 +1,4 @@
 AUX gargoyle-2011.1-desktopfile.patch 1265 BLAKE2B 1fcbc1eded032ef11ef357e03c614067b18c21a268b4a3bebe4516a0ed196660292b311c9769d66853ffbbf2535808d014991bd42155919b913965223a4523dc SHA512 ed31bc711b52b5d231f130956d7d07cb9080747e6d53c85b379aa413582f8e4ffe825298bc86180ec7d1eadff5e6bffc6e49b3ff7a2607f612dcf81a6c1af22e
 DIST gargoyle-2011.1-sources.zip 11291660 BLAKE2B aac47c41bd02e772c4717dfdeae8678105f72704641ea3df39105d412afe61734cc43f863b9556e38ea34287259df9f4d72ae93b3092d0372434b9f59f99483d SHA512 65159580cf3494944f841c44320135580557258e37ad5523ae3ea30555c19834a2793231a8e42c217e5c1d055d50ed6a20d372d6302e880a2818bc4ea59b226f
-EBUILD gargoyle-2011.1.ebuild 3217 BLAKE2B f2d74fefa87a5e0aeb6fdea0816e591a3b23e75b455051d161a600cdfe198a502c2e0c2c95537c403e531b38848b2999479414062557ea4e7d84326d18ebab6a SHA512 62a23b3df92c9db95824d1344796a5cac16fc3d1ebd7358066b38a7c02487fdfdb7589cf17331ffc38e73d7732233e7d9ece0224138087dffc1481fca9cbbf0d
+EBUILD gargoyle-2011.1-r1.ebuild 3017 BLAKE2B 12371e41ca78403ba1452da2a2c5dbac287912b8dbcd7afe524984b8442bb4cf5701f3073f27a64c5adadccfebfaaef9e543b883026b4eae4b185cc151eac6b7 SHA512 0daa2b0ef761c935d0e7d47fd42060ebf5db4331634bba8e1812a619d8fb31cdb0f2aec197cf7d30e1bff357ccd60888ac5107c7e9644f8ddeed9520a9b1ac9e
 MISC metadata.xml 329 BLAKE2B cc77f8750b5385687d311159b8edbf296284013812d4be5fe0076468c02758dcac19c77b5e6f38c4fbdac51f1c69b34cfd39d5d19235d18ec80076ceba98e2b3 SHA512 f6b913db889e2434a76d61526ff2cf3f719322991bb26891ac0383fcb8f11cf69cfc895a7cddd35074c2dee9a5ceac0fd8c0172542401d302ec39e9cac180b2c
diff --git a/games-engines/gargoyle/gargoyle-2011.1.ebuild b/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
index 640adac5fa7e..82e11b237828 100644
--- a/games-engines/gargoyle/gargoyle-2011.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
@@ -8,8 +8,8 @@
 # Since we don't compile or install any of the bundled fonts, their licenses
 # don't apply. (Fonts are installed through dependencies instead.)
 
-EAPI=5
-inherit eutils flag-o-matic multiprocessing toolchain-funcs gnome2-utils games
+EAPI=6
+inherit eutils flag-o-matic gnome2-utils multilib multiprocessing toolchain-funcs
 
 DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
 HOMEPAGE="http://ccxvii.net/gargoyle/"
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=media-fonts/libertine-5
+	media-fonts/libertine
 	media-fonts/liberation-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
@@ -52,11 +52,10 @@ src_prepare() {
 	# Convert garglk.ini to UNIX format.
 	edos2unix garglk/garglk.ini
 
-	# The font name of Linux Libertine changed in version 5.
-	sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini || die
-
 	epatch "${FILESDIR}"/${P}-desktopfile.patch
 	append-cflags -std=gnu89 # build with gcc5 (bug #573378)
+	append-cxxflags -std=gnu++11 # code assumes C++11 semantics (bug #642996)
+	default
 }
 
 src_compile() {
@@ -69,7 +68,7 @@ src_compile() {
 		-sC++="$(tc-getCXX) ${CXXFLAGS}" \
 		-sCXX="$(tc-getCXX) ${CXXFLAGS}" \
 		-sC++FLAGS="" \
-		-sGARGLKINI="${GAMES_SYSCONFDIR}/garglk.ini" \
+		-sGARGLKINI="/etc/garglk.ini" \
 		-sUSESDL=yes \
 		-sBUNDLEFONTS=no \
 		-dx \
@@ -78,15 +77,15 @@ src_compile() {
 
 src_install() {
 	DESTDIR="${D}" \
-	_BINDIR="${GAMES_PREFIX}/libexec/${PN}" \
-	_APPDIR="${GAMES_PREFIX}/libexec/${PN}" \
-	_LIBDIR="$(games_get_libdir)" \
+	_BINDIR="/usr/libexec/${PN}" \
+	_APPDIR="/usr/libexec/${PN}" \
+	_LIBDIR="/usr/$(get_libdir)" \
 	EXEMODE=755 \
 	FILEMODE=755 \
 	jam install || die
 
 	# Install config file.
-	insinto "${GAMES_SYSCONFDIR}"
+	insinto "/etc"
 	newins garglk/garglk.ini garglk.ini
 
 	# Install application entry and icon.
@@ -97,24 +96,20 @@ src_install() {
 	for terp in advsys agility alan2 alan3 frotz geas git glulxe hugo jacl \
 		level9 magnetic nitfol scare tadsr
 	do
-		dosym "${GAMES_PREFIX}/libexec/${PN}/${terp}" \
-			"${GAMES_BINDIR}/${PN}-${terp}"
+		dosym "../libexec/${PN}/${terp}" \
+			"/usr/bin/${PN}-${terp}"
 	done
 
 	# Also symlink the main binary since it resides in libexec.
-	dosym "${GAMES_PREFIX}/libexec/${PN}/${PN}" \
-		"${GAMES_BINDIR}/${PN}"
-
-	prepgamesdirs
+	dosym "../libexec/${PN}/${PN}" \
+		"/usr/bin/${PN}"
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 38b6bb941dd3..e65f87ba6ca8 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 9714646e8be0..19ca4a0b2b8f 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -1,13 +1,13 @@
 AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
-AUX fix-build-transpal.patch 719 BLAKE2B ce6334dbd4b70a97ea4595693c6548214bb4de53853adc1a54d82df8bbd06c93086f197c45b404ced8f85cacf05eeff83baa6223c39541c583feac5819828bea SHA512 c378913d34a2297412afbcca9877bc38f3ab1a632c80cc24c452dccacc61cc3ca361b9c627bacfb5d9fe660933a4477be7a47068fde6cd334ac960c5cf162eb5
 AUX log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144d57e126bef5c5b468c8142b797717536852c71f5f8183f63c5a6adffd6d411b2972831320d5a4f214e05d54bca67129ab84c3b0608 SHA512 f1ac030d0d9bed2cc4e67d33563dc7d2f34d2cda75835ec875ce0c3957191c7a61b8d9a16a1d040ee7d5ca8e98e8a2660fe9ff1d8047bbd86953425124140512
 AUX search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
 DIST duke3d_hrp-5.4.zip 933440151 BLAKE2B 20749d6e1bdd07d0e5f28ac2f7e3aff60e8638223b934795320046922311533d6ecaefa3923650568aaa4e026927b53087032415d2d343fc4bd179c9e9ddd640 SHA512 fd5aba0a09193ccd49781d3f06a040000a134ad90f099ab7bf10a8abe474c3a742f922f8fa31522b8993828d516bdd0b5ded327e9c4615c2c101fe655d533f4d
 DIST duke3d_music-sc55-4.02.zip 155441427 BLAKE2B 7fa0c98927dd9a18411ad473269a795d1bc809fa8f9479deef06e12cd0dc97953680e7519c9d22e2d32b6ff79726682746820f78429ad11cb5edf1b64d2e4fe7 SHA512 70d3d7b4705e30cdb19ddc95e11a88afff1dc01dfc6495a488ea665f8097c1200695ec67246ac47a2480d0e68cd7d74e1d61c2120485f53bb93d9c0fb16ba9b2
 DIST duke3d_musopl-2.01.zip 266444823 BLAKE2B 5255c671782279c7723fb1f848a331645a89fdc8dd5336250d06e6eed5b63511c37bfbb07d22d7e7ce29707efe2c55406f2ee81522374de3633f2b448c7dbd6b SHA512 08308b672516a6f3a3b9b85fd836f2a29a24c8fa5f353953f5f55a281dea370046817ccfb8467b4ce25385277ced8afd83c00882e8a246b03afa5e0e349efd35
 DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c17b1163107e1f8c6eab4be2b5a2ed74f302604f5769d3bb71d3ce8355b69b75352dc470918ebd5c0c73d68665 SHA512 e98f3bbfb2055fa72c4376ebbdb64814b1bca7c66968ffea8ca4d980d432f59f6ae013c889a57a28b2961bbeca2cc80b83b573dc0cbc2550cd9f428cf9d2a625
+DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20180508-6885.tar.xz 14703224 BLAKE2B 8b90bf5771c2c27701316df8b9e738082d03552dddbd4d8be7e25195fd2da746afb2857e166ac6e6c0c78ad43e3c21f809538f0c54936ce82b5f2a3f93f80f94 SHA512 2b1be82a1bfbb0cf2a9b7bb0b73e69232bc2ce7adf343e25319b16c4240a6b3acf0fb8708e6ab8c7daa18f5a3039772472fd6542f6ea6dbe0530c8c3361c791c
-EBUILD eduke32-20180508.6885.ebuild 5653 BLAKE2B be4dd6f9b63aac67499b35a36b0a72324ea60eda8b1b7b1f3bed681b9d5738209b097c162bed8301d2dcb98b12447f90be4a49164f55a29a7a9cc05ab437b180 SHA512 70e3a215dc32bcbd3227c07e58cfd66469c7630c3bd813ed6db5798b242aba156aeec6ebfa2000ed7faac42125e2b97cbb3b94dc9ecd2166b59751628961226d
-MISC metadata.xml 1659 BLAKE2B 2114f1b5ec7101a54c8506bb2d3877453f58057de782f399cd8126f82d8e390d9816a2d0f706d2f98ef13e54169d22eaa8de3cf8509884a145c9b602e37a2c36 SHA512 6ba7e12733147190ed307b02c80ba7224be49b30a795d04e5b4c466e929665b75690be81c8aea80cfc754981edbc9bfdabd93c1c6424ecc92a8d645c5b13484d
+DIST eduke32_src_20180702-6937.tar.xz 14703496 BLAKE2B b1028551621bf12cbf8e6b0626cfb9634aa096d59a9dcc173cdb89614e68006d56468e2507e8f44f9c7a81e3c2bb392b79ccdafda420d456e169f135f78e106b SHA512 f219c30c6b5892846cc1f2a025e192d868610607213671658a62bcc833a5e0d8f5a3841681475574451e9938a8b8f47410e5f7f34267b618d03a2f154539cfef
+EBUILD eduke32-20180702.6937.ebuild 6076 BLAKE2B e3e92d3a8fbca3591855495294ec06bedd7b545f8d618f3730e9544df02a7559229291915db32ed0ae236fdcd0c9eb058c3ee2ec6345daabfe7c469e20ab88e2 SHA512 ab65151e77139a4805a6a2292540e6c30c8eec695195bc28d2ff294ddac29fbbac42eacc00a35e61e4270aa25dbfe483b2c0448cb265421e1d5b1439d2c5e2d5
+MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20180508.6885.ebuild b/games-fps/eduke32/eduke32-20180702.6937.ebuild
index d0de4c73bf6f..c42e95c4417b 100644
--- a/games-fps/eduke32/eduke32-20180508.6885.ebuild
+++ b/games-fps/eduke32/eduke32-20180702.6937.ebuild
@@ -12,12 +12,14 @@ MY_PN_HRP="duke3d_hrp"
 MY_PN_OPL="duke3d_musopl"
 MY_PN_PSX="duke3d_psx"
 MY_PN_SC55="duke3d_music-sc55"
+MY_PN_VOXELS="duke3d_voxels"
 MY_PN_XXX="duke3d_xxx"
 
 MY_PV_HRP="5.4"
 MY_PV_OPL="2.01"
 MY_PV_PSX="1.11"
 MY_PV_SC55="4.02"
+MY_PV_VOXELS="1.21"
 MY_PV_XXX="1.33"
 
 DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
@@ -28,21 +30,24 @@ SRC_URI="http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src
 	offensive? ( http://www.duke4.org/files/nightfright/related/${MY_PN_XXX}.zip -> ${MY_PN_XXX}-${MY_PV_XXX}.zip )
 	opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> ${MY_PN_OPL}-${MY_PV_OPL}.zip )
 	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> ${MY_PN_PSX}-${MY_PV_PSX}.zip )
-	sc-55? ( http://www.duke4.org/files/nightfright/music/${MY_PN_SC55}.zip -> ${MY_PN_SC55}-${MY_PV_SC55}.zip )"
+	sc-55? ( http://www.duke4.org/files/nightfright/music/${MY_PN_SC55}.zip -> ${MY_PN_SC55}-${MY_PV_SC55}.zip )
+	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> ${MY_PN_VOXELS}-${MY_PV_VOXELS}.zip )"
 
 KEYWORDS="~amd64 ~hppa ~x86"
 LICENSE="BUILDLIC GPL-2 HRP"
 SLOT="0"
-IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis vpx xmp"
+IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
 REQUIRED_USE="cdinstall? ( !demo )
 	demo? ( !cdinstall )
-	hrp? ( ^^ ( demo cdinstall ) )
+	hrp? ( ^^ ( demo cdinstall )
+		!voxels )
 	offensive? ( ^^ ( demo cdinstall ) )
 	opl? ( ^^ ( demo cdinstall )
 		!sc-55 )
 	psx? ( ^^ ( demo cdinstall ) )
 	sc-55? ( ^^ ( demo cdinstall )
 		!opl )
+	voxels? ( !hrp )
 	vpx? ( opengl )"
 
 S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}"
@@ -69,7 +74,7 @@ DEPEND="${MY_DEPEND_RDEPEND}
 	app-arch/unzip
 	x86? ( dev-lang/nasm )"
 
-PATCHES=( "${FILESDIR}/fix-build-transpal.patch" "${FILESDIR}/log-to-tmpdir.patch" "${FILESDIR}/search-duke3d-path.patch" )
+PATCHES=( "${FILESDIR}/log-to-tmpdir.patch" "${FILESDIR}/search-duke3d-path.patch" )
 
 src_unpack() {
 	# Extract only the eduke32 archive
@@ -88,6 +93,9 @@ src_unpack() {
 	if use sc-55; then
 		unzip -q "${DISTDIR}"/${MY_PN_SC55}-${MY_PV_SC55}.zip readme/music_readme.txt || die
 	fi
+	if use voxels; then
+		unzip -q "${DISTDIR}"/${MY_PN_VOXELS}-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
+	fi
 }
 
 src_compile() {
@@ -198,6 +206,9 @@ src_install() {
 	if use sdk; then
 		doins -r package/sdk
 	fi
+	if use voxels; then
+		doins "${DISTDIR}"/${MY_PN_VOXELS}-${MY_PV_VOXELS}.zip
+	fi
 
 	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
 
@@ -217,6 +228,9 @@ src_install() {
 	if use sc-55; then
 		DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
 	fi
+	if use voxels; then
+		DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
+	fi
 	einstalldocs
 }
 
diff --git a/games-fps/eduke32/files/fix-build-transpal.patch b/games-fps/eduke32/files/fix-build-transpal.patch
deleted file mode 100644
index 3c22bc405507..000000000000
--- a/games-fps/eduke32/files/fix-build-transpal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/source/tools/src/transpal.cpp	2017-02-01 11:01:11.000000000 +0100
-+++ b/source/tools/src/transpal.cpp	2018-05-11 00:06:37.329712454 +0200
-@@ -26,7 +26,7 @@
-     r = ((ptr[0]*t+32768)>>16);
-     g = ((ptr[1]*t+32768)>>16);
-     b = ((ptr[2]*t+32768)>>16);
--    return(getclosestcol(r,g,b));
-+    return(paletteGetClosestColor(r,g,b));
- }
- 
- static char gettrans(char dat1, char dat2, int datransratio)
-@@ -39,7 +39,7 @@
-     r = ptr[0]; r += (((ptr2[0]-r)*datransratio+128)>>8);
-     g = ptr[1]; g += (((ptr2[1]-g)*datransratio+128)>>8);
-     b = ptr[2]; b += (((ptr2[2]-b)*datransratio+128)>>8);
--    return(getclosestcol(r,g,b));
-+    return(paletteGetClosestColor(r,g,b));
- }
- 
- int main(int argc, char **argv)
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 801a1769ecb5..15de77d47f59 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -29,6 +29,7 @@
 		<flag name="server">Enable support for multiplayer.</flag>
 		<flag name="sdk">Install the SDK files.</flag>
 		<flag name="tools">Install the support tools for mapster32.</flag>
+		<flag name="voxels">Install the Duke Nukem 3D Voxels Pack.</flag>
 		<flag name="vpx">Enable support for <pkg>media-libs/libvpx</pkg>.</flag>
 		<flag name="xmp">Enable support for <pkg>media-libs/exempi</pkg>.</flag>
 	</use>
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 8f6617493637..3d47ddb98923 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/exult-sound/Manifest b/games-misc/exult-sound/Manifest
index 425896f4fe58..0aee99e43ffd 100644
--- a/games-misc/exult-sound/Manifest
+++ b/games-misc/exult-sound/Manifest
@@ -1,6 +1,3 @@
-DIST U7MusicOGG_1of2.zip 12614413 BLAKE2B 46b4e36638510d9a13b52aad6c1423b43becd2bcb8afc28bd0d19baaf7ee7af3dd0cc16e64a6685701c3db4b418fb088ede3922041ce91fb74fdceec223d5069 SHA512 aadcb085cc97b5330622c4acbd9d00912af7a87371b38e5d984882686ac1624dba1a70a21e66943d8e4de1c5583ab58a32ed851e50d7ecc861d7051383fb21c0
-DIST U7MusicOGG_2of2.zip 11382878 BLAKE2B c65f7e12b6a2a6d94cf1025c7eeb50a8ec9d81b321a66e602900f61b614899b8db654a1a59203cf4026517eaade6aeb5bd53a27085fc26ca545ae9edf01a354b SHA512 c3157faad5e02531732cd8e7ceb2a81cdb3a5b3eeaf48c73c0e753fc99c0ad438bc49f290d202f59851072aca50d22594f5c4782606d0f70d91d747cea9de924
-DIST jmsfx.zip 4778572 BLAKE2B 26ee8f735b1cb75977493a22c660bb8a9e586ca2f68918db32142d9e654c1a80aaa304756bdc72dc6ec741e699ea9f14139a267f85752cfd1017c6c6c91635bf SHA512 0822a8008ad3b9e2e6824dc6666968b8aa5f475b35dae31cf3d35d36422d68570cef440572bde07d4b4b580520b34581ab0700f7bded0bc66ae5d6020feb1662
-DIST jmsfxsi.zip 6194646 BLAKE2B 5b791132907e6579110d4e450a5c4d1362fa5a4e9021ed758be200ba11a370d44710bdd14a2b9bee0c55fcd1972e3fb732b4926d68b75404b1d5cd9fa90a2408 SHA512 1712d7d264f06d84ba38e864174d2e40a77a4270c94b2a5bccbf31dc41e187d6eeb013ebbfbc171bb6314df103a3ad5dd06daeb8ede0b5aead6cd1443680abdf
-EBUILD exult-sound-0-r1.ebuild 850 BLAKE2B 4d025ade2314dbc62fc62e976f1380ee86cde4471171e4509f6f7eafbd6351dba744ae080dad25c9d5bc309f203ebaa3384d1136d46b06e55b1e6de7f08e6f9a SHA512 130b022140ac82ecfee387390b92b836e2a782585e31a4cc8ad4910001ce1f8bd0c3dee8f1e37fbd222aaa5722709dedabee966c6c9334d1a64c2d2dd2a2c143
+DIST exult_audio.zip 48439905 BLAKE2B ad8a230d9ba92cef94b22b669644a10ae6fcfe92c4dbfc5c3f89535534b4bddfe7d9b69dbf05220033df92b6d172e83340e6571920f42b5e63e66a5417ffa8f4 SHA512 70374a079935b063f41a37aeb90315d55abb584e5542f7fa12c707318db6365e989a5848bba9045a2c2cca1ccd902cc1d31fec8c95511a986de7a75d322d0919
+EBUILD exult-sound-0-r2.ebuild 584 BLAKE2B d33043a392754ce5ed10b7279d06f674da8c1b93492dc96b22dbbc5012f9e154920f6b58bdba23a6157f09dc8633412d4d1a9bebed6ad1427456dd2b358a21d6 SHA512 af667060e9ae88c76d2381555562e7bbe0035683fb4c2a33bbf705f3731838336446c6ab3463f7ac8a9f71c6dbfd9ee7b0fe58f24cc8487897f0ec2cc5e53b1f
 MISC metadata.xml 328 BLAKE2B b895ccfad252cbbeb8fe092b4416086fd43420976392111a9ee7b0f714ee22e32d64b651f7e2370466b32c840b1eb0de8702a6714b9718e6bc90fa4524b84ed0 SHA512 bf9ebdd6a99230e6cb155d0dc42b0d94aa1d15b64afc93420210b6763a46a4c8ab3f18cbc83e54068dc7c62df73baf28ee3cbc13a34c7824a724041ac13be16e
diff --git a/games-misc/exult-sound/exult-sound-0-r1.ebuild b/games-misc/exult-sound/exult-sound-0-r1.ebuild
deleted file mode 100644
index d83c7ae5d659..000000000000
--- a/games-misc/exult-sound/exult-sound-0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sound data for games-engines/exult"
-HOMEPAGE="http://exult.sourceforge.net/"
-SRC_URI="mirror://sourceforge/exult/U7MusicOGG_1of2.zip
-	mirror://sourceforge/exult/U7MusicOGG_2of2.zip
-	mirror://sourceforge/exult/jmsfx.zip
-	mirror://sourceforge/exult/jmsfxsi.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="!<games-engines/exult-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	mkdir music && cd music || die
-	unpack U7MusicOGG_{1,2}of2.zip
-	cd "${WORKDIR}" || die
-	mkdir flx && cd flx || die
-	unpack jmsfx{,si}.zip
-}
-
-src_install() {
-	insinto /usr/share/exult/music
-	doins "${WORKDIR}/music/"*ogg
-	insinto /usr/share/exult/
-	doins "${WORKDIR}/flx/"*.flx
-	newdoc "${WORKDIR}/music/readme.txt" music-readme.txt
-}
diff --git a/games-misc/exult-sound/exult-sound-0-r2.ebuild b/games-misc/exult-sound/exult-sound-0-r2.ebuild
new file mode 100644
index 000000000000..a1cb960fdc53
--- /dev/null
+++ b/games-misc/exult-sound/exult-sound-0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Sound data for games-engines/exult"
+HOMEPAGE="http://exult.sourceforge.net/"
+SRC_URI="mirror://sourceforge/exult/exult_audio.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!<games-engines/exult-9999"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/exult/music
+	doins music/*.ogg
+	insinto /usr/share/exult/
+	doins *.flx
+	newdoc music/readme.txt music-readme.txt
+	dodoc README_audiopack.txt readme_{jmsfx,jmsisfx,sqsfxbg,sqsfxsi}.txt
+}
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index aa7bbe5b2a39..fc7e2ae8167f 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
index ae456e550f7c..926cb20cc477 100644
--- a/games-puzzle/connectagram/Manifest
+++ b/games-puzzle/connectagram/Manifest
@@ -1,4 +1,4 @@
-AUX connectagram-1.2.1-gentoo.patch 2551 BLAKE2B f10e4f38d6b3e35a9b564c4139e80d22ccbe9faf3ad1a631f8c9b7633bc1145b56788d4cd1159fe6562cf78fa6d9288fd359f18d88b1b98d585b4f38c7ec1599 SHA512 a95856c1f76670d1ea1e86a34f8d05ed7621479d6268068df46c7b3882dff633e7a8236f01c9ad3215d0f6e89a5702d2ece106be3db971431b129752be272804
-DIST connectagram-1.2.1-src.tar.bz2 1632426 BLAKE2B 8b3f6a42e074dd2698dd29cf74520a1aff972cd9376fcbaf42852daf71e963ef9e9a5b2cc393b8a1b36367a2d9fc2140cb2aedbecf5efdff787d8e43ebaab267 SHA512 0266af5680e7f76d517f60934afc6115c1118832fef237803b1b3d8c0fb785e5c312d585b099f24f4c476f124ca9722868a159dc4d1a9a8a695e9cdfa4f9c1c6
-EBUILD connectagram-1.2.1-r1.ebuild 933 BLAKE2B 22baf28d3d8baf3d7e1da72bd87960143a1b3fb29a77b4f74706e9c903d7c3d7a6350d37363298ba315d328c2f44b031e0c3a72935d120b1cdcbda3eed209faa SHA512 3449296162e5e4c29599064c544ef23123ce803aaecd59081e0ffa355c90d724594592abf97e7e9620e73c2565f1f396cc5907a1470bfcb4ddb73a09d838d33a
+AUX connectagram-1.2.8-gentoo.patch 2479 BLAKE2B 128389ff604e5a7a623e5893d3366ff9f4b7e58f05b49e1435a70c546d754718d0640451fb79a56e1b5a12893445040a020aa09cbd876b31e1dc8042afde0250 SHA512 d45be3e0734c3f2832cbdf56aaf722df5e4fe37ebf9a1d44001463d2bbb0f90de762a55898699343ad99e999c751e7f041f0bb7cefa679a95f56454c6140571c
+DIST connectagram-1.2.8-src.tar.bz2 1760028 BLAKE2B db29251339abaa8ecbda69afff55366a2cc94ae9515bdc3750b9d328b7f5445613ee2da4c308008fb5ad09e20435cb294f97c5e9a23124a4330004cde11bd6c5 SHA512 f48fe0320745919f9532a0bb25799b05272dc30b9acba20e559d1df7ce15570eb37a29a2f746af94077f56306c45e2ee32d49f27585b6e4385477aeb795f4ed8
+EBUILD connectagram-1.2.8.ebuild 910 BLAKE2B 6975e489cb78a8994783b57bd43419eac6c1d00e55e6875aeca89103a28d24b7133289344ebd6b0172adbdbfaf7a1339747e56d026673ba2366b2da48feda22b SHA512 b868f018cea2ddeb980b5950669792a2972d749c614cc2f87f1daf3339af529c0de28b451004022e234001ec92d118566b624305e362ccc5b7c54a1dd69bb093
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/connectagram/connectagram-1.2.1-r1.ebuild b/games-puzzle/connectagram/connectagram-1.2.8.ebuild
index 2ea5d017d259..8405ae6061d8 100644
--- a/games-puzzle/connectagram/connectagram-1.2.1-r1.ebuild
+++ b/games-puzzle/connectagram/connectagram-1.2.8.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gnome2-utils qmake-utils
 
 DESCRIPTION="A word unscrambling game"
@@ -14,18 +15,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=dev-qt/qtcore-5.2:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
-	>=dev-qt/qtgui-5.2:5
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
 	default
-
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-
 	sed -i \
 		-e "s#@GAMES_BINDIR@#/usr/bin#" \
 		-e "s#@GAMES_DATADIR@#/usr/share#" \
@@ -41,10 +43,6 @@ src_install() {
 	einstalldocs
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 }
diff --git a/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch b/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch
index b02dfef46792..7bb74baeee82 100644
--- a/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch
+++ b/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch
@@ -1,6 +1,6 @@
---- connectagram-1.2.1.orig/connectagram.pro
-+++ connectagram-1.2.1/connectagram.pro
-@@ -74,16 +74,16 @@
+--- a/connectagram.pro	2018-07-11 19:19:33.058534696 +0200
++++ b/connectagram.pro	2018-07-11 19:20:30.536282297 +0200
+@@ -90,16 +90,16 @@
  	RESOURCES += icons/icon.qrc
  
  	isEmpty(PREFIX) {
@@ -21,17 +21,17 @@
  
  	pixmap.files = icons/connectagram.xpm
  	pixmap.path = $$PREFIX/share/pixmaps/
-@@ -98,7 +98,7 @@
- 	appdata.path = $$PREFIX/share/appdata/
+@@ -114,7 +114,7 @@
+ 	appdata.path = $$PREFIX/share/metainfo/
  
- 	qm.files = translations/*.qm
+ 	qm.files = $$replace(TRANSLATIONS, .ts, .qm)
 -	qm.path = $$PREFIX/share/connectagram/translations
 +	qm.path = @GAMES_DATADIR@/connectagram/translations
+ 	qm.CONFIG += no_check_exist
  
  	man.files = doc/connectagram.6
- 	man.path = $$PREFIX/share/man/man6
---- connectagram-1.2.1.orig/src/locale_dialog.cpp
-+++ connectagram-1.2.1/src/locale_dialog.cpp
+--- a/src/locale_dialog.cpp
++++ b/src/locale_dialog.cpp
 @@ -88,6 +88,7 @@
  		paths.append(appdir);
  		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
@@ -40,8 +40,8 @@
  	}
  	for (const QString& path : paths) {
  		if (QFile::exists(path + "/translations/")) {
---- connectagram-1.2.1.orig/src/new_game_dialog.cpp
-+++ connectagram-1.2.1/src/new_game_dialog.cpp
+--- a/src/new_game_dialog.cpp
++++ b/src/new_game_dialog.cpp
 @@ -48,7 +48,7 @@
  	m_wordlist = new WordList(this);
  	m_wordlist->setLanguage(WordList::defaultLanguage());
@@ -51,8 +51,8 @@
  	for (const QString& language : languages) {
  		m_languages_box->addItem(LocaleDialog::languageName(language), language);
  	}
---- connectagram-1.2.1.orig/src/wordlist.cpp
-+++ connectagram-1.2.1/src/wordlist.cpp
+--- a/src/wordlist.cpp
++++ b/src/wordlist.cpp
 @@ -91,9 +91,9 @@
  
  QString WordList::defaultLanguage() {
diff --git a/games-puzzle/cutemaze/Manifest b/games-puzzle/cutemaze/Manifest
index 997822ea7a7f..335d3f89df84 100644
--- a/games-puzzle/cutemaze/Manifest
+++ b/games-puzzle/cutemaze/Manifest
@@ -1,3 +1,3 @@
-DIST cutemaze-1.2.0-src.tar.bz2 800890 BLAKE2B 5865810bd974c1f2938c45f09d4d9e3b060932d7f4619b422e1d11f1bf6798b5846078cdc1efd4b104adf4203d9e301aca11f60ccbe3ba469f0c60c7a344d7cd SHA512 1628f0be74730260fc31898bcc42bd55515046e9ac6a22bb90cdfa1d728f829920bbe6e2360f3daa418ab789efe36891c1c95e399d636ecc4411969bb09f0a89
-EBUILD cutemaze-1.2.0.ebuild 695 BLAKE2B fa432ffe1d91dea5115a2501a4c569af10e8d14cf44a887d1738865e023c99f50e1ea0b78f7f8701cecb380d74d569497625e3e2ab1a90525cbdd4b9a720d079 SHA512 30b8eba77e91bfcc50adca8c4079ba15c501520a45ea2d6916bad0c201f3dde947054a9a287f280c69666c491e2a78910609acfbc4fedf3f2e130059131805c8
+DIST cutemaze-1.2.3-src.tar.bz2 938593 BLAKE2B 004a793ce12cae345f00eb5a018d69d13b2c99d24424938da5a00420fe3c25403ea02fb04603cb662c87c170cc6d8b6daf36228e2ac002c3e4692ee01caafcf3 SHA512 d864cc8e61047948272e9b910c7b90d393ac974ce1ca63475c7d308cfc3c96d771edd87f3a5a93803a777dcddf6049feacc2f373d21529187a83de03aa5f08ea
+EBUILD cutemaze-1.2.3.ebuild 696 BLAKE2B b4a3b0198a3d0fed185a479de37d98ad675acfaef866a91bae622b3141b3e315a0c7922fea20ff901e15952219235f74121a89b0de52939090c70aca200eb2d6 SHA512 01c5115193cded98542e3f1d4f7fc60aab5a16f3760c68ca19086da28d37a88defc929e56243c238bd05c7e1b5d748405d17f61a8dbe25d6ebf111c54892c07b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/cutemaze/cutemaze-1.2.0.ebuild b/games-puzzle/cutemaze/cutemaze-1.2.3.ebuild
index 668129d73bab..0f3981c5b115 100644
--- a/games-puzzle/cutemaze/cutemaze-1.2.0.ebuild
+++ b/games-puzzle/cutemaze/cutemaze-1.2.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gnome2-utils qmake-utils
 
 DESCRIPTION="A simple, top-down game in which mazes are randomly generated"
diff --git a/games-puzzle/gottet/Manifest b/games-puzzle/gottet/Manifest
index 3f92abefd11c..8fe7778f6950 100644
--- a/games-puzzle/gottet/Manifest
+++ b/games-puzzle/gottet/Manifest
@@ -1,3 +1,3 @@
-DIST gottet-1.1.3-src.tar.bz2 395302 BLAKE2B 0e7193b09a8c42fc27d3c867b728f84d304109484b31a57c5175f936f6541bec0ef02c64558bd0754462fcf53e2d734e89ac2c3ebfa42719a9630ee82da3f575 SHA512 9fc468ca16a37eee29d2c172e8e98501c85dc20bee4e9daac2704a0eedb691d8df24905f2696a9331628bf9c91692da0fbbf86e3f80b6d65d4100aed2e4007a6
-EBUILD gottet-1.1.3.ebuild 644 BLAKE2B 2b769ccd389a779680db0f9b278ab32d2e67a51b64100b17678bdbfb377d66d309d258fdb4f9a4952193a7ec7cde75ae1d81887229b8832b7966a5fd0a992bfa SHA512 c71ff8b7a68fe47e50134ce78fb4b7d1a8af217255ca732062b4e1519be66a7090d6794f2d3dd88d34af853c7c4978f2e7d14e3055815b4ca5844ca9832b2934
+DIST gottet-1.1.6-src.tar.bz2 527181 BLAKE2B 1cd090c81c6b4c629b3cf08c8c96a73b3aed18a86a70a1d837d866d0354e8adecfd438cdfc93a821991f9ab919263f2db7e542e13f2503abe16d4b311ea03c95 SHA512 6e004d96ccd11169c19ce5234691db35af34ff050139ae7fee3949f0a36170a1ec906f83ba2a1f2f15fc3538adb08da8c8b744fbfb3202dfc59ebfeea7136f0d
+EBUILD gottet-1.1.6.ebuild 644 BLAKE2B e1fbd0e68fec61bcaeb954ef4db063cd6269a0afe7ec6798e5b9d793c6dd6ba2601494563a4788713edc042e8b9473c82292383236d80a6811d60648ca22704d SHA512 8924ce580c1b7c3a5ede9dc29b5efd6434baff443b679aee4292032968aaa7bbdd3f9a2978c80df6cf98c4c2e9e93d12f610a02cb9c11dc7f2b188ab90f5f532
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gottet/gottet-1.1.3.ebuild b/games-puzzle/gottet/gottet-1.1.6.ebuild
index 0d7f78f4b41d..0d95a54b6a90 100644
--- a/games-puzzle/gottet/gottet-1.1.3.ebuild
+++ b/games-puzzle/gottet/gottet-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/games-puzzle/hexalate/Manifest b/games-puzzle/hexalate/Manifest
index 15d6f43905d9..7d9c433b5fd0 100644
--- a/games-puzzle/hexalate/Manifest
+++ b/games-puzzle/hexalate/Manifest
@@ -1,3 +1,3 @@
-DIST hexalate-1.1.0-src.tar.bz2 662438 BLAKE2B 6902b27db72224e684ff4e98fcc0b8810ab5984bf85c894601035592a478716e9959860af593e977d349ab1f9514f1b7ed4851e7c0c06addbb05c3805344f31d SHA512 2f8775c9cb85ff78fb84109f78079013fa172a6b37b309e1cac033be4eb1c248a005a2e899eb785fbe1f89fd87a2035dae3e7016a26af6f3e82a7174dc010a64
-EBUILD hexalate-1.1.0.ebuild 640 BLAKE2B fa15d8a32bdb3425e97ce0c812635f3b01b3605fc3a46cd2594b97998eec482537b98f3aabcb52a4763ba80e0eeed47210129a44d236a8d6054a9b4da994fe50 SHA512 939df479bda5548a1d668bdfd85b810f5204599149de74366ab71c34f4fbd2eb0372c3ac71b6f4c02dfdf045bd501abcea2575e04cb5e9f9cb1a2062729b1340
+DIST hexalate-1.1.3-src.tar.bz2 798580 BLAKE2B 685a5fb106b9e4e33d63651059bc63b155c4b1afc1426506f8535b93c54bda1cbf8705244790fe130fe92e82bb6b7d9710c3aa8f245f0d578ddf09fa1e51551d SHA512 037dec9bb7b9dbc3cf3659e765c6e333dbbd0a94426e0b79c20695cf402cffb141c28c9ece4405281617dace7510b982180475c129648a871036be226e868bd6
+EBUILD hexalate-1.1.3.ebuild 640 BLAKE2B c2ff441c608e2880001395edf798962bae05bc3ba734358241e110722d573ee0dcfaf4b08da2c52e048501ed59efaca63e7fc4e13976ff4936c99f3dc46ebcc3 SHA512 29fc44d328d67558d0731cc7970abf0251b6a04433ade8a87e22cd430bd4d33d86da3d0aab001b85b1ae38fbb79a4dbc0ac59017cf670f3fbde7dc329b7242f7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/hexalate/hexalate-1.1.0.ebuild b/games-puzzle/hexalate/hexalate-1.1.3.ebuild
index 60757fbc4815..23dec27a0760 100644
--- a/games-puzzle/hexalate/hexalate-1.1.0.ebuild
+++ b/games-puzzle/hexalate/hexalate-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
index 83dfaba47e5c..15886c8da228 100644
--- a/games-puzzle/tanglet/Manifest
+++ b/games-puzzle/tanglet/Manifest
@@ -1,4 +1,4 @@
-AUX tanglet-1.3.1-datadir.patch 740 BLAKE2B 11c12dea2efd4f03afb433931965267bd81e2cdeaadde51a6cf48cdefe1bf5899a87867becfdc2a4e210243363688a3d2bd4c470aaf07a789cd510ed6aabe703 SHA512 2dd7bf5c75624379e270bf51681adb68c1573eacc134265c36c9370bfa18c6463c9fbd155f4cfbb7e6ddf1621c9b57ce34a71a6ec3286c55adeb33da2b0851e0
-DIST tanglet-1.3.1-src.tar.bz2 8461603 BLAKE2B 86542f6248b58dc7f72be8264ded94376d746827865b3633640a24055452a4c4d677bf3f6aab8eb6736ce1cf92b8a8b6963637418118861dad296bb4ccac5b2a SHA512 b939ca45f26baf8e7e32da8775e673707472e5cd07d344642eeb15986ff99319e0ab1bacf78e2ea49f004ec67a6d081a91c939cf7c75228a195654d429235625
-EBUILD tanglet-1.3.1-r1.ebuild 1270 BLAKE2B b5015194fbe34b4c91d30f306746d0cb83a755cb2afb27258c4bf6d97ef256a4720ba7608d64f5707efa9b646010db0bb4efa0ce6d0f40851632cec231c9ba66 SHA512 02147ab848c47fda50cc81b0ecbdf32d7ca4b59322feecc13d8b937b35cfcdffe7a9819b9f3e7347e32bb4e394839c49c435048c29012ce17ac050c7423b3964
+AUX tanglet-1.5.2-gentoo.patch 981 BLAKE2B a581aca772c797e31ad7bd85adf1fd1f12d2e768c9bee87139871f100eb8d4a77bfe343d86b1d29840a67338bdf5b003ff427acc6653abcd2fa4b182b8a362c4 SHA512 541d1feaf1b12acdf8ff477bf3e165d6ea6fa615eca8def32b092925dfb8902759ce29b3fe6f76d761688d298b3b452c71815e94e2cd71a9b07e6641f05386e6
+DIST tanglet-1.5.2-src.tar.bz2 8646616 BLAKE2B 0a38690069550e27a302f28e7db3753eaf67af7add730d8069ec4df001a431843e204603475146d56049cdf40c0be20d8ef83ea9f47b27cf82cc232e4fecef35 SHA512 a97b9fe3c9c80a843c4696766d15edcab48369bd905e893c2975bfb9faf91d4a58a3c440d242be91f5838aacdf1526022b5ce8c463adfd8b0bb62e008be460ee
+EBUILD tanglet-1.5.2.ebuild 876 BLAKE2B 0d3134ed3ee30c442b361d1b264c1172ef0e4ebba7b9abae289bcb9ae60a0794d2869ec53dcced262e317a2f0b28d70380896cee56170090b87254a1ccb9f8bd SHA512 75dd82c10284077788f1fe4dd01b9669f51c56dfe719cac263c24c8855e52782f10d402204a7e3966fdaf18ef0d1aace1f46c24c5ac900e0a6fdb71686d07ef9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch b/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
index 18b56ca6c1a3..8409f2cc48cf 100644
--- a/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch
+++ b/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
@@ -1,22 +1,33 @@
---- a/src/locale_dialog.cpp.old
+--- a/src/src.pro	2018-05-29 13:11:55.000000000 +0200
++++ b/src/src.pro	2018-07-11 20:02:51.415773874 +0200
+@@ -99,7 +99,7 @@
+ 	RESOURCES += ../icons/icon.qrc
+ 
+ 	isEmpty(PREFIX) {
+-		PREFIX = /usr/local
++		PREFIX = /usr
+ 	}
+ 	isEmpty(BINDIR) {
+ 		BINDIR = bin
+--- a/src/locale_dialog.cpp
 +++ b/src/locale_dialog.cpp
 @@ -85,7 +85,7 @@
  	if (paths.isEmpty()) {
  		QString appdir = QCoreApplication::applicationDirPath();
  		paths.append(appdir);
 -		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
-+		paths.append("@GENTOO_DATADIR@");
++		paths.append("/usr/share");
  		paths.append(appdir + "/../Resources");
  	}
  	foreach (const QString& path, paths) {
---- a/src/main.cpp.old
+--- a/src/main.cpp
 +++ b/src/main.cpp
 @@ -46,7 +46,7 @@
  	QString path = app.applicationDirPath();
  	QStringList paths;
  	paths.append(path + "/data/");
 -	paths.append(path + "/../share/tanglet/data/");
-+	paths.append("@GENTOO_DATADIR@/data/");
++	paths.append("/usr/share/data/");
  	paths.append(path + "/../Resources/data/");
  	QDir::setSearchPaths("tanglet", paths);
  
diff --git a/games-puzzle/tanglet/tanglet-1.3.1-r1.ebuild b/games-puzzle/tanglet/tanglet-1.3.1-r1.ebuild
deleted file mode 100644
index f599addb09f1..000000000000
--- a/games-puzzle/tanglet/tanglet-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-LANGS="cs de es en fr he hu it nl ro tr uk"
-LANGSLONG="es_CL"
-
-inherit desktop gnome2-utils qmake-utils
-
-DESCRIPTION="A single player word finding game based on Boggle"
-HOMEPAGE="https://gottcode.org/tanglet/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	sys-libs/zlib
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-datadir.patch
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		src/locale_dialog.cpp \
-		src/main.cpp || die
-}
-
-src_configure() {
-	eqmake5 tanglet.pro
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r data
-
-	# Translations
-	insinto /usr/share/${PN}/translations/
-	for lang in ${LINGUAS};do
-		for x in ${LANGS};do
-			if [[ ${lang} == ${x} ]];then
-				doins translations/${PN}_${x}.qm
-			fi
-		done
-	done
-
-	insinto /usr/share/icons
-	doins -r icons/hicolor
-
-	einstalldocs
-	doicon icons/${PN}.xpm
-	domenu icons/${PN}.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/tanglet/tanglet-1.5.2.ebuild b/games-puzzle/tanglet/tanglet-1.5.2.ebuild
new file mode 100644
index 000000000000..2595d233626d
--- /dev/null
+++ b/games-puzzle/tanglet/tanglet-1.5.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils qmake-utils xdg-utils
+
+DESCRIPTION="A single player word finding game based on Boggle"
+HOMEPAGE="https://gottcode.org/tanglet/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	eqmake5 tanglet.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/games-puzzle/world-of-goo/Manifest b/games-puzzle/world-of-goo/Manifest
index 193d153ab3ea..9e80b891e04d 100644
--- a/games-puzzle/world-of-goo/Manifest
+++ b/games-puzzle/world-of-goo/Manifest
@@ -1,3 +1,3 @@
 DIST WorldOfGooSetup.1.41.tar.gz 66428181 BLAKE2B 476c05f0b3f78fa952728b9f7b5b95942e7f3e57dde4842144ccaa28c9ad2d2c264b1a2277ba5a1f3edf25cb812c72a0380b0d26b2bc99dd9a77116badcf5477 SHA512 278dfb983cf9cf4de87f13d94f5e75b3830af07523e2ddc7a443d5afb6fead130ed50440357554986b5b0d99c17651f77ae11298f51f9f1072ebd40287cad396
-EBUILD world-of-goo-1.41-r1.ebuild 1435 BLAKE2B b292ac0388cdc845c13775448f093c9f15339f12017dbc364d21f9c6c65eb4588f3fdc5a85116a2051c2a934edec28f5632756f2369cbc195005181aece5887b SHA512 56212dbeac141cc805bae061f6f62e43b7d3770bbe4a9a53c73bb80b8f43b06b193680bc3b5a1e576b7574d5e64852db38a69e1080269e7dea09b003189f4f86
+EBUILD world-of-goo-1.41-r2.ebuild 1472 BLAKE2B 4464e577d888be78e0fdabc8a9026724ad3f249bb2b90b7e4d9369e9b84a051be4725b6d488f4cf880b56f44681e5115f64e7dcc7b56782bf1e9e1044d0b2877 SHA512 ee612026cb24862f5ebba0e69a5089dcbabc5a4dae3f9efdf04b65188e708cb06e779c91c67a3accdf1a9a3c36b75547ea7f491dbb9d02724a6c84171f725fe7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild b/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild
index b941fe96f8d3..51f7f12ff569 100644
--- a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
+++ b/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+
+inherit desktop eutils		# eutils for make_wrapper()
 
 DESCRIPTION="A puzzle game with a strong emphasis on physics"
 HOMEPAGE="http://2dboy.com/"
@@ -18,8 +19,7 @@ fi
 LICENSE="2dboy-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch strip"
+RESTRICT="fetch bindist strip"
 
 RDEPEND="media-libs/libsdl[alsa,sound,opengl,video]
 	media-libs/sdl-mixer[vorbis]
@@ -27,10 +27,9 @@ RDEPEND="media-libs/libsdl[alsa,sound,opengl,video]
 	virtual/opengl
 	virtual/glu
 	>=sys-devel/gcc-3.4"
-DEPEND=""
 
-S=${WORKDIR}/${MY_PN}
-dir=${GAMES_PREFIX_OPT}/${PN}
+S="${WORKDIR}/${MY_PN}"
+dir="/opt/${PN}"
 
 QA_PREBUILT="${dir:1}/${MY_PN%Demo}.bin32
 	${dir:1}/${MY_PN%Demo}.bin64"
@@ -38,9 +37,10 @@ QA_PREBUILT="${dir:1}/${MY_PN%Demo}.bin32
 pkg_nofetch() {
 	if [[ ${PN} == *-demo ]] ; then
 		elog "To download the demo, visit http://worldofgoo.com/dl2.php?lk=demo"
-		elog "and download ${A} and place it in ${DISTDIR}"
+		elog "and download ${A} and place it in your DISTDIR directory."
 	else
-		elog "Download ${A} from ${HOMEPAGE} and place it in ${DISTDIR}"
+		elog "Download ${A} from ${HOMEPAGE}"
+		elog "and place it in your DISTDIR directory."
 	fi
 }
 
@@ -48,7 +48,7 @@ src_install() {
 	exeinto "${dir}"
 	doexe ${MY_PN%Demo}{,.$(usex amd64 bin64 bin32)}
 
-	games_make_wrapper ${PN} "${dir}"/${MY_PN%Demo}
+	make_wrapper ${PN} "${dir}"/${MY_PN%Demo}
 
 	insinto "${dir}"
 	doins -r icons properties res
@@ -61,7 +61,6 @@ src_install() {
 	fi
 
 	dodoc linux-issues.txt
-	dohtml readme.html
-
-	prepgamesdirs
+	docinto html
+	dodoc readme.html
 }
diff --git a/games-roguelike/FTL-gog/FTL-gog-1.6.7.18662.ebuild b/games-roguelike/FTL-gog/FTL-gog-1.6.7.18662-r1.ebuild
index 513747171d91..c606b4d683d1 100644
--- a/games-roguelike/FTL-gog/FTL-gog-1.6.7.18662.ebuild
+++ b/games-roguelike/FTL-gog/FTL-gog-1.6.7.18662-r1.ebuild
@@ -42,12 +42,14 @@ src_prepare() {
 	if ! use amd64; then
 		rm game/data/FTL.amd64 || die
 	fi
+
+	sed -i start.sh -e '/chmod/d'
 }
 
 src_install() {
 	insinto /opt/gog/FTL
 	doins -r .
-	fperms +x /opt/gog/FTL/{start.sh,game/FTL}
+	fperms +x /opt/gog/FTL/{start.sh,game/FTL,game/data/FTL}
 
 	if use x86; then
 		fperms +x /opt/gog/FTL/game/data/FTL.x86
diff --git a/games-roguelike/FTL-gog/Manifest b/games-roguelike/FTL-gog/Manifest
index a57e425e1d24..487f81d3c87a 100644
--- a/games-roguelike/FTL-gog/Manifest
+++ b/games-roguelike/FTL-gog/Manifest
@@ -1,3 +1,3 @@
 DIST ftl_advanced_edition_en_1_6_7_18662.sh 190506416 BLAKE2B 0a628e4de3a5539add2f421377c32ead5397ad1709e30124aa8c9d0874b98eb37cda97873b21dbb78fe635769c1a3c3254988ae22494805409d28f5e33417e44 SHA512 3e9c08d32964e21b49ad3e1b6a17c2349d516fdbea4118518e022134affc43dd27d2e60eea94784096aea4725f2656b43f6b6be9fe02eaed743c167ef842d66b
-EBUILD FTL-gog-1.6.7.18662.ebuild 1263 BLAKE2B 0188cb915de37af5edbca1b9dd55ea186db1185dccdb6fd712e46f2a09b27846e897e3b0457b324bfc2c130f937958306abfe4d35d1a22f788ee859c2ffb97a4 SHA512 1926506d70408b16e6fd8578a0c22004dfb6ed938cef3485f50011a5ce956a166a68ab80b55504d3df5b8c8e86cf9cefa0f78c238f186b4e27d2be8cd0821198
+EBUILD FTL-gog-1.6.7.18662-r1.ebuild 1309 BLAKE2B 5b01fef968088d747e31b903575a13091ebd5fb904ffa61680e06ad3ba922814d92639df5fdfdcabadb518cc7ce9578206ba793d09872898ffa2f1a78816403c SHA512 39da6ae85d68b4b9f763c5f79766f3fd5d62dfa73c0d3fb8ea7ba8c9d190246ff3ee8c1dfcc714f48bbc8d356dc3de30af0818166af73f6d8d73893f67c0d16b
 MISC metadata.xml 487 BLAKE2B d1c2761fb3083ba140d1f87b1f52d179095ea37235acc3e0f2586e9b969174cc4aab34648523c6dce9f83499d05624e8afe2782101560e6a39cf61f5a9b27bf7 SHA512 69c1e069878db826f8a7c44d8d9f6349a37a60ec7777ea29886655082b6c57b152ab5cda35bd3126beef0a127472a57b0cc50b941224694446bb2de51bb90d92
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 1ec35099df09..94e9fb82c21e 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index 3f31d7941e00..dff2a0695a7b 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -3,8 +3,8 @@ AUX Makefile.native 1016 BLAKE2B ea40a1f90bf52e52c7cf88e99c73c981c00506eddb4ad9c
 AUX dwarf-fortress 516 BLAKE2B 9d2faffac265e99698fa1c481eec8598fbe66b4ab205b18c76d285cd16fe1b32d3bfa9bc415bceae6e1e350e955ac3b3cebd7d46943a06ff71715fd1cb5402df SHA512 1f1fada35e33cb99c28835d600f6567ecaaf7b2c6111a2e96b1a88c54e5d727f94ae1c0213327bc70a623dbdf19a8433e3c59edcab5a40e898b0124eb2eb9006
 DIST df_43_05_linux.tar.bz2 11580594 BLAKE2B 7157f8ed5f8798a533d992811c804515acc8abb3bb84b25af6905fd6b2338e95879e318bec0dade18f1eba1421d17a781d1da8b49c719988d2cb6d7046b0c3be SHA512 502e6bac0bdd5586fb6b4e1117caf144a0336a7eed3ed9350ec316e4a286e309a15e0738517c0dd7d32f182984c501c7a8756e942d3dde9fb87f72b153f38e7a
 DIST df_43_05_linux32.tar.bz2 12158550 BLAKE2B 4c1f5ad834aa0a2b6438b8aaf0b0ad6cfc60656f58845a274ac3d8ad7e09182d7263e3a495d1bff0b1fb5499097569216fac0bc87cff95fc6a85e3211acc297d SHA512 d0446ddb5c37ee45ade36b18b815595e8d7bfd9749af4ecd2f25b45859d797a9da70f2344e2c58544feafc7df06882ade8a10534c37754359747c0d37f084b7c
-DIST df_44_08_linux.tar.bz2 11996354 BLAKE2B 64a41693fba51526947563a1228eab4435897afe887b67fc43bedf93bca8ef762f62ec6b81480b6d5240cbdd0e254a753f4f34fc5ac8910762bee921200327c2 SHA512 e1aa78b0e10bec815d6df6c61ec8cea77950577f03f367e3c04cda003f318fc5ea8d7cc0c9e12e754d5adf9394f3afef48bed54524b771a8df1ae30efaf24eaf
-DIST df_44_08_linux32.tar.bz2 12614451 BLAKE2B 39ecbc5fa8f4a36a1e682a241b43a18b4110adbaf41572889d79b7fc047c9a4f3270e6434410a5e36bde34bf709bd0c6852370a42601355c23848cb75d97a6ec SHA512 876a7fc3909b8c3643fdf6c061265dae7bd9cef9cddebea3d0bc2ef5163c8c948641696f0f895b0fab794eeda07d27d89f1f8447be8b4eaa52bdb7f214ae51ce
+DIST df_44_12_linux.tar.bz2 12081683 BLAKE2B 2410e8da6af6a8ced45d3e95dc06e2d0f4e31dbdcd6b8d9945a761d2278532bb24c1095418aa22639eedded256b3d485fa128984e6282a491d4dc7bd9af8671b SHA512 03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c
+DIST df_44_12_linux32.tar.bz2 12686340 BLAKE2B bf1e1370930d91d2c9e72d3366bc79706092d1505853eb63c6160fea39822551d3276958ac6d2916b8f7825be0c054a037219210f0c2c18a731065a2dd1bb842 SHA512 5cd352acf310592c7e30442205b7fe590f421c5e3562959dcfd32a17d3d562347c2b32e3bc5835637c5550ce2c696c17b6dc910ee4cf766be07af306e83537db
 EBUILD dwarf-fortress-0.43.05.ebuild 2336 BLAKE2B 97411ad8ae7ffb1841a58be8cdb503e827bc570cf795e9b48c3236f59c4d81e9ea6825329775d7c1421aa112d3d8238446fe946d58808987649b4f9ef4a8cb96 SHA512 9fb15d69e8df35916919d4cd74ea05cfa0e721cda80260fde0d19c2bff32caa81fd449216d584e3059987ca7892f3553da8c9646f214e9ad2e2dab41bfe351f4
-EBUILD dwarf-fortress-0.44.08.ebuild 2336 BLAKE2B 97411ad8ae7ffb1841a58be8cdb503e827bc570cf795e9b48c3236f59c4d81e9ea6825329775d7c1421aa112d3d8238446fe946d58808987649b4f9ef4a8cb96 SHA512 9fb15d69e8df35916919d4cd74ea05cfa0e721cda80260fde0d19c2bff32caa81fd449216d584e3059987ca7892f3553da8c9646f214e9ad2e2dab41bfe351f4
+EBUILD dwarf-fortress-0.44.12.ebuild 2336 BLAKE2B 97411ad8ae7ffb1841a58be8cdb503e827bc570cf795e9b48c3236f59c4d81e9ea6825329775d7c1421aa112d3d8238446fe946d58808987649b4f9ef4a8cb96 SHA512 9fb15d69e8df35916919d4cd74ea05cfa0e721cda80260fde0d19c2bff32caa81fd449216d584e3059987ca7892f3553da8c9646f214e9ad2e2dab41bfe351f4
 MISC metadata.xml 455 BLAKE2B cad71196c8cb8c8246703bf00d8470faacd39b564ba7ce8a4819c19d1ef28561ad893000e991ba8eefaff8697497fe96fb19e3c07f18a073d2b9fd406c11346e SHA512 913a17c9b0f3d8909e1d01d1924d3efecb47dce07fe3f10cb7fda44150f816b690bd8698cef3b81a706f043db39b6e33a791fe704892010a47c522b1add8561e
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.08.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
index a8f36028ee27..a8f36028ee27 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.08.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 52fa48ed79cf..2414af966efd 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
new file mode 100644
index 000000000000..518f357e2ab2
--- /dev/null
+++ b/games-server/minecraft-server/Manifest
@@ -0,0 +1,5 @@
+AUX minecraft-server.confd 318 BLAKE2B c4ae9a7e68e0db71f9cf648aeab10030264a544927f697d005016662a402bd1d64ea02779eb6b645c16845cec6b22842cf08c51734d608f90eb0d45f6c786a67 SHA512 bad9df2874a862f28a2a34f70509c34086ab5d63e6bfda79905f4058a029141ada592dc435d9773b6aa6332447c875675d68e7152ddf18b55a6157b81ed82f95
+AUX minecraft-server.initd 1421 BLAKE2B a59a6ab1270fb8110ec0ede580a52373626ffa2c42a75f63dc7508fc07b6f4e05ee85d04777d3f1a04a23229632f4de088164121bc351d7a38ea076b7e463e28 SHA512 6ef9df7d33cebb60981fc4fb4cbf1c4d737f3d957902effd02f8a278a6d4cedddd38fd89ecec0ac3ff5e25f236fcf484715fe3583d0f8865a83a1ae673775aee
+DIST minecraft-server-1.12.2.jar 30222121 BLAKE2B 91733822789405dbec5d335fc67e47d3278138929280c4fdcf6053fb0824651474c8e2310c342862fc1aefdf74f55d0a21d78b3c34f32484ec8196b7c5921d72 SHA512 327196bfb833160ae6fb7d12b7d372d031bc0ffbac3455481c1635b01e00f0d5502d4698fbc4f8e7ee59cc3902d56c41261c45d1f1c8f3972e192631f504a0fc
+EBUILD minecraft-server-1.12.2.ebuild 1865 BLAKE2B 5392b409ac7db38a997d5c4218f1de34120215b9732bec6aad610029ac548ffae220d328c98319911d6d89b173daa5296e841499015a94e417fb6baa5e6f462a SHA512 686219de7fecbf02b4f2d4957d5dc048d05aefe4f7ef1aec303896e9184ff1f1c6e4177194436a06a701bd7858816a33855501ec74939d9765f5dad705e8bb5d
+MISC metadata.xml 614 BLAKE2B 78e166781dd7310c6e8a148ba0bc1e36c8e6a21a64587d65b5239f43e7dda4b494b77b254b420e3c1317390debad03ec35847eadbf345aec3c0ba1a6d759f546 SHA512 0deb2afc6cfcfc57351b210f21506ffb5dca43e51aeda268a92781640d8940ce71024ed71a8de249b4ac135da92fd5e741bd8be5e5c00cf0d4b26100b838ac10
diff --git a/games-server/minecraft-server/files/minecraft-server.confd b/games-server/minecraft-server/files/minecraft-server.confd
new file mode 100644
index 000000000000..700498e5aead
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server.confd
@@ -0,0 +1,7 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Java options for your started server
+# You should at least define some memory settings (-Xms, -Xmx),
+# for maximum memory, as the java default is far to low for Minecraft
+MINECRAFT_OPTS="-Xms1024m -Xmx1024m"
diff --git a/games-server/minecraft-server/files/minecraft-server.initd b/games-server/minecraft-server/files/minecraft-server.initd
new file mode 100644
index 000000000000..630c88871d76
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server.initd
@@ -0,0 +1,48 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "minecraft-server" ]; then
+	instance="main"
+else
+	instance="${SVCNAME#minecraft-server.}"
+fi
+
+java="${JAVA_HOME-/usr}"/bin/java
+minecraft_jar="/usr/share/games/minecraft-server/minecraft-server.jar"
+minecraft_logs="/var/log/minecraft-server"
+minecraft_path="/var/lib/minecraft-server/${instance}"
+name="Minecraft Server (World: ${instance})"
+pidfile="/run/minecraft-server.${instance}.pid"
+screen_name="minecraft-server.${instance}"
+start_stop_daemon_args="--chdir ${minecraft_path}"
+
+command="screen"
+command_args="-DmUS ${screen_name} ${java} ${MINECRAFT_OPTS} -jar ${minecraft_jar}"
+command_background="true"
+command_group="minecraft"
+command_user="minecraft"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}"
+
+	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path}"/eula.txt
+	echo "eula=true" > "${minecraft_path}"/eula.txt
+
+	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_logs}"/"${instance}"
+
+	if [ ! -L "${minecraft_path}"/logs ]; then
+		cd "$minecraft_path}" && ln -s ../../../log/minecraft-server/"${instance}" logs
+	fi
+
+	if [ -z ${MINECRAFT_OPTS} ]; then
+		eerror "You must define MINECRAFT_OPTS in /etc/conf.d/minecraft.${SVCNAME}!"
+		return 1
+	fi
+
+	return 0
+}
diff --git a/games-server/minecraft-server/metadata.xml b/games-server/minecraft-server/metadata.xml
new file mode 100644
index 000000000000..45b32f4be812
--- /dev/null
+++ b/games-server/minecraft-server/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Minecraft is a sandbox video game created and designed
+		by Swedish game designer Markus "Notch" Persson,
+		and later fully developed and published by Mojang.
+		This is the headless server for Minecraft.
+	</longdescription>
+</pkgmetadata>
diff --git a/games-server/minecraft-server/minecraft-server-1.12.2.ebuild b/games-server/minecraft-server/minecraft-server-1.12.2.ebuild
new file mode 100644
index 000000000000..5b0f749a4556
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.12.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="The official server for the sandbox video game Minecraft"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://s3.amazonaws.com/Minecraft.Download/versions/${PV}/minecraft_server.${PV}.jar -> ${P}.jar"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-misc/screen
+	virtual/jre"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup minecraft
+	enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft
+}
+
+src_unpack() {
+	# Don't unpack that jar, just copy it to WORKDIR
+	cp "${DISTDIR}"/${A} "${WORKDIR}" || die
+}
+
+src_install() {
+	insinto /usr/share/games/minecraft-server
+	insopts -o minecraft -g minecraft
+	newins minecraft-server-${PV}.jar minecraft-server.jar
+
+	newinitd "${FILESDIR}"/minecraft-server.initd minecraft-server
+	newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
+
+	diropts -o minecraft -g minecraft
+	keepdir /var/lib/minecraft-server
+	keepdir /var/log/minecraft-server
+}
+
+pkg_postinst() {
+	elog "This package provides an init script and a conf file."
+	elog "You don't have to modify those files directly,"
+	elog "but instead you can make a symlink of that init script"
+	elog "and a copy of that conf file."
+	elog "You would do this for every server, you want to setup."
+	elog ""
+	elog "For example, you wan't to setup an world called 'gentoo',"
+	elog "you would do:"
+	elog ""
+	elog "cd /etc/init.d"
+	elog "ln -s minecraft-server minecraft-server.gentoo"
+	elog ""
+	elog "cd /etc/conf.d"
+	elog "cp minecraft-server minecraft-server.gentoo"
+	elog ""
+	elog "After that, make your settings in"
+	elog "/etc/conf.d/minecraft-server.gentoo."
+	elog ""
+	elog "If you don't make a symlink, but use the default scripts,"
+	elog "your world will be called 'main'"
+}