gentoo resync : 19.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-19 14:14:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-19 14:14:48 +0100
commit: 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (patch)
tree: 8f255dfacbacb657e3ac3654d01c1e11e651c066 /games-arcade
parent: 8aebb228036d5e2863b7eaa6e319ab41c1669269 (diff)
58 files changed, 328 insertions, 390 deletions
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 44afbb496f7e..0650d0cdad90 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest
index 6ab9a96f6553..e3a8e1119d30 100644
--- a/games-arcade/amphetamine/Manifest
+++ b/games-arcade/amphetamine/Manifest
@@ -1,7 +1,6 @@
 AUX amphetamine-0.8.10-64bit.patch 2708 BLAKE2B 6abc82e1758000b1fbb3e930f51873026a9e6ab0c1558b2f793a9fad75d240b5c31fec6d69f7144a9c3a91eca809fca6860fdb72a1211b8aefd0d4d64480774a SHA512 8216a5b59c52488f35416295256087771c82e8996787e74d03d416829b628267d17b47cc5f6d7bae2ff87b442bdb38aec4f78f14cd130fb045f5c8272f6b4c9d
 AUX amphetamine-0.8.10-bugs.patch 1821 BLAKE2B 3b0870cecaa55879da3d5107e2c23d7c972e49b1289519b2107fa0da48376c562364b8d4c632812dd20a80e4e6a02fc9ddd157aa8e104a3a8e097f238c422ae9 SHA512 30cc93031152e3f244a30cb56430b451ddfb8ccfddde0fc6cd681cbc6bf0ffb4d4801df642b5330fc1462d68cb0fc3e8d8f97f7e4dc87925b5335f5b1707ff8e
 AUX amphetamine-0.8.10-build.patch 700 BLAKE2B d63c5a73f065f181a6673feb3d90e852e85befb51446ac003eca6ea6076caa36cbd911ac0e33064b5aa549c9ffee8264c5a31a34bfa7ecc659f8c07687d12130 SHA512 c79c133bb6acfc666e557e09b0ca3b556203331d167b5266217a19880b5af2101776b651a420a81b53fc4fbf790de221d0b758979955632230226581dfa30ced
-AUX amphetamine-0.8.10-etc.patch 3838 BLAKE2B 0aa89ad89f0131db3fcb8c7935b2350cfa690d50d61b538fc29d859c8c8dd029b24ebc3036a214c7ce84ec83b2af137bc572e041a5f95fbfe578b7c264a6c234 SHA512 a1afaf30fdd86dfb518bb370b65c46ae4bf46b3acd4a81767f557b93b0a60983ac880b7082240c14c7b551263af116c4f26880ab7fe2bde5ca8f599e82ef1d2e
 AUX amphetamine-0.8.10-missing-headers.patch 457 BLAKE2B 00c50c928487ff0e8fc4bf1c707d77b6ab28b064a9682e1d7f086e6b0555868c662dd68d5b474dca6346a23eb9bc91620b3f92ce18a6e7f0be597c14b41e0c5d SHA512 1f95ac463f600b0e3812afba10682657cdd8b95dd1e77f6a2fb93af7dab60fcb85c85e60613ee4c93421faf7492ca4663d2c94bc96172c52913effe63d259523
 AUX amphetamine-0.8.10-newline.patch 11906 BLAKE2B bf505f9f51d800b6b99b4a80d9c8cd30a91c97262e7984f371be16044328475ba5905145297019bc411c5c1394a81ee2c3cc3f753af46254cf4269f8e21449fe SHA512 9bb6e300f5c17a4ae2502162c3a7940a9574fcd6c09274454a6170c5b0cfdfdf3e4668d9c6e7876f7ea48119c94e098aef605836c866f8a475d81a15129d28b1
 AUX amphetamine-0.8.10-no-lxt.patch 504 BLAKE2B ab06ee2b2209b293d0a126127c5d0cbc0d51081295d9c53d4805cd386027cd77b94a8c8153c64da6bbf6d4bcf88c0cd79a4730d04d06be4785478ec5b39b8d7b SHA512 6c96aa314cc63de4b3472bfff6e0d0d25407f4f8e8a0974df5d20af9dc44fd95a70974cec3174c642ca01be70223c1a1eaea5d300d2026a35805e03e65028207
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch
deleted file mode 100644
index f4ad132dce64..000000000000
--- a/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-description: use /etc/amphetamine for config files
-Index: amphetamine-0.8.10/src/ConstVal.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/ConstVal.cpp	2006-05-15 19:16:56.000000000 +0200
-+++ amphetamine-0.8.10/src/ConstVal.cpp	2006-05-15 19:17:02.000000000 +0200
-@@ -19,7 +19,7 @@
- {
- 	char	levelSetString[11] = "xxLevelSet";
- 	char	levelBkgndString[13] = "xxLevelBkgnd";
--	FILE	*paramFile = fopen(gSystem->QualifyDataDir(kParFileName), "r");  // by LL
-+	FILE	*paramFile = fopen(gSystem->QualifyEtcDir(kParFileName), "r");  // by LL
- 
- 	gConst = new tConstValues;
- 	
-@@ -159,7 +159,7 @@
- 	fclose(paramFile);
- 
- 	// Hier sollte auch im Home Directory gesucht werden...
--	paramFile = gSystem->FindFile(gConst->kFileConfig);   // by LL
-+	paramFile = fopen(gSystem->QualifyEtcDir(gConst->kFileConfig), "r");  // by LL
- 	
- 	gConfigData->leftKey = GetLongConstant(paramFile, "LeftKey");
- 	GetStringConstant(paramFile, "LeftKeyText", gConfigData->leftKeyText);
-@@ -212,6 +212,7 @@
- 	char	c = 0;
- 	short	n;
- 
-+	key[0] = '\0';
- 	fseek(f, 0, SEEK_SET);
- 
- 	while (strcmp(key, constName)) {
-Index: amphetamine-0.8.10/src/Gui.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Gui.cpp	2006-05-15 19:16:56.000000000 +0200
-+++ amphetamine-0.8.10/src/Gui.cpp	2006-05-15 19:17:02.000000000 +0200
-@@ -688,7 +688,7 @@
- 
- void	CGUI::LoadMessages()
- {
--	FILE	*f = fopen(gSystem->QualifyDataDir(kParFileName), "r");   // by LL
-+	FILE	*f = fopen(gSystem->QualifyEtcDir(kParFileName), "r");   // by LL
- 	char	msgString[6] = "msgxx";
- 	short	n;
- 
-@@ -724,7 +724,7 @@
- 
- void	LoadGUIParameters()
- {
--	FILE	*f = fopen(gSystem->QualifyDataDir(kParFileName), "r");  // by LL
-+	FILE	*f = fopen(gSystem->QualifyEtcDir(kParFileName), "r");  // by LL
- 
- 	gGUIConst = new tGUIConstants;
- 
-Index: amphetamine-0.8.10/src/System.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/System.cpp	2006-05-15 19:16:56.000000000 +0200
-+++ amphetamine-0.8.10/src/System.cpp	2006-05-15 19:17:02.000000000 +0200
-@@ -143,6 +143,14 @@
- 	return tmp;
- }
- 
-+char *CSystem::QualifyEtcDir(const char *fname)
-+{
-+  	char *tmp = new char[strlen(etcDir)+strlen(fname)+2];
-+  	sprintf(tmp, "%s/%s", etcDir, fname);
-+  
-+  	return tmp;
-+}
-+
- void CSystem::GetHomeDir()
- {
- 	char *tmp;
-@@ -169,7 +177,9 @@
- 	GetHomeDir();
- 	dataDir = new char[strlen(INSTALL_DIR)+1];
- 	strcpy(dataDir, INSTALL_DIR);
--	
-+	etcDir = new char[strlen(ETC_DIR)+1];	
-+  	strcpy(etcDir, ETC_DIR);
-+  
- 	char	*logFileName = QualifyHomeDir(kLogFileName);
- 
- 	logFile = fopen(logFileName, "w");  // by LL
-@@ -180,6 +190,8 @@
-     if ( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO) < 0 ) {
-        MSG("SDL_Init_Failed.");
-        MSG(SDL_GetError());
-+       /* Ouput to stdout too. */
-+       printf("SDL_Init_Failed: %s\n", SDL_GetError());
-  
-        exit(1);
-     }
-Index: amphetamine-0.8.10/src/System.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/System.hpp	2006-05-15 19:16:57.000000000 +0200
-+++ amphetamine-0.8.10/src/System.hpp	2006-05-15 19:17:02.000000000 +0200
-@@ -16,6 +16,10 @@
- #define INSTALL_DIR  "/usr/local/games/amph"
- #endif
- 
-+#ifndef ETC_DIR
-+#define ETC_DIR "/etc/amphetamine"
-+#endif
-+
- #if SDL_BYTEORDER == SDL_LIL_ENDIAN
- #undef __BIG_ENDIAN__
- #else
-@@ -76,6 +80,7 @@
- 	RGBcolor	*palColors;
- 	char		*homeDir;
- 	char		*dataDir;
-+  	char		*etcDir;
- 	int			workingSound;
- 
- //"""""""""""""""" System Stuff
-@@ -107,8 +112,10 @@
- 	void	GetHomeDir();
- 	char	*QualifyDataDir(const char *fname);
- 	char	*QualifyHomeDir(const char *fname);
-+  	char	*QualifyEtcDir(const char *fname);
- 	void 	ScreenShot();
- 	FILE 	*FindFile(const char *fname);
- };
- 
- #endif
-+
diff --git a/games-arcade/asteroid/Manifest b/games-arcade/asteroid/Manifest
index a62cbfbafe9d..7b1e2cb6bc27 100644
--- a/games-arcade/asteroid/Manifest
+++ b/games-arcade/asteroid/Manifest
@@ -1,4 +1,4 @@
 AUX asteroid-1.2.1-libm.patch 956 BLAKE2B c9d29ea30deb543bb0358ca4dfcc65eb94c9912022849e073d17f9057b1882de18b55a89d0ce8814623ab8ed2b7c36ff657523972c4889f19571936d73ec8f78 SHA512 d421eae4fc4ee5e7f5c00b5e6797f10e17030632a6224ed847d82e19b09e7dcac74d4fa84a19812eeeed9add4af3228f18e4d457b683a3adf73ed62d2671ca22
-DIST 1.2.1.tar.gz 307596 BLAKE2B c3f5363a0939cc4644425adfa9c3f2ca47ec04ae1beb9dd381fba912ee5e9d3330727fa82d4749b4f6402254988feaaaaef10f7f72aeea691656a1dd188ad5e2 SHA512 a88e0b85264d72bd40add0f3fc8b2b727b1acc0c190de6a60d4e1c79adcc484b17d0ed3537309b704667a6617f387219144cbec93df4fbff585d1237a9823b37
-EBUILD asteroid-1.2.1.ebuild 578 BLAKE2B 29537c18ba3d4d3a8404654afe21a90da28cf3779431805f3babd089ace473004c5afda39ffb8ed2342b5a009742bf25dda6a46485ec938e22a37a3c10f88633 SHA512 1168c4c64d2f67aa459e5d11f841d5998bb2cc7c7bf3b3457a8982ba04aea74113f453b26db3c73dd02f0fb3d94fc06234aeff51bb840df6e23685a5b13d8dc1
+DIST asteroid-1.2.1.tar.gz 307596 BLAKE2B c3f5363a0939cc4644425adfa9c3f2ca47ec04ae1beb9dd381fba912ee5e9d3330727fa82d4749b4f6402254988feaaaaef10f7f72aeea691656a1dd188ad5e2 SHA512 a88e0b85264d72bd40add0f3fc8b2b727b1acc0c190de6a60d4e1c79adcc484b17d0ed3537309b704667a6617f387219144cbec93df4fbff585d1237a9823b37
+EBUILD asteroid-1.2.1.ebuild 593 BLAKE2B 1348f0d27b03faa94045350aa47f6afebd3b55bd29fbe4dfd20135afc760e3b74175c6b000a21bff4525a54f620b0d950f8ea6381be2d902d1a34b1a3d1043ef SHA512 a1cd6c861856e8421fee6461272f1c19532edfa1c40d68edc664b293dca267c61cf469531d1f9b912e069ca0c387b08d20fdad17ce8ae2e88073a777a82eac24
 MISC metadata.xml 334 BLAKE2B 651b210093aa77df8209cebb3e4cdb6c03064453e3ac2fa2f974388cdd8102cd2ab548d4b88bbb18052321360edf0d395395fb36e6c2ba1ce038932046c165c9 SHA512 e69632cf70047993dd2924f1bc7c42b428f6e2059482708c2b5cd72ae90263c11b76d4846c457d7f597dbff01ca6bb8296c2cff3e859551a9f5f57ea5ed7c794
diff --git a/games-arcade/asteroid/asteroid-1.2.1.ebuild b/games-arcade/asteroid/asteroid-1.2.1.ebuild
index ea62603c655c..b9ac3b5e3501 100644
--- a/games-arcade/asteroid/asteroid-1.2.1.ebuild
+++ b/games-arcade/asteroid/asteroid-1.2.1.ebuild
@@ -6,7 +6,7 @@ inherit cmake-utils
 
 DESCRIPTION="A modern version of the arcade classic that uses OpenGL"
 HOMEPAGE="https://chazomaticus.github.io/asteroid/"
-SRC_URI="https://github.com/chazomaticus/${PN}/archive/${PV}.tar.gz"
+SRC_URI="https://github.com/chazomaticus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/games-arcade/excido/Manifest b/games-arcade/excido/Manifest
index 7bf81ffae37d..72a7e6885287 100644
--- a/games-arcade/excido/Manifest
+++ b/games-arcade/excido/Manifest
@@ -1,5 +1,5 @@
-AUX excido-0.1.5c-build.patch 1029 BLAKE2B 3237a540fe2451031d58a853d8f6b951a0d5944cf1a6536a4fa16384f234e3f626b068061f50895d1b8d6904c5a8e3eeb987a1db2d9b7dca53a8a3eed2449048 SHA512 333b34063e3480a80a11af39585fcaa8a203ed3add332f24a57614b96ee64fa06c85158fc62d5ce5bf04ea148bdefceed525e77c6a4949da855e2c34ea023b32
-AUX excido-0.1.5c-freealut.patch 1200 BLAKE2B 093bdc12da98c8b394eba0bfb20a62516587e5a45f373343601fc0be6b1e5766b9187243e255fbef24dd906529c3e3a3483502f97254252d96aecb3533399c0b SHA512 137f05ed46d3608f8cf773d35389fe914219207a7d36de4d355da93c5d2bc6ea03a802fb00c9f9f4c8429ba2922728597bfff30afb90c03d5712c8f509b1e4c6
+AUX excido-0.1.5c-build.patch 1033 BLAKE2B 171f87f9c08d51969af8e9171bbae2b177192afb9dad0dcf975fdc4a50ccfc961d5caa055830b929beadc3120f0a627c638371125ca93b4b8b642d4b3b1321d2 SHA512 9cd1b44ae83e9cf1171869124866df78f6d9bc2d18d80968937b7edf7d60dedef3cd0451fd3f81406e5b3b36960b3ac8f77032625e1c545f04d70998da8701ab
+AUX excido-0.1.5c-freealut.patch 1204 BLAKE2B 1aa65ee8e91f01be2ed6af6e45d945d81b1d6b5714072701a8b189b30668a7ef430bb08d54c322c487f0748c0112499c32b52273bc94e2746b687acdd9ea6134 SHA512 11c41ba18f2b698fa4eedfb93d670a09ddd6d954d9504903f51f6df23096e3f72f2836193ca35a5aeb6e3524ad887e1cbf0eb879583988dd99b0b4c439997a1c
 DIST excido-0.1.5c-src.tar.bz2 2981629 BLAKE2B 504c21861a4d966400a94ef6733794f72edbf950a84dcd935213244252b771e168f0bb5e21780c90d2cd1a1799cac821a502dbb558ffe6204d4b552e5af465d4 SHA512 9e1b98ed31eac735087f451c466d0e0d1b885ad5336f7994abf8f844b1c27cc24e90048306ffd62864fa5ab2bada6744b4b54991c6eb9b22624af20c645e02d7
-EBUILD excido-0.1.5c-r2.ebuild 848 BLAKE2B ebf7cefbaa9efa941d3e098c277ba2970936abb62b5b1f0d2b20513cea3fa4328f2aa2d2d5d38f70a5fdd4460d92c289bf515d2c10e41b437ecafe69ab3faffc SHA512 81e0369b8244430b8d101403994f42cd3a1faf5b9a0a4887005e3b3d5ec3b3635bf20540d811baaecaffc543c5e7ee23a6780e78226670effa5bd4860949ef41
+EBUILD excido-0.1.5c-r3.ebuild 789 BLAKE2B d4e7146161ecd604ff845b2de8b97e34633860cc38e32bf2e07b936db3dcaf79ab52b9e2ecee8a023fdbf07c0c11a8ac7008a979bbc8b82ad9ce063cd16966b1 SHA512 ace3ee24dbc3155db5f276922b1b5d570f0b15288711312711e9a7fb9bae8031c6e665673d005714807ddfcbf7fb799f58b78a0ac0fe28dbe8be271e8d04ee5a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/excido/excido-0.1.5c-r2.ebuild b/games-arcade/excido/excido-0.1.5c-r3.ebuild
index 9f307bcec04c..cea4558b0b61 100644
--- a/games-arcade/excido/excido-0.1.5c-r2.ebuild
+++ b/games-arcade/excido/excido-0.1.5c-r3.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 DESCRIPTION="A fast paced action game"
 HOMEPAGE="http://icculus.org/excido/"
@@ -20,23 +20,21 @@ DEPEND="dev-games/physfs
 	media-libs/sdl-image[png]
 	media-libs/openal
 	media-libs/freealut"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-freealut.patch \
-		"${FILESDIR}"/${P}-build.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-freealut.patch
+	"${FILESDIR}"/${P}-build.patch
+)
 
 src_compile() {
-	emake DATADIR="${GAMES_DATADIR}"/${PN}/
+	emake DATADIR=/usr/share/${PN}/
 }
 
 src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin ${PN}
+	insinto /usr/share/${PN}
 	doins data/*
 	dodoc BUGS CHANGELOG HACKING README TODO \
 		keyguide.txt data/CREDITS data/*.txt
-	prepgamesdirs
 }
diff --git a/games-arcade/excido/files/excido-0.1.5c-build.patch b/games-arcade/excido/files/excido-0.1.5c-build.patch
index 779d9c3f4066..1735b51ccdfc 100644
--- a/games-arcade/excido/files/excido-0.1.5c-build.patch
+++ b/games-arcade/excido/files/excido-0.1.5c-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,8 +1,8 @@
 -CC=g++
 -CFLAGS=`sdl-config --cflags` #-g -Wall #-O2
diff --git a/games-arcade/excido/files/excido-0.1.5c-freealut.patch b/games-arcade/excido/files/excido-0.1.5c-freealut.patch
index d0538083af1f..c29999fae25d 100644
--- a/games-arcade/excido/files/excido-0.1.5c-freealut.patch
+++ b/games-arcade/excido/files/excido-0.1.5c-freealut.patch
@@ -1,5 +1,5 @@
---- src/SoundCore.cpp
-+++ src/SoundCore.cpp
+--- a/src/SoundCore.cpp
++++ b/src/SoundCore.cpp
 @@ -352,32 +352,13 @@
  
  	PHYSFS_close(filehandle);
diff --git a/games-arcade/fishsupper/Manifest b/games-arcade/fishsupper/Manifest
index e452ef36b7e7..03add5472e32 100644
--- a/games-arcade/fishsupper/Manifest
+++ b/games-arcade/fishsupper/Manifest
@@ -1,6 +1,6 @@
-AUX fishsupper-0.1.6-asneeded.patch 293 BLAKE2B bcfb9c6252b359468bb6cb04ef021907cc440ddd618a70d45a8df16cf9f5d4b55405daee25b1225143c602fc961232f3fc4eded048f0144d412728d7d773bf19 SHA512 984e73390e46a826ac0a0ae5da653123587ccc2b59b489bd78b46c18bab1c719617ddce1f75d4747da5b8fb03092ed8f33f9a8cefa1b44c658adc2b15957b305
+AUX fishsupper-0.1.6-asneeded.patch 297 BLAKE2B 18b749a0e6733ee92bbe38ef2fd65fc5acfdb440ccbce23c0d1ae78d7b3f7601ebd3c6f23d5fdd89cd95caac11a9acea2a217b1ef6bd0f1e938d49d7c0735311 SHA512 934d5a308ae6c25e34e437c773ed71d12ac146555848a21855116a848768edd8c4e30e1d789c20a75e8c89f2b5a586c75d9ef122a70e83206848919c7c275be5
 AUX fishsupper-0.1.6-gcc6.patch 1730 BLAKE2B 41317933789d096b9b00a184e15df47b8daf946e9730e6688895497a94bf3efe7d96adf1a39b016dd9874b97a2721472fe98650732689464283495e817d76223 SHA512 9dfaf5c9a5a9554c87e93a3876cb9fb858a638b2ead10a3a10e4c9d8a68fca1608f08c1920d506aa09bc2c965c93ffc748ef3b4e3dad3b24bb86bd1481703d48
-AUX fishsupper-0.1.6-ovflfix.patch 304 BLAKE2B 01fd33957962d1e5fcea20ee8bbc9665c2d3b5e2c2dbaa5a665e05028b1a143873e6b8c4cd2497fe25ee2f18fd6f4f57d1d235692802b1b4adbd4cce46ca0a55 SHA512 ede524e2cbb2cf0cf7432cd438ded055b7fa1dcb03efd2deb17d3cc884c9433cc03e8b4baefc37e675465e3fd6382622654cb5f2b676614291fbd195caafb62f
+AUX fishsupper-0.1.6-ovflfix.patch 308 BLAKE2B 16d9956ad39c518c171a7d99151853329c0fe76a092494a04d0e4f549819fa07f29a4bc01cd0dcfac104c3dc1df9e25c835dec7fb834b8b9ded24b742e56dda9 SHA512 75501a6ca44c510d73859d4339ee041e71dd3d0bbde3e071cfe438b014b515e868e8788d14ddef461b6402c8ef6c67c14bc3ad94e9a06a553c3aadbba602013a
 DIST fishsupper-0.1.6.tar.gz 1136893 BLAKE2B f07e5cc8fcfef4547fe2af029db1472ab0299fb5267e8f3a4fb29b9aa2cb39115101c217f509f35a4dc81a0e4f6c72f70bb2102c74c7c45981ced4e50230cd5c SHA512 a6b3df47010e8ac186ff4446db3659fd9173e9e3fc973ab376eed46da9cd13f7a4c0c02b25f3427232252e7fe5728036fa91ea773affe0948387a56f617fc7af
-EBUILD fishsupper-0.1.6.ebuild 843 BLAKE2B 331fc5591ddc3ebfc8431b7be8fa9c9ac3adedf5a5441838cc5a11b3dc1dc9ba0e037f7fff10a61ffc4f5d9e6815546c3cdd9d86211b5f7ae6ebc27cea753da7 SHA512 2a31b686d6fe56cb994d95d76de151e897131681898e408ce86461daba4cb1d6e800eab0c3e3e4e786fa260c03e84eabff07af7fe2c3045ca1638b40ccfa3aa6
+EBUILD fishsupper-0.1.6-r1.ebuild 835 BLAKE2B 47a77e1bbbd699277c5c29f9909041d613f4ef08d880f3babe1a1d8189b476c91e719dbc407cc83f6439c85f7b9592c59a550e3dbc23f4781e068e14495510ca SHA512 6097c550acfb2518cfd78937175a61ea6b3ef461aedf5c5618cb68a1bdccc5807143d33c1bad0df6abfffd0e0cf9aa5f751e240e16ce513b26ae269cbfc2c311
 MISC metadata.xml 333 BLAKE2B de23175a8ff9c7bd8f8e2d59072017d790d2594882ac5963acdf28e4bab252152c01754cf9c3b57122dbc37fc857f2e749bbc52333700d25b43ac4b0b1ecd165 SHA512 6a3a977950808ae8b79c2c34c17fe8e1dd9ae21b9f9a43a2f2808931a4569042825f381d4c10024480eb2e2635893de8433eacf94f5f755d086285e3fe6770b3
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
index 2aba6f099e88..eae5ca15921a 100644
--- a/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am.old	2012-06-24 18:47:58.947143638 +0200
-+++ src/Makefile.am	2012-06-24 18:51:35.738921904 +0200
+--- a/src/Makefile.am.old	2012-06-24 18:47:58.947143638 +0200
++++ b/src/Makefile.am	2012-06-24 18:51:35.738921904 +0200
 @@ -1,7 +1,7 @@
  AM_CPPFLAGS = -DPKG_DATA_DIR=\"$(pkgdatadir)\" \
  			  @SDL_CFLAGS@ \
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
index 4d5185dae7e9..2be91b65a16d 100644
--- a/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
@@ -1,5 +1,5 @@
---- src/main.cpp.old	2012-06-24 18:35:27.661894094 +0200
-+++ src/main.cpp	2012-06-24 18:35:41.041954632 +0200
+--- a/src/main.cpp.old	2012-06-24 18:35:27.661894094 +0200
++++ b/src/main.cpp	2012-06-24 18:35:41.041954632 +0200
 @@ -293,7 +293,7 @@
      
      if (!ok)
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild
index afde34992919..e73b4a0b1d7d 100644
--- a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
+++ b/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools games
+EAPI=6
+inherit autotools desktop
 
 DESCRIPTION="A simple arcade/puzzle game, loosely based on the retro classic Frogger"
 HOMEPAGE="https://sourceforge.net/projects/fishsupper/"
@@ -13,15 +13,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/libsdl[sound,video,opengl,X]
+RDEPEND="
+	media-libs/libsdl[sound,video,opengl,X]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[wav]
-	virtual/opengl"
+	virtual/opengl
+"
 DEPEND="${RDEPEND}
-	dev-libs/boost"
+	dev-libs/boost
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ovflfix.patch \
+	default
+	eapply "${FILESDIR}"/${P}-ovflfix.patch \
 		"${FILESDIR}"/${P}-asneeded.patch \
 		"${FILESDIR}"/${P}-gcc6.patch
 	eautoreconf
@@ -31,6 +35,4 @@ src_install() {
 	default
 	newicon data/images/fs_sprite_042.png ${PN}.png
 	make_desktop_entry ${PN} "Fish Supper"
-
-	prepgamesdirs
 }
diff --git a/games-arcade/frozen-bubble/Manifest b/games-arcade/frozen-bubble/Manifest
index e89ae885cbd5..7c1cff27837b 100644
--- a/games-arcade/frozen-bubble/Manifest
+++ b/games-arcade/frozen-bubble/Manifest
@@ -1,4 +1,5 @@
-AUX frozen-bubble-2.2.1_beta1-Werror.patch 730 BLAKE2B 8c7cca21dde03058a42fca345468cbbeceaff13d69ef976922c0ba04833682e069eeb1056475b8cd349da19eca9f71162c070313b593867ecd27687f1fefbc4a SHA512 f415e02ce8a048922e12172ad4e8ac7a36f0d9daed59b15f7781eba233a1e7de6cf5e0a23311ad10294cf1a481af6ea2f92fa039dc55e7c4d9d90b8772ee9a1b
+AUX frozen-bubble-2.2.1_beta1-Werror.patch 734 BLAKE2B fae9324386d2b0a185dc201970a7157bd2effee029f220ec4d0fc3e502fc712182a4edef0c02cbe0a59809c359ba6ccb70ee235837f4cafecb5950f2583ee1d5 SHA512 37f9f3f6e070a1f7af818f36ab2f9fb542937bd8034a42d962f34c80011b5c9f7fbef94b4ff065ca8a732e5a78615968108637c09a63c775518d9b7ebeea1b2e
+AUX frozen-bubble-2.2.1_beta1-fix-buffer-size.patch 2787 BLAKE2B fa2194d333263f3b521d971c95498d86838bf1188bf4d049a52a83d9afb6e42debd6736c021e35859b11a1283612eecd468ae81fddc4a3331b55a79e6bd47c90 SHA512 413012993a3f9cf16f4db1b66dec1b87c5a62c5b8e8fabb9d4bd689dea935e71ce9c12b213cd0687f2d6f106828d90486d84258385da778122ad6c8e6a61e23c
 DIST frozen-bubble-2.2.1-beta1.tar.bz2 22424798 BLAKE2B 70d23961c45e10cca38afcd7bdbf407dcefde1248af87df7768fe99fc0d926740096942007ba871d57db6095f3ca4bfa126f30ab60514ba3c6eb5fb7759d96aa SHA512 a5d1432195bc41b2823678986fe71223acf5c740636a871758e6337072c74a84bca7aa7088af7b299586e4e261521ae0b3341805692ab684d93e85f52174b1ac
-EBUILD frozen-bubble-2.2.1_beta1.ebuild 1801 BLAKE2B f3993b4697a070d60db603b655a10611ce6c26b86f4d5ea25adad0556318a86a72dc7efb1ba9262419c31ce7099291a751affc58e645a16ed9bd2d43ed74c64f SHA512 52900945b02dc4f6ef550863f4ba519667beb99e9b46924eb1b1926062a540b73ed1c5f6c4b9a07657c7aecf8a1783f3ee40765db1c0a76666fe2c79f1fe62b2
+EBUILD frozen-bubble-2.2.1_beta1-r1.ebuild 1714 BLAKE2B 31329a6a2f4e350ca79f67b5ac1800318127a4a4b88bb84ec2775a141fbfa943cec9e8625a7b725227a4fbdb43d6e43c7f9595cf643724c5709d6f4d6f9f4066 SHA512 aaf0b5701a8a8a79bb306fa34cf24b2d665c604fbbb885940704618c38bbe449259f0f5a3529c7d26fab5816b795a473d9ec8c194e6cb4ba5e5c3036909f92cc
 MISC metadata.xml 540 BLAKE2B 63ce258abd43c328f0837722d96017f63013cf9135e33e0767a5bd2998d24133d3600ea8cd71d1a51bf5a6b80fa07073874d1f28b9168c36671f15ab72af56ae SHA512 71aabe570ce8682e1d3b9ee9fc2c8c9efd06eef8f33623310180e811fbf06b4a9d0456cf2ea78bda6cbd69a208f8abf1dac3855bcbf41aa121b7acbb4ba33ccc
diff --git a/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-Werror.patch b/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-Werror.patch
index d891d8e71a63..0573e50fee94 100644
--- a/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-Werror.patch
+++ b/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-Werror.patch
@@ -2,8 +2,8 @@ From: Julian Ospald <hasufell@gentoo.org>
 Date: Sun Feb 10 14:48:58 UTC 2013
 Subject: remove Werror compiler flag wrt #456654
 
---- inc/My/Builder.pm
-+++ inc/My/Builder.pm
+--- a/inc/My/Builder.pm
++++ b/inc/My/Builder.pm
 @@ -123,7 +123,7 @@
              push @ofiles, $cbuilder->compile(
                  source               => catfile($server_directory, $cfile),
diff --git a/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-fix-buffer-size.patch b/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-fix-buffer-size.patch
new file mode 100644
index 000000000000..b1b3bfcb1edb
--- /dev/null
+++ b/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-fix-buffer-size.patch
@@ -0,0 +1,69 @@
+From aa2ce32185b4477e659ed7c70d09c440610ef67b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 2 Feb 2018 12:44:15 +0100
+Subject: [PATCH] Fix buffer size when formatting current date
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gcc-8 and glibc-2.26.9000 reports this error:
+
+server/log.c:64:54: error: '%03d' directive output may be truncated writing between 3 and 11 bytes into a region of size between 0 and 49 [-Werror=format-truncation=]
+     snprintf(current_date, sizeof(current_date), "%s.%03d", buf, (int)(1000 * (time-seconds)));
+                                                      ^~~~
+
+This patch fixes two mistakes in the get_current_date() function:
+
+First strftime() can fail and then buf content is undefined. The patch
+makes sure the buf content is properly null-termited.
+
+Second if strftime() uses up the the whole buf array, no space will be
+left for appending miliseconds to current_date value in the subsequent
+snprintf() call. The patch increases current_data size so that things
+will always fit.
+
+In reality, all this should not matter because sane strftime() will
+return fixed-lenght string. But for all the cases and for sake of the
+compiler check this patch should be applied.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ server/log.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/server/log.c b/server/log.c
+index 2fe7b7c..f696752 100644
+--- a/server/log.c
++++ b/server/log.c
+@@ -52,15 +52,17 @@ double get_current_time_exact(void)
+     return (double) now.tv_sec + now.tv_usec / 1e6;  // bad bad idea to use float as precision is not down to the seconds then
+ }
+ 
+-char current_date[50];
++char current_date[70];
+ char* get_current_date(void) 
+ {
+     struct tm * lt;
+     char buf[50];
+     double time = get_current_time_exact();
+     time_t seconds = (time_t)time;
++    size_t length;
+     lt = localtime(&seconds);
+-    strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", lt);
++    length = strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", lt);
++    buf[length] = '\0';
+     snprintf(current_date, sizeof(current_date), "%s.%03d", buf, (int)(1000 * (time-seconds)));
+     return current_date;
+ }
+diff -up frozen-bubble-2.2.1-beta1/server/log.h~ frozen-bubble-2.2.1-beta1/server/log.h
+--- frozen-bubble-2.2.1-beta1/server/log.h~	2010-08-07 15:36:27.000000000 +0200
++++ frozen-bubble-2.2.1-beta1/server/log.h	2018-02-08 14:09:52.472451694 +0100
+@@ -23,7 +23,7 @@
+ time_t get_current_time(void);
+ double get_current_time_exact(void);
+ 
+-extern char current_date[50];
++extern char current_date[70];
+ char* get_current_date(void);
+ 
+ enum output_types { OUTPUT_TYPE_DEBUG, OUTPUT_TYPE_CONNECT, OUTPUT_TYPE_INFO, OUTPUT_TYPE_ERROR };
diff --git a/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1.ebuild b/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r1.ebuild
index e6a4b39557a4..9315ab5159ba 100644
--- a/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1.ebuild
+++ b/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-MY_P=${P/_/-}
-inherit eutils gnome2-utils perl-module toolchain-funcs games
+EAPI=6
+MY_P="${P/_/-}"
+
+inherit desktop gnome2-utils perl-module toolchain-funcs
 
 DESCRIPTION="A Puzzle Bubble clone written in perl (now with network support)"
 HOMEPAGE="http://www.frozen-bubble.org/"
@@ -14,8 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.12
-	>=dev-libs/glib-2
+RDEPEND="
+	>=dev-lang/perl-5.12
+	dev-libs/glib:2
 	>=dev-perl/Alien-SDL-1.413
 	dev-perl/Compress-Bzip2
 	dev-perl/File-ShareDir
@@ -29,19 +31,22 @@ RDEPEND=">=dev-lang/perl-5.12
 	media-libs/sdl-ttf
 	virtual/libiconv
 	virtual/perl-Getopt-Long
-	virtual/perl-IO"
+	virtual/perl-IO
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-perl/Locale-Maketext-Lexicon
 	virtual/perl-ExtUtils-CBuilder
 	virtual/perl-ExtUtils-ParseXS
-	dev-perl/Module-Build"
+	dev-perl/Module-Build
+"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	perl-module_src_prepare
-	epatch "${FILESDIR}"/${P}-Werror.patch
+	eapply "${FILESDIR}"/${P}-Werror.patch
+	eapply "${FILESDIR}"/${P}-fix-buffer-size.patch
 }
 
 src_configure() {
@@ -54,10 +59,6 @@ src_compile() {
 
 src_install() {
 	mydoc="AUTHORS Changes HISTORY README" perl-module_src_install
-
-	dodir "${GAMES_BINDIR}"
-	mv -vf "${D}"/usr/bin/f* "${D}/${GAMES_BINDIR}" || die
-
 	newdoc server/README README.server
 	newdoc server/init/README README.server.init
 
@@ -67,17 +68,13 @@ src_install() {
 	done
 
 	make_desktop_entry ${PN} Frozen-Bubble
-
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-arcade/funnyboat/Manifest b/games-arcade/funnyboat/Manifest
index 01b115cd2606..5687f30dd70e 100644
--- a/games-arcade/funnyboat/Manifest
+++ b/games-arcade/funnyboat/Manifest
@@ -1,3 +1,3 @@
 DIST funnyboat-1.5-src.zip 3839990 BLAKE2B 30576f2bb20a236d518a5aca1b173d0e6f876a8411eef87d85950059536b3c6f1801b6f5a498d854ce6f390911ecc3a604f3c9bd438692943721b064f9c6d708 SHA512 7d38070e73825602d6f0a82e810fe8937fe919ce12f6e802ee25147ca1a2333c2b90821d92e20b8e071070505099bf9ec562e8c7b8cd8d241c3021b840e707cc
-EBUILD funnyboat-1.5-r1.ebuild 1168 BLAKE2B cd93563435fb213c165b0717b1195a4c8d26a565dad804dfe43089320d9ac91463bb4ec48ca60737a66897f80dd3c0b89d39556a0d168df1fda417ef97d292d1 SHA512 d0d1567697fd38dcdb765e604d49b1ab2f92d97adb0a644e80cdc5044e2aa7a2733a61c101b0bb1f0134d1f52d0b42d3cf06dd78b888ac26fd8ece49b4013a34
+EBUILD funnyboat-1.5-r2.ebuild 1022 BLAKE2B 4a331176a7aa4fcd8c1499a770bbdf1e72d0250b7d105e919cd78fd57085ead0a28b97d2e8b9f0f30e0c8c825f8c7837fc646a68b1e4b0138527c774149e2d13 SHA512 ac6255baed93c06813c03ccd503a79e6085bbf693488574491369b191a57bafe56703665613d6c9e696760a332b702a4df05c2e7d8fa162928ec1af154058bb8
 MISC metadata.xml 332 BLAKE2B 0f043d28ad918706a08b16364c276af4e7cb3c7f686d799ccf40e54a673d87eceb011a1c72bff3332ce2ca2a9ea62268365f00c26b5bbc5d1f0f4a367522441f SHA512 840d32294f544c648307a82c390a64aea38a6f2931734e377d576ceff26047d9dbff9486d60b0164570a4826fbd148a5af14528c336aa41c4ad6dd51790095b7
diff --git a/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild b/games-arcade/funnyboat/funnyboat-1.5-r2.ebuild
index fca880216fc6..64866dc95d95 100644
--- a/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild
+++ b/games-arcade/funnyboat/funnyboat-1.5-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit eutils gnome2-utils python-single-r1 games
+
+inherit eutils gnome2-utils python-single-r1
 
 DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
 HOMEPAGE="http://funnyboat.sourceforge.net/"
@@ -21,32 +22,26 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	app-arch/unzip"
 
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
+S="${WORKDIR}/${PN}"
 
 src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r data *.py
-	python_optimize "${ED%/}/${GAMES_DATADIR}"/${PN}
+	python_optimize "${ED%/}"/usr/share/${PN}
 
 	dodoc *.txt
-	games_make_wrapper ${PN} "${EPYTHON} main.py" "${GAMES_DATADIR}"/${PN}
+
+	make_wrapper ${PN} "${EPYTHON} main.py" /usr/share/${PN}
+
 	newicon -s 32 data/kuvake.png ${PN}.png
 	make_desktop_entry ${PN} "Trip on the Funny Boat"
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-arcade/gav/Manifest b/games-arcade/gav/Manifest
index 70fb1ff9a0f8..eb00599926d9 100644
--- a/games-arcade/gav/Manifest
+++ b/games-arcade/gav/Manifest
@@ -1,5 +1,5 @@
-AUX gav-0.9.0-gcc43.patch 201 BLAKE2B 7e5d928ea2cc742149a796b8a3903a7d3aba08fb64507f3d9af1d7c860b8056f2071d63b5550ac88990dcd7c19f7d0bbbcc6d1345c345131b8cecc6b8cf9a57f SHA512 bff9eab5a70eda4927983a073e726f59eb82c8c54cd04fd05f7db498cbb71fba75fbe37b69a6bec5b68ad11a1c32ecaa92b7e45fd0b224b2d51e3261e8c170b0
-AUX gav-0.9.0-ldflags.patch 742 BLAKE2B aafd990b8517ba2d4ef5bdcd43afb5c79a9b95c82894fe6865e5bed5683452e1d71380ddc69bf7589fd6405ecd3018b39746d02508668017499990d594334c1f SHA512 506b26e18cfa34c99759b79fabb3b75abd4ba520de04c2c769cecb65292645faac60b9cc52f96fa4ce90935ad0aacf5bebab4b9a3aa0085b41c4fb516f80aef1
+AUX gav-0.9.0-gcc43.patch 205 BLAKE2B c0f25a3f0eed1ca502a349f212bdc2609404721d500cada1b048459adda9fd4242a1e9fef5e8bb5b31feb944fb643aabbc442c31205e1a888a510d4a1e5fa5af SHA512 bce41254f527e007fb44d8616ab2cfce7f55236bb23cc9d456b8757e7521f38ad2926617a996c9b6677d91cbc3cfcd8eb1c4f43cdf53861d946cd53115761b2b
+AUX gav-0.9.0-ldflags.patch 750 BLAKE2B ef3184794f42513fbe582c48b1b82d0c33b71fb8f72d709ff187ee2f247a509eb332561de786e94c62b64ce0f2ca51a342870365db8eeda82ea04a99f902093d SHA512 95239c11a59311920d255449bb5ed40c962ab331bc705b1107a42d18b6581aa800c7c08562d0887f844bb231c87d639ec087b925f8ffc44a4e20dd63a3fd6a5a
 DIST fabeach.tgz 163750 BLAKE2B d5cf3ef38925515caae67d78bc1623bd1ee5669d1d25d122023bbfe1deb59ef7f12859d4bcac95bc43f3a3c4b88208742b91b3acb73a16945f0e8356059a8e6a SHA512 c0ce8e20a2bece7beeb66a036abcffa1394fcddc0aa255fe244e86548b2c0d7ec4a72a903f2108a44e84590d9986ee6729d67e5ec103b867bbde01772d524978
 DIST florindo.tgz 175052 BLAKE2B 5c03691265fec40b3a20903383f070ccfe8527e06cb18cf5e65f32fcf16d17e8e6e56890790802ffeb9262f9933291a0bb1ca22c38f54cbcd5a00e346b4304b7 SHA512 91a42c209d9370f42a7918ea0b6b63ed9c2dcacdbf3051dc2535293b2e2a9b1b53795a7db476fd5c7b3da9682b5ddaf8a2ceab50bc4bdeefde33416de82197dc
 DIST gav-0.9.0.tar.gz 137729 BLAKE2B 15b27ed4019dd9306e629721e59c075b2189c180cc5b4ec866ce1007578ca9e9f8a85bfcb1d22bb7fecd4a6b39b4c62c48ed7e9268e22475bced8c4c8c925a34 SHA512 e702269371dc8ed4ce4415a24a703ef6c3604af69f2e0c548a48f282d812b4f3f76f74cb36a6036889b9e3628b844d2fa41e2cfde5b0fe647bceadc64c087a9f
@@ -8,5 +8,5 @@ DIST naive.tgz 80169 BLAKE2B c2273b0056194d50ff7499c9440c0dd45175609bcb4ccab9095
 DIST unnamed.tgz 156406 BLAKE2B db88b9863ca309b9b3236dd5940642912cd4a7fd1584b842171b65033f8c47fcc6d0eb9185d3759059f4648442b446c47c0dac21c1cb37a07850703ca04f1996 SHA512 530084b5e49e40447cb68545fb4b01f837e74efa3bfb9a110f13037a7f6c135e23f9ed49837abe918a8b393226f90a2d206e5bfd2f4e60335ebf7bc4e8341673
 DIST yisus.tgz 131021 BLAKE2B b095277fdf33968b2b5d28b2e737a465a09f34b6c570d0bdb7e3be2a0c36d8d0ae4d62d14e427a139e035343faf6b1972677fa94c4aa4b787a3ce79ab3c0a137 SHA512 2494e10998bf73c369e6591edeca4c466dfdba1901ca69d96838e0310eb36c94690b9fd6df3c0aa91e0ac611ec414acf402f532145eb795a43e15406aed4c604
 DIST yisus2.tgz 117923 BLAKE2B 57770e7326cbe203aca03d37411c8f9267e9ebbd3a104d91e5e4519eb22439066bf8ef7a5eb46476103731faf0c9726eda74351c01a5ae50c6265db49409d2e6 SHA512 a063908230e9085536322481bf511cc3f3df3997d27dd83e9f976762670e2bdbebc634c2566549fe856ddc93302422cf8676147937d2cbbcf7262e722c999f4d
-EBUILD gav-0.9.0.ebuild 1604 BLAKE2B f62000760c20a051e009466c8183637969c0cb1d012b496539fff474e81d3f5529d1d2cccfa82cb81ee42cd1297ba0b0bda538edd73305453b316834be9b3764 SHA512 007de01f66132d0de4acc313f754c3e67704c5fb6973f7e6e403c6748f2f755ad00a3f986e2d354174faa59dd179fef6b10031422fb71db11c65728b8926475a
+EBUILD gav-0.9.0-r1.ebuild 1485 BLAKE2B 50430334e0d1ce99ad94ba96222e6a0aafcab743d3a2d95a764400e8074526fb612145d1521b13fb745de490851944df6b16af39675dfd30814dffe6548df5da SHA512 54da3dc7b644b905280dc9a01ad482a091e4a7dce42acc304a21a899bf624de0ccfcf2253e123a4b9c4cef7f6959fd93f87e1d4d184b45a640b354856ca7b734
 MISC metadata.xml 326 BLAKE2B 8975ed6ba9c69a5ca31562e37d19841bd3e8ed53604b2d2dee7d188d510f167d8c154ae1337bf7195cdc9aca9badc3e86bf210e4fdc89016cb8b134660977845 SHA512 be67de8c13d7163c370e9f884dc50665720cd899c4f7d76859734751bf494f561a93fe344f04753180e27c0f854c4020dec2d9611f44d547c7b613aad705d9d7
diff --git a/games-arcade/gav/files/gav-0.9.0-gcc43.patch b/games-arcade/gav/files/gav-0.9.0-gcc43.patch
index 06bc1a5d2542..c9b8a6e588bf 100644
--- a/games-arcade/gav/files/gav-0.9.0-gcc43.patch
+++ b/games-arcade/gav/files/gav-0.9.0-gcc43.patch
@@ -1,5 +1,5 @@
---- Configuration.cpp
-+++ Configuration.cpp
+--- a/Configuration.cpp
++++ b/Configuration.cpp
 @@ -25,6 +25,7 @@
  #include <stdlib.h>
  #include <string>
diff --git a/games-arcade/gav/files/gav-0.9.0-ldflags.patch b/games-arcade/gav/files/gav-0.9.0-ldflags.patch
index 04188320ac4b..dd49e6161660 100644
--- a/games-arcade/gav/files/gav-0.9.0-ldflags.patch
+++ b/games-arcade/gav/files/gav-0.9.0-ldflags.patch
@@ -1,5 +1,5 @@
---- CommonHeader.old	2010-10-12 13:08:23.000000000 +0200
-+++ CommonHeader	2010-10-12 13:08:48.000000000 +0200
+--- a/CommonHeader.old	2010-10-12 13:08:23.000000000 +0200
++++ b/CommonHeader	2010-10-12 13:08:48.000000000 +0200
 @@ -31,9 +31,9 @@
  endif
  
@@ -12,8 +12,8 @@
  endif
  
  SRCS	= 	$(wildcard *.cpp)
---- Makefile.Linux.old	2010-10-12 14:36:47.000000000 +0200
-+++ Makefile.Linux	2010-10-12 14:37:02.000000000 +0200
+--- a/Makefile.Linux.old	2010-10-12 14:36:47.000000000 +0200
++++ b/Makefile.Linux	2010-10-12 14:37:02.000000000 +0200
 @@ -38,8 +38,7 @@
  	$(MAKE) -C $(@D:%_module.o=%)
  
diff --git a/games-arcade/gav/gav-0.9.0.ebuild b/games-arcade/gav/gav-0.9.0-r1.ebuild
index 058dbaf64bc1..d039cac137a7 100644
--- a/games-arcade/gav/gav-0.9.0.ebuild
+++ b/games-arcade/gav/gav-0.9.0-r1.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 DESCRIPTION="GPL Arcade Volleyball"
 HOMEPAGE="http://gav.sourceforge.net/"
@@ -27,19 +27,17 @@ DEPEND="media-libs/sdl-image[jpeg,png]
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
+
 	local d
 
-	epatch "${FILESDIR}"/${P}-ldflags.patch
+	eapply "${FILESDIR}"/${P}-ldflags.patch
 
 	for d in . automa menu net ; do
 		cp ${d}/Makefile.Linux ${d}/Makefile || die "cp ${d}/Makefile failed"
 	done
 
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	sed -i \
-		-e "s:/usr/bin:${GAMES_BINDIR}:" \
-		Makefile \
-		|| die "sed failed"
+	eapply "${FILESDIR}"/${P}-gcc43.patch
 	sed -i \
 		-e "/^CXXFLAGS=/s: -g : ${CXXFLAGS} :" CommonHeader \
 		|| die "sed failed"
@@ -60,10 +58,9 @@ src_compile() {
 }
 
 src_install() {
-	dodir "${GAMES_BINDIR}"
+	dodir /usr/bin
 	emake ROOT="${D}" install
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r sounds
-	dodoc CHANGELOG README
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-arcade/gish-demo/Manifest b/games-arcade/gish-demo/Manifest
index 9e28d0fea357..952d80898446 100644
--- a/games-arcade/gish-demo/Manifest
+++ b/games-arcade/gish-demo/Manifest
@@ -1,3 +1,3 @@
 DIST gish-demo-1.6.tar.gz 12712912 BLAKE2B bb482ba341e688056a45077d6a6832e13e1a9785cbefbb7e76b7875e9df22f33f324a515ca3465bb3f4c4a34d1577b5eddf5ff7793d35556958b3f11d81f9f7f SHA512 2d6f37b8a7971ada524c75bafcbe7e92fd3dbb96677774b0295aad2553e6094027f9b43da8318f20071679412f95dd66ab9738178ffec4f853cf1845d536a0a6
-EBUILD gish-demo-1.6.ebuild 865 BLAKE2B 33e62a6051eb040308e422c8df428c039b0b28cd1573c33d623963d83fd16ace9bb6b0cf14bb371fece5d96e7062a4d2746bb62b574a282d4a6ebee65f571dbd SHA512 f44f08f9e061a5c6dd404a2b60ef92e541b568eae2279c2a1c5d618be93878e14133d81a04e248181dccc8b28779a97ca525d25fd055e2f098ee04b14c1a5de0
+EBUILD gish-demo-1.6-r1.ebuild 853 BLAKE2B 5b61acfa8fe5adc8bd4a13399e10eed2b892a3c5a27de3eed586087aa246c30c84239e4f4f84d6d89590ccc32ee62ea32489eaba819644731ab49c35f0300ba5 SHA512 65d510e99125d1154dbe0b7377428018bbcf660070676a753f23f9f07fc94b4389ac1e2067ce24190e5b86991c307107548174964ba2d95e177284e9f955dc4d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/gish-demo/gish-demo-1.6.ebuild b/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild
index cbfaf9f283bc..1116e16d52ec 100644
--- a/games-arcade/gish-demo/gish-demo-1.6.ebuild
+++ b/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit eutils
 
 DESCRIPTION="Play as an amorphous ball of tar that rolls and squishes around"
 HOMEPAGE="http://www.chroniclogic.com/gish.htm"
@@ -15,22 +15,26 @@ IUSE=""
 RESTRICT="mirror bindist strip"
 QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/gish"
 
-RDEPEND="media-libs/libsdl
+RDEPEND="
+	media-libs/libsdl
 	media-libs/libvorbis
 	virtual/opengl
 	x11-libs/libX11
-	>=media-libs/openal-1.6.372"
+	>=media-libs/openal-1.6.372
+"
+DEPEND=""
 
-S=${WORKDIR}/gishdemo
+S="${WORKDIR}/gishdemo"
 
 src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
+	local dir=/opt/${PN}
 	local gishbin=gishdemo
 	use amd64 && gishbin=gishdemo_64
 
 	insinto "${dir}"
 	doins -r *
 	fperms +x "${dir}"/${gishbin}
-	games_make_wrapper gish ./${gishbin} "${dir}"
-	prepgamesdirs
+	make_wrapper gish ./${gishbin} "${dir}"
+
+	einstalldocs
 }
diff --git a/games-arcade/gnake/Manifest b/games-arcade/gnake/Manifest
index fc4f5baaca04..7269367d211e 100644
--- a/games-arcade/gnake/Manifest
+++ b/games-arcade/gnake/Manifest
@@ -1,3 +1,3 @@
 DIST Gnake.0.94b.tar.gz 6656 BLAKE2B 2b230246b6dbb3ae9dcb3ed1dabf9f49c594180cb4e624e8e7cfb7c36823f64a0c60ec378773fea3fd1af5e036b8df98a3603b648e71f14a8e5523982aad5e83 SHA512 c5fb84cd8dc0a1b88f9eb6139f898515d109e2de0786284a4fa85f5efc0967ef02c2458d0e7f783d31fbd9a41e0f4114f7bd00717042ac9b2ca9ce4dc18e7fb7
-EBUILD gnake-0.94b.ebuild 550 BLAKE2B b3b3be538362bc6f93d15d8acfa3dc904712d496fa6315a8f7e3b7ebc8bed17051cc5e8ba1b58bba69ff79e483fc0d2f42c85302a4017755f7922c3fa8fd18e4 SHA512 8eb5b36b310e507a0f078ee763f237351ae3fb8e20503c063117ff268bded57953239b84909c2a83c773db5d1564b5344a02caf26fb92c93624da903537a9f15
+EBUILD gnake-0.94b-r1.ebuild 519 BLAKE2B c7cc497bd3fb9d48ebb788d08c7c9c2b71dc836dc33f8609eb2bae652e53ae683531d6ccdd8b12e5e6758564d6a78a4411853085a6e999c5cfbadaf9b5894f08 SHA512 4a37dfc20344b12c4b64d7d0d35224ed84a64de1e5b1cbfc42d2615e41101ff2148c67363a55f0c631ac4b8eaf4301cb98d44b2a551c7c0c678ecf0b6aa5c381
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/gnake/gnake-0.94b.ebuild b/games-arcade/gnake/gnake-0.94b-r1.ebuild
index e1e5ccf4a42e..a1cce857258b 100644
--- a/games-arcade/gnake/gnake-0.94b.ebuild
+++ b/games-arcade/gnake/gnake-0.94b-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=6
 
 DESCRIPTION="An ncurses-based Nibbles clone"
 HOMEPAGE="http://lightless.org/gnake"
@@ -15,16 +14,16 @@ IUSE=""
 
 RDEPEND="sys-libs/ncurses:0"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_compile() {
 	emake LDLIBS="$(pkg-config ncurses --libs)" gnake
 }
 
 src_install() {
-	dogamesbin gnake
-	dodoc README
-	prepgamesdirs
+	dobin gnake
+	einstalldocs
 }
diff --git a/games-arcade/gnujump/Manifest b/games-arcade/gnujump/Manifest
index 07bbde4ddc08..c8e64b886727 100644
--- a/games-arcade/gnujump/Manifest
+++ b/games-arcade/gnujump/Manifest
@@ -1,3 +1,3 @@
 DIST gnujump-1.0.8.tar.gz 2508641 BLAKE2B 2e6af8b316cedd37a0d8272ccafe548a62932bfede68bd8debc54d98ce3089c925192ae70f5fe9716fee0a82d3fe6b7cc3b8ca2d506abc2401138b5b7e7032d8 SHA512 fb8a06e17f700ea1e8c264b23a9f286d595cf48cc78efbe60ffdad298bc33ff0ecb2035a1db8281886614fbc8280d2b0c86a2099d55e31bff970f3b3c3caa421
-EBUILD gnujump-1.0.8.ebuild 675 BLAKE2B 638cf80b6cf4e82558c9102333bcd2535f3d0a877b6113018cec820599a8d5db5da4247f58ec412c98f92902a472c8e9fe2ec9090e8f6b2bfbfefed6114ecca3 SHA512 bd0184df5d7452b0febc9102cc5bb507b3460b41b0024000cde8bfada00806734c15aa1485a36512df6b570666cc63a19b99cca0af13f06245325192042ed643
+EBUILD gnujump-1.0.8-r1.ebuild 645 BLAKE2B 5dbdbd10b96b854afb47a197e6fc07cb3129089cc852a04761dbb1e9db2bdfc64a9e988f079272b2e051d9af29bed43e8df4c884644ba1565d80d21da38cadd3 SHA512 ac4c1e29b53b14caa68f636e1da28f16ccfbf94daf8417ecf79ce788cab4e8d10dbcd86d54950e8b5f8f38623f0b19d0fbf0877fbc4aeca409add52083c888c3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/gnujump/gnujump-1.0.8.ebuild b/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
index 5232fcb51fe6..271171a2cf0a 100644
--- a/games-arcade/gnujump/gnujump-1.0.8.ebuild
+++ b/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
@@ -1,8 +1,8 @@
-# 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 flag-o-matic games
+EAPI=6
+inherit desktop flag-o-matic
 
 DESCRIPTION="Xjump clone with added features"
 HOMEPAGE="http://gnujump.es.gnu.org"
@@ -17,19 +17,19 @@ DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
 	virtual/opengl
-	x11-libs/libX11"
-RDEPEND=${DEPEND}
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
 	append-libs -lm
 }
 
 src_install() {
-	DOCS=( AUTHORS ChangeLog README )
 	default
+	einstalldocs
 
 	newicon skins/xjump/hero1.0.png ${PN}.png
 	make_desktop_entry ${PN} "GNUjump"
-
-	prepgamesdirs
 }
diff --git a/games-arcade/grande-KXL/Manifest b/games-arcade/grande-KXL/Manifest
index 5f69cc25fa3c..fa0cf2ff94ed 100644
--- a/games-arcade/grande-KXL/Manifest
+++ b/games-arcade/grande-KXL/Manifest
@@ -1,5 +1,5 @@
 AUX grande-KXL-0.6-cflags.patch 383 BLAKE2B d96520b378f388d5fcedf925ba4dff0d8c3503ae581ca6c6bd68087ebbb64d92a2d019051d15b182f7ef0cb4130ba9e9c45eedea0ec79bc4beb343813e944208 SHA512 2cc4f81ca9e32a8de930dec9f2f0d1b0f8ac8c0eef9267a3495f836f12a1c7e0872ab562050488af1afff5a8fee69c0279f5af74c0c0a385b6603987b5437957
 AUX grande-KXL-0.6-configure.in.patch 403 BLAKE2B 6a2ee0b40456b4b34dc4c6a6eea381686a0327ce636eecdebd13d880ab9982d8a144ca85fa251aa58472654cd331f2c2958d6b7bd69a2e65e4b1f0c05b1cabcf SHA512 0409274244136932a575673a902799725d554dfbac93f3f786b338dd37d3616df3fe02e699efc21b7f82b934d882befcc9978b7ce9618f5b4e0cf891d67c5ae8
 DIST grande-KXL-0.6.tar.gz 240869 BLAKE2B a9109dd37d72ffcfd02b9f160acd89c17d5ae13d53948ecc79718f420cb3826491a6f6b024ca65a12ada76b24110f01a52f502db2de8a736f628eda5c0054a4d SHA512 17916e54b2b2bad25d789bc3d4f182f3f104fd4e5cf7b745bb9613f76ec04a2a3d2740ca89b507ecdb653f1d42b793115e76b5b34d53b96fec3d55574632b980
-EBUILD grande-KXL-0.6.ebuild 704 BLAKE2B f5e20751c18ef477f99800111171fd649a4f45feee264f62b433a956fa6b21a17b2cfe79b3b1537ffae255343c313d382d961ffa4b0399aa2c6611d0c7a97cfd SHA512 66e1d5b1f0324b8f9978e5cc9112ee5cf998f767eebeebe405bc0b0922154ab81036f227d3dd1a69655d04485a82b077111362be64c9fa8068db39dab0338e4d
+EBUILD grande-KXL-0.6-r1.ebuild 683 BLAKE2B 067cef9660c70a50df4f37bf6a3e2ce666abbdde47106506aa7e4e9404e9cecdbdab03e3ee13c8afbd7d4ef9fcf5750796385254c38fcf4156c5cb49571b8aac SHA512 884b21e35ea7be6080bb1d14603b780997151d18bac7757b6fd154c18424cfdea00e308260c9776b5a6e46ded25264ee2842b28378335c65f92d3c9b4a1b2aae
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/grande-KXL/grande-KXL-0.6.ebuild b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
index 83439fb55b63..b256aa384205 100644
--- a/games-arcade/grande-KXL/grande-KXL-0.6.ebuild
+++ b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils games
+EAPI=6
+inherit autotools desktop
 
 DESCRIPTION="ZANAC type game"
 HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
@@ -15,19 +15,20 @@ IUSE=""
 
 DEPEND="dev-games/KXL"
 RDEPEND="${DEPEND}
-	media-fonts/font-adobe-100dpi"
+	media-fonts/font-adobe-100dpi
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{configure.in,cflags}.patch
+	default
+	eapply "${FILESDIR}"/${P}-{configure.in,cflags}.patch
 	mv configure.{in,ac}
 	rm aclocal.m4
 	eautoreconf
 }
 
 src_install() {
-	dodir "${GAMES_STATEDIR}"
+	dodir /var/lib
 	default
 	newicon src/bmp/boss1.bmp ${PN}.bmp
 	make_desktop_entry grande Grande /usr/share/pixmaps/${PN}.bmp
-	prepgamesdirs
 }
diff --git a/games-arcade/holotz-castle/Manifest b/games-arcade/holotz-castle/Manifest
index 6fc98c0bee6a..61fa0df300c8 100644
--- a/games-arcade/holotz-castle/Manifest
+++ b/games-arcade/holotz-castle/Manifest
@@ -1,6 +1,6 @@
-AUX holotz-castle-1.3.14-build.patch 2270 BLAKE2B 9d9422be1f071bbebc98176dbc81175fbb8622a8c4f81fd10d1e604efed3d23d471775e814a463091f5085a248df865a55efedeb83d3807153ac3abdf14f5ace SHA512 f7b51add393949e87e68e5d787e4694b5ab5e8b3d2b403e1d271de1e4bd7d153e5bddb717a0a7f0d0e901cd5ef8820cad6ae8672cfdb41cc174c24f6aab1b8f4
-AUX holotz-castle-1.3.14-gcc44.patch 288 BLAKE2B 1839eddfbe1e0a5a15136a8cac314d16247145a4d2b94111d9c52160e1e26548e9508366746e7b0f072bfa5b21dc81089a9fba4d2609b841c8ef8bce9e1c5148 SHA512 38ae0281ac5a846294708821015030f7aaea059de0d42e1b8c122291f460b8bc80b052586055d8fc4d496e45ae307cb55994d343606e1e0ba95b5772e407ff61
-AUX holotz-castle-1.3.14-underlink.patch 536 BLAKE2B 5b1c42232a86451127903848a036acabe0e4932d37734c18350287961eb162e04126f3d203f34b480747b5d14606fea8292aac887518ee82f9009a669980ed0c SHA512 8f3fd05099235366f112b74a61be5285ceaa05b7c042285199bc21ffe8e674a640abe447af5f7b14e61df40c3e8246ce21259af6be47f84596d1d3331388f71a
+AUX holotz-castle-1.3.14-build.patch 2278 BLAKE2B 1fc9e92fcbce33277a9535becb700d8159db7dd66581efe87ed272399b67c704535422c6d3484d3e7480cb1934aaf5dd2704e401d9a867867817c02827ac540a SHA512 fd19155ff5f372306b987a4998b0ef9a3ae194bdc75c99d5f276cae50910fef5998dfd244c6ca4cae0b33741334d072876bff7710fabf365712531502345d101
+AUX holotz-castle-1.3.14-gcc44.patch 292 BLAKE2B 9a287237f52ef832839280134263a10c95752bdd131dc9340c1b2731c844f1af9e40785f1219816d1ac5bbdfde1e58013de8c960c3db400c50ab23a17bcdeece SHA512 89ea8aa06c23adc21a88031f02da88476e086ab9ee3147bee1a545cbc6a9b631de2d8b504b0b1b3081a3a62c11df7720ac124ceda788518937652f2ca5a2a118
+AUX holotz-castle-1.3.14-underlink.patch 540 BLAKE2B 443ee944d5f92d81fca16dd7d1ed450edb1e8bc9f93e97fc89dc40b30c8e99dcbd7035b20a11868c9575e3af3304369086c07dcbf012a4bc5d4c6cebca298705 SHA512 29d01cd2404018def02cc7bc44afb9752f7b6fe58f1f8dcf01ce6d41865eae663e26fa159206f55a1d70320aaf5a1556012c0fd0199fdb001f9257571b93d46d
 DIST holotz-castle-1.3.14-src.tar.gz 3691364 BLAKE2B 82ec9336410634d5649eaabe55f69b4cce94d983b1713aa2e7472cec59cd7c1b843a4512a2e11b79c74cc869d96259ea9e21e4bd6d88ddbeeaf8437b63ab13b8 SHA512 129f15a51b13bc80ca068b1ec18cc4ae8bb5b80f11f852b81bff4492dab5bf4edbae714fcaafb197cdedf2b079070ab2f8750790b0b1680204ee7520f1d74576
-EBUILD holotz-castle-1.3.14.ebuild 1222 BLAKE2B 838a58c6c28f498240d2250c32eccd77da39f89f802fc7e150ab18bb64bf40f206be39f04f52d8b765572f40f36ae050f1313afcaa03876a6afdeb1e97dfc34f SHA512 c35df7b484a4c3b7f499932a07e47dcbbe37c65df7895f2818fb6efbf0bfc3a8108cfe7ceaae3c4d312e0d73a5ca67936a7ef0de1c37be4de0c5249b84d49f97
+EBUILD holotz-castle-1.3.14-r1.ebuild 1157 BLAKE2B 09579ecdefcdab731b4002fe3421f8da07d4624017bf8be63400eedb35aceebb80d45341b210fd1cee18ae073221fb9acf4333f2933a473b0d365da1686df5ff SHA512 dc67b5ad93ae62a8f93084b72a64905a10555f6672a5af2dc19f3c5c802ced5e6b968daf35585119dfc454049f1be053ccf6285b4bbc8ce8eb7fffc0d6a26283
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-build.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-build.patch
index bb834656601d..cdf814546e1d 100644
--- a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-build.patch
+++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-build.patch
@@ -1,5 +1,5 @@
---- JLib/Makefile
-+++ JLib/Makefile
+--- a/JLib/Makefile
++++ b/JLib/Makefile
 @@ -19,7 +19,7 @@
  endif
  
@@ -29,8 +29,8 @@
  
  .PHONY: install
  install:
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -30,7 +30,7 @@
  
  DEFINES = -DHC_DATA_DIR=\"$(HC_DATA)\" -DHCED_DATA_DIR=\"$(HCED_DATA)\"
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc44.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc44.patch
index 0c3af53591bf..ecf9d5c32de9 100644
--- a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc44.patch
+++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc44.patch
@@ -1,5 +1,5 @@
---- JLib/JLib/Util/JFS.cpp
-+++ JLib/JLib/Util/JFS.cpp
+--- a/JLib/JLib/Util/JFS.cpp
++++ b/JLib/JLib/Util/JFS.cpp
 @@ -887,7 +887,7 @@
  
  		// Si es un directorio lo importa recursivamente
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-underlink.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-underlink.patch
index 2e23b2a40995..efcf379fb129 100644
--- a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-underlink.patch
+++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-underlink.patch
@@ -1,5 +1,5 @@
---- src/Makefile.old	2011-06-22 06:09:53.195025702 +0200
-+++ src/Makefile	2011-06-22 06:10:54.774927134 +0200
+--- a/src/Makefile.old	2011-06-22 06:09:53.195025702 +0200
++++ b/src/Makefile	2011-06-22 06:10:54.774927134 +0200
 @@ -43,7 +43,7 @@
  # Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib.
  # Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
diff --git a/games-arcade/holotz-castle/holotz-castle-1.3.14.ebuild b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
index e6c3106134bb..16ed5d364bad 100644
--- a/games-arcade/holotz-castle/holotz-castle-1.3.14.ebuild
+++ b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs games
+EAPI=6
+inherit desktop toolchain-funcs
 
 DESCRIPTION="2D platform game"
 HOMEPAGE="http://www.mainreactor.net/holotzcastle/en/index_en.html"
@@ -13,34 +13,35 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	virtual/glu
 	media-libs/sdl-mixer
 	media-libs/libsdl
 	media-libs/sdl-ttf
-	media-libs/sdl-image"
-DEPEND=${RDEPEND}
+	media-libs/sdl-image
+"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${P}-src
+S="${WORKDIR}/${P}-src"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-underlink.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${P}-underlink.patch
+)
 
 src_compile() {
 	tc-export AR
 	emake -C JLib
-	emake -C src HC_BASE="${GAMES_DATADIR}"/${PN}/
+	emake -C src HC_BASE=/usr/share/${PN}/
 }
 
 src_install() {
-	dogamesbin holotz-castle holotz-castle-editor
-	insinto "${GAMES_DATADIR}"/${PN}/game
+	dobin holotz-castle holotz-castle-editor
+	insinto /usr/share/${PN}/game
 	doins -r res/*
-	insinto "${GAMES_DATADIR}"/${PN}/editor
+	insinto /usr/share/${PN}/editor
 	doins -r HCedHome/res/*
 	newicon res/icon/icon.bmp ${PN}.bmp
 	make_desktop_entry ${PN} "Holotz's Castle" /usr/share/pixmaps/${PN}.bmp
@@ -48,5 +49,4 @@ src_install() {
 		/usr/share/pixmaps/${PN}.bmp
 	dodoc doc/MANUAL*.txt
 	doman man/*.6
-	prepgamesdirs
 }
diff --git a/games-arcade/insaneodyssey/Manifest b/games-arcade/insaneodyssey/Manifest
index a35226838742..8445079c8599 100644
--- a/games-arcade/insaneodyssey/Manifest
+++ b/games-arcade/insaneodyssey/Manifest
@@ -1,5 +1,5 @@
-AUX insaneodyssey-000311-datafiles.patch 1601 BLAKE2B 3380b1d2fcc5a26a242b0d03004a0fbc162ff2f84f8093b1920c2c2b8b3da676183e6e541c4bc3d614fd30ae86cd8e83108ffdc56e694f487f38e4d6b1b45a7a SHA512 8ad0483bd1b068f8350ccc9f8b3c26f8a3be45c8a6f20dc6bd26f285d7888511f856c4487316a11feb916b7bad862e5c51e8af286d984086678663c8e315a4f4
-AUX insaneodyssey-000311-gcc6.patch 416 BLAKE2B ddb56e283320111872bec4647f1076c5b9ea2b67c19740cd50a39716ca1bd5f55fbf80b9b85f74294dbcfaf41d67d5506b6ce6e5b14ab1d365620bc383d651f3 SHA512 d68dd504a93c4678c2db821e51074bfa17b79a5c6dc4a7c42d5654cb1fb776a0e6d00c118d8d22555068c3d61c1708cf08039900664ecaf51f8967fda558e538
+AUX insaneodyssey-000311-datafiles.patch 1605 BLAKE2B 2418e72f6b74dad8c00b26235ffbb8df1394d90e639994d080be3845c02f7d278c262405682d9c8ca2ac8a15b6dd5695224461fdc13f96b61dc01ea70ed20da4 SHA512 b0a7a32f5463474435e17d56169e7a5f79a624e508df8142760ba24c22625707aa409f2a5381502676a6af86b2857a2db739e36cdb2471cf4a98181e5532be8d
+AUX insaneodyssey-000311-gcc6.patch 388 BLAKE2B 4976b873e3a74992cab91d155a8ab280d689c067cbb6e66944cf8b7a4a0c82c1f0e18fab1f6c3f9339b49fd0d73ef98f4a5382bb60844afe849cde3ef5d7a99b SHA512 7f634c129bcdd1a54ec196792dbfe18b0d26823907efc92c3389b5f3280c8243cd23d8e980744673bb2cabbf7c44203e4b7ec320ebe729300566adf39d6ee1f3
 DIST io000311.tar.gz 839950 BLAKE2B 4974471c69541afcb98764a3bf7c71c72afba7e9301f540eb1af85611bada547e87b491205f9fb9ba41e6e8e52326eb5e0b4cf07bf3d02259280ea6b2e5be162 SHA512 9fbf79daf1886c31a6309036cf382c2e175e3c280d6d5aa822971e977e97227f4290474c272afd7ed8218b2cc7e66b407b37522207b30225a41488201a244d96
-EBUILD insaneodyssey-000311.ebuild 1605 BLAKE2B 0b29e2032eaf077bb5f4705fef64684b4d8536fb06b49af1e4387c9f9a5e6e04347a474a3b144675c824579f57c978b71c2a90f79eb55e0bffd35a98c03b2999 SHA512 6f8f49e90d9098f6e283af91866518606ca7aa6085dcfe9a0f44cc754d5888201b0a569de6c09d8e3c75ee3ee9c85f3dd67f9a58e0a6448f35f44c3dc404efd4
+EBUILD insaneodyssey-000311-r1.ebuild 1428 BLAKE2B 4abc6a58c24847da2364fa937e0bbfa752a2399e1be021dde475dcf528e3cc8706c405d9d7e99765ebd976f378e7a92399c6b750fd7a4bc4af2472cc7ad6a79b SHA512 46273e06fdddd0c40caef61f986573732a6508a398103491f6584d514af76dc8021c556439f5f3521a919df7f7debd5912590aa93695b743e4500530888c4a69
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch b/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
index 417d8396e19b..3aab4eeaf9da 100644
--- a/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
+++ b/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
@@ -1,5 +1,5 @@
---- io.cpp.orig	2004-06-01 19:11:16.000000000 +0300
-+++ io.cpp	2004-06-01 19:21:14.000000000 +0300
+--- a/io.cpp.orig	2004-06-01 19:11:16.000000000 +0300
++++ b/io.cpp	2004-06-01 19:21:14.000000000 +0300
 @@ -42,7 +42,11 @@
  {
  	SDL_Surface *image, *surface;
diff --git a/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch b/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
index 74b4bf644d49..4fd35438d24b 100644
--- a/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
+++ b/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
@@ -1,7 +1,7 @@
 Bug: https://bugs.gentoo.org/600894
 
---- a/insaneodyssey/io.cpp
-+++ b/insaneodyssey/io.cpp
+--- a/io.cpp
++++ b/io.cpp
 @@ -22,6 +22,7 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild b/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild
index ad16a4bd5c1a..0383afc0b2b3 100644
--- a/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild
+++ b/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 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
 
 DESCRIPTION="Help West Muldune escape from a futuristic mental hospital"
 HOMEPAGE="http://members.fortunecity.com/rivalentertainment/iox.html"
@@ -17,33 +17,33 @@ IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer
-	media-libs/sdl-image"
-RDEPEND=${DEPEND}
+	media-libs/sdl-image
+"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
+	default
+
 	cd ${PN}
 
 	# Modify data load code and paths to game data
-	sed -e "s:/usr/share/games:${GAMES_DATADIR}:" \
-		"${FILESDIR}"/${P}-datafiles.patch > "${T}"/datafiles.patch \
-		|| die
-		epatch "${T}"/datafiles.patch
+	eapply "${FILESDIR}"/${P}-datafiles.patch
 
-	epatch "${FILESDIR}"/${P}-gcc6.patch
+	eapply "${FILESDIR}"/${P}-gcc6.patch
 
 	sed -i \
-		-e "/lvl/s:^:${GAMES_DATADIR}/${PN}/:" \
-		-e "s:night:${GAMES_DATADIR}/${PN}/night:" \
+		-e "/lvl/s:^:/usr/share/${PN}/:" \
+		-e "s:night:/usr/share/${PN}/night:" \
 		levels.dat || die
 	sed -i \
-		-e "s:tiles.dat:${GAMES_DATADIR}/${PN}/tiles.dat:" \
-		-e "s:sprites.dat:${GAMES_DATADIR}/${PN}/sprites.dat:" \
-		-e "s:levels.dat:${GAMES_DATADIR}/${PN}/levels.dat:" \
-		-e "s:IO_T:${GAMES_DATADIR}/${PN}/IO_T:" \
-		-e "s:tiles.att:${GAMES_DATADIR}/${PN}/tiles.att:" \
-		-e "s:shot:${GAMES_DATADIR}/${PN}/shot:" \
+		-e "s:tiles.dat:/usr/share/${PN}/tiles.dat:" \
+		-e "s:sprites.dat:/usr/share/${PN}/sprites.dat:" \
+		-e "s:levels.dat:/usr/share/${PN}/levels.dat:" \
+		-e "s:IO_T:/usr/share/${PN}/IO_T:" \
+		-e "s:tiles.att:/usr/share/${PN}/tiles.att:" \
+		-e "s:shot:/usr/share/${PN}/shot:" \
 		io.cpp || die
 	sed -i \
 		-e 's:\[32:[100:' \
@@ -52,10 +52,9 @@ src_prepare() {
 
 src_install() {
 	cd ${PN}
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin ${PN}
+	insinto /usr/share/${PN}
 	doins *bmp *png *dat *att *lvl *wav *mod *IT
 	newicon west00r.png ${PN}.png
 	make_desktop_entry ${PN} "Insane Odyssey"
-	prepgamesdirs
 }
diff --git a/games-arcade/jumpnbump/Manifest b/games-arcade/jumpnbump/Manifest
index 469788ae927f..6e1a92f98365 100644
--- a/games-arcade/jumpnbump/Manifest
+++ b/games-arcade/jumpnbump/Manifest
@@ -1,4 +1,4 @@
 DIST jumpnbump-1.50-autotool.patch.bz2 94692 BLAKE2B 40fa60260426cc1461e3e31d220a8f7261c7ad9e079fb17011fff72dc7ad2d52f66fb040263502d6082f3609bda0c783dd5c8b6a1d226d4fa22a1f77e6bfe5c4 SHA512 3749f3bda969d9ab2225019d8a6333d23402c8e284c3278aad23f76d5436326fed1efcae28a8922f814e0cf8417ea20fc51abb34f70bd6d37afca803475214fa
 DIST jumpnbump-1.50.tar.gz 397208 BLAKE2B f62a30723d8a08976ba06b1941d62544a764b4d5cbce6b076d0f096af099d9db35a451c413f3c490e2aff0388c92456e46a70cdc6a9404449a19dc4a77be0db3 SHA512 a343e514efa42aacd2c0fd113269ebf27418ea851dad21cecfa16a765639cc6a5de43fbdb9ad2f0282740f369b7e457a236fc3e918b486af10222c733f5c8fb0
-EBUILD jumpnbump-1.50-r1.ebuild 1320 BLAKE2B b2dcc2d5bdc9698a931c4bb034e5b3d5f5741682ee20da9d329c493d1773a2dd2bfe3af22bece6f310f250978348b09ce1990d994298c71f99939b0684d10158 SHA512 72ebb1985cd4ff08d55bb825db7a149731999b08db84c7cf7dcfb2c9bff0bac12ae37a71d3a267db9ad9767389d1e971508dfc3e498bde491592f3b45573d2a8
+EBUILD jumpnbump-1.50-r2.ebuild 1282 BLAKE2B db863041ba35be6c23b2cbf7b25b25a3f022b61330c9d928e744cdbd9f4acd16ef2bcd4b03d2b67cb1707684b43ca6a02ff843e52ff23f28868b37e41b917f33 SHA512 dfc145c876b15655efc71f522c59443e0f99411dd121be441213a2f39cf07fb26ca71ce6f4d5f0c083cc2aaa137e24c4b9a1f26df6a438bfcdd5ec0834c95be1
 MISC metadata.xml 324 BLAKE2B 2d20b6235b6445d30b7da2729b4e3367456ebd9ea2b4ce290044e1202714ed0b460151e02af09648fe23e8095ee8aacac77923d232be8d8e0656f35e6f54387b SHA512 3392ab16d9e90d0dd6dba06994ba2096940075961de7e6fed43d70946e82916af7b40e95bd27e25d5eba9d9eb46afe61fe4200147385cc93211ab14c0e6b13ce
diff --git a/games-arcade/jumpnbump/jumpnbump-1.50-r1.ebuild b/games-arcade/jumpnbump/jumpnbump-1.50-r2.ebuild
index e6ee225519b9..476381cf4757 100644
--- a/games-arcade/jumpnbump/jumpnbump-1.50-r1.ebuild
+++ b/games-arcade/jumpnbump/jumpnbump-1.50-r2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+inherit autotools desktop
 
-inherit autotools eutils games
-
-DESCRIPTION="a funny multiplayer game about cute little fluffy bunnies"
+DESCRIPTION="A funny multiplayer game about cute little fluffy bunnies"
 HOMEPAGE="http://www.jumpbump.mine.nu/"
 SRC_URI="
 	http://www.jumpbump.mine.nu/port/${P}.tar.gz
@@ -28,20 +27,22 @@ RDEPEND="${DEPEND}
 	tk? (
 		dev-lang/tcl:0=
 		dev-lang/tk:0=
-	)"
+	)
+"
 
 src_prepare() {
-	epatch ../${P}-autotool.patch
+	default
+	eapply ../${P}-autotool.patch
 	rm -f configure
 	eautoreconf
 	sed -i \
-		-e "/PREFIX/ s:PREFIX.*:\"${GAMES_DATADIR}/${PN}/jumpbump.dat\":" \
+		-e "/PREFIX/ s:PREFIX.*:\"/usr/share/${PN}/jumpbump.dat\":" \
 		globals.h \
 		|| die "sed failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	# clean up a bit.  It leaves a dep on Xdialog but ignore that.
 	use fbcon || rm -f "${D}${GAMES_BINDIR}/jumpnbump.fbcon"
 	use kde || rm -f "${D}${GAMES_BINDIR}/jumpnbump-kdialog"
@@ -49,5 +50,4 @@ src_install() {
 	use tk || rm -f "${D}${GAMES_BINDIR}/jnbmenu.tcl"
 	newicon sdl/jumpnbump64.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Jump n Bump"
-	prepgamesdirs
 }
diff --git a/games-arcade/kajaani-kombat/Manifest b/games-arcade/kajaani-kombat/Manifest
index 544568ca6e1c..e4434e107ad8 100644
--- a/games-arcade/kajaani-kombat/Manifest
+++ b/games-arcade/kajaani-kombat/Manifest
@@ -1,5 +1,5 @@
-AUX 0.7-makefile.patch 547 BLAKE2B df9e317d6d48eb0ab41448143055e2b4245eda957ef4da502f24c1cc239c5eaa2d628c55a09802b8338f2c8af9c095faa931fc83d4bf01ab02341b530ad3d2a4 SHA512 2449ec4d80159f0c0194c36c0a744249813654d6159a775ec337858be377af1c2e9773872c85d0061762055512c4b79972f8727e554de42ecef8029bf1c1f425
-AUX kajaani-kombat-0.7-ldflags.patch 436 BLAKE2B 12cc34934f55ec9329609d7e916feec3486994495e82591244635f22d1ca7a9f64e5d33d5fe629dad1a563b448c08b585e6fa307974bdfd882ece46c9dfc8621 SHA512 56daec457f7d0d535a81cc816ec229d2ba8cb0826af3e3d2e488dedb6b8b2c6b948cf46f96bcec875675f2f3f839ee9a8978441adb595f3af28743242e1343bf
+AUX 0.7-makefile.patch 551 BLAKE2B 4b301ca00a4643f00654e81f3a4396d43106bc2f0f5bbae98d71818a3559472607358a6dd9c2b77a9def3c7772df2ad6ae59e33529de368474b9c4a33a9fee77 SHA512 4d319affec25fe585c0f0af14ed872e71b155be2bab3aabbb72ad01b80395f44b35b13abc765390e19e070305339322598942fa1997463632ee07f4a160ba823
+AUX kajaani-kombat-0.7-ldflags.patch 440 BLAKE2B f63321ed06c0ed26cfe28a1a62650ce9b9b37b29898961fb08b58b5119b023c3335798e36130ad144569c2996e7c4f188caf9cadc3d4a37c01a3bb03bd39d11d SHA512 30a8e6293349a30f6dbcc469fb14377d9461df60227e01d18dfc267f254be62b7cee89bcb6df0b24ec5bcb9cb198701e5b9e0d465f699be4880432a0402b2c71
 DIST kajaani-kombat-0.7.tar.gz 1805504 BLAKE2B 664210a44e5dd5b27ca7b47ca9cb9445373d1243c01fcfb227251c6b48fb8b9e2ebd608eec2244f1b12f47bf5c886482bf70a0700538bbf415d93df41c34fcfe SHA512 84f6923b73c9529fa600c533b5a3de9ea9411f81060c5ad9fb85346fa17c9cb70bf6ba8222319e123372b01286a11b40bb355e8ef8c9bec95cd98f4d0e0460cb
-EBUILD kajaani-kombat-0.7.ebuild 951 BLAKE2B a8c1c7680a5b83aaa90c111f08b7a6d24ee1b0ee40fe960761677e2df0b820bbf2bdced3abca2a6fefc335d34e39e5ba4d55f999772092fd91e4c73d701d4752 SHA512 acc7142628eb021e6acd39cbd4b045c952d1a3df052b06efa6c08ddf8d046449f62fc2eb192049f43c6fdd80ac0b39953ff05aa48502d7040f04953c0e02a6a2
+EBUILD kajaani-kombat-0.7-r1.ebuild 906 BLAKE2B 646f8e6b2fe996bc36c1b8b944646be6a829da8bcd8bfd71b2a774cb137770da35b4359a514f9b209fce4f2dee8c26033667b6813c6956ebaa42511204bdacab SHA512 e22f5d2be756d6a5c26bf6d9555df51b06b316d3fd940594f5233fa8ac8b0c43ebb31ccb5fda01552a6dfa2ba899671b41690cf04b6cf3eb46c1094523d3e234
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/kajaani-kombat/files/0.7-makefile.patch b/games-arcade/kajaani-kombat/files/0.7-makefile.patch
index 704bb95c1d13..d67f394fa623 100644
--- a/games-arcade/kajaani-kombat/files/0.7-makefile.patch
+++ b/games-arcade/kajaani-kombat/files/0.7-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2005-02-28 22:55:55.000000000 -0500
-+++ Makefile	2005-02-28 22:58:45.000000000 -0500
+--- a/Makefile.orig	2005-02-28 22:55:55.000000000 -0500
++++ b/Makefile	2005-02-28 22:58:45.000000000 -0500
 @@ -39,8 +39,8 @@
  endif
  ## UNIX RELEASE (default option)
diff --git a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch
index c575ff1ef57e..268dcf24ce37 100644
--- a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch
+++ b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-15 15:48:06.000000000 +0200
-+++ Makefile	2010-10-15 15:48:18.000000000 +0200
+--- a/Makefile.old	2010-10-15 15:48:06.000000000 +0200
++++ b/Makefile	2010-10-15 15:48:18.000000000 +0200
 @@ -85,7 +85,7 @@
  client_net.o: client_net.h client_net.cpp globals.h monitor_queue.h msg.h
  
diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
index c0d0f15e78c3..1d80c8699c66 100644
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 DESCRIPTION="A rampart-like game set in space"
 HOMEPAGE="http://kombat.kajaani.net/"
@@ -19,14 +19,16 @@ DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-ttf
 	media-libs/sdl-mixer[vorbis]
 	sys-libs/ncurses:0
-	sys-libs/readline:0"
+	sys-libs/readline:0
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-makefile.patch" \
+	default
+	eapply "${FILESDIR}/${PV}-makefile.patch" \
 		"${FILESDIR}"/${P}-ldflags.patch
 	sed -i \
-		-e "s:GENTOODIR:${GAMES_DATADIR}/${PN}/:" \
+		-e "s:GENTOODIR:/usr/share/${PN}/:" \
 		Makefile || die
 	sed -i \
 		-e 's/IMG_Load/img_load/' \
@@ -34,10 +36,9 @@ src_prepare() {
 }
 
 src_install() {
-	dogamesbin kajaani-kombat
-	insinto "${GAMES_DATADIR}/${PN}"
+	dobin kajaani-kombat
+	insinto "/usr/share/${PN}"
 	doins *.{png,ttf,ogg}
-	dodoc AUTHORS ChangeLog README
+	einstalldocs
 	doman kajaani-kombat.6
-	prepgamesdirs
 }
diff --git a/games-arcade/kobodeluxe/Manifest b/games-arcade/kobodeluxe/Manifest
index e3f7751a3089..4cd8de944a2c 100644
--- a/games-arcade/kobodeluxe/Manifest
+++ b/games-arcade/kobodeluxe/Manifest
@@ -1,5 +1,5 @@
-AUX kobodeluxe-0.5.1-glibc2.10.patch 215 BLAKE2B c539d01a3f3dbedaf90503aba74a4a54754fb9d9e82dace7b0b6a5832aed757c260415816cf41ff75a3cfdee3b7616303f031647706f7b514e98c0e85a6beb01 SHA512 207dca0fb0e65ed3391c9bab7d39a1b4d9ee64a9261e4d23ef72a812fd4caa5d2ccc2235c8c97d4febddd84a020a6d4c18cfc383da4bf2fde49598c8d15014a6
-AUX kobodeluxe-0.5.1-glibc29.patch 2400 BLAKE2B 566b474b40eea4bf7abb3d414beb3bac38576a534ac105db8814eb890f5ad2ffd77d245a083395c60b4b73f07e0cadf52e6c40befb0664254da7f4f168f1d559 SHA512 af5e047b6759c1f15de953646ebe6d05ebdb3571864f38d9b00466165e864fffcd7ab83ead9d42518fdc9c3714f579cc92ecefb7f4cab318317475e51cc3f078
+AUX kobodeluxe-0.5.1-glibc2.10.patch 219 BLAKE2B 78c45966711049c7715ae0efd18289be82b4ea3965d85338ab81c79f07785273a6d767cf471deace08722b3ab9b8581a45201e30343b9e6ad784d820256b7dd9 SHA512 77624a0e18958d76c938e9d1becb72803079364612056687fb955cc912bda9b4443c7e6245abb6a32cc3ff96b04c63993e3cd114f73115254efe7b50f749a45c
+AUX kobodeluxe-0.5.1-glibc29.patch 2408 BLAKE2B c3abfe3594b2c43428d4e49a34285680a1ae2ac40106aac255aa2da846a67ecbcfcf8f5d8af48ca0adbf627d188f6a8941d6b4f75df3bdad39fff4d869b324e1 SHA512 de2014b9a0607ddb5853c63eb4c14daf4f14d2158697348d952305db09b4a8f84a3a918cd730085f01120b7cbcfae076afd73c559c1ddd46f5a9777c89e76897
 DIST KoboDeluxe-0.5.1.tar.bz2 1781752 BLAKE2B d7f08ab9603b861f8992629bac9a65051a3c5fee6822f1951d57cbc5c31055a6cefeed098637dda84c0a1538645f47816848d767a4fa7916726b5784dfbc0414 SHA512 fc107e4367fd300574823aa40c68311d95de3a403d7c930963b8754aac14293f0624996fd77c4de0677921d11883047b68dd95df81eeb03078c37426ebd58afd
-EBUILD kobodeluxe-0.5.1.ebuild 1267 BLAKE2B 5d626390318790b496609427fe21c6495b1cb1e6bf23d46a396526509003be32de3ae857587127ad170704f745c8d3873ac9860508fffa498b3e0f1ee8018c2f SHA512 27e508e11ea87d46c7a26ddddafaf6fcf0233b38f974e41fbc980608fb0fe4d98fd51e77a491980b8888544461b5b8ddd2730be3b00596704e9e320f0c53de24
+EBUILD kobodeluxe-0.5.1-r1.ebuild 1240 BLAKE2B bf7875f2773598a895ff9749090ed2f8401ba16003899c72b24df371fe1098b2ad3014eea11b3039cf6bda82d9e4a4567cbeadec9ed1d94ce62f3ee4bc561ff9 SHA512 dbcd2e12238fe34d2dfd9cfdd89a67dbed625eeffba442088c556e66ec996a91f68b51c9e56aabb6e2fcbe5cc4c3481ad02c4b08ee3b95fa63577c1475c0dd98
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch
index 1095cc1c7330..c6c06d9ce2a6 100644
--- a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch
+++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch
@@ -1,5 +1,5 @@
---- graphics/window.cpp
-+++ graphics/window.cpp
+--- a/graphics/window.cpp
++++ b/graphics/window.cpp
 @@ -398,7 +398,7 @@
  		 */
  		if(token)
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
index 98451bb29975..7a9ef355a821 100644
--- a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
+++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
@@ -1,5 +1,5 @@
---- enemies.h
-+++ enemies.h
+--- a/enemies.h
++++ b/enemies.h
 @@ -70,9 +70,9 @@
  extern const enemy_kind bomb2;
  extern const enemy_kind bombdeto;
@@ -21,8 +21,8 @@
  }
  
  
---- enemy.cpp
-+++ enemy.cpp
+--- a/enemy.cpp
++++ b/enemy.cpp
 @@ -713,7 +713,7 @@
  
  void _enemy::kill_cannon()
diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild
index 26695f44115f..846176da162e 100644
--- a/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild
+++ b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 MY_P="KoboDeluxe-${PV/_/}"
 DESCRIPTION="An SDL port of xkobo, a addictive space shoot-em-up"
@@ -16,9 +16,11 @@ IUSE="opengl"
 
 DEPEND="media-libs/libsdl
 	media-libs/sdl-image[png]
-	opengl? ( virtual/opengl )"
+	opengl? ( virtual/opengl )
+"
 RDEPEND="${DEPEND}"
-S=${WORKDIR}/${MY_P}
+
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
@@ -27,7 +29,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-glibc29.patch \
 		"${FILESDIR}"/${P}-glibc2.10.patch
 	# Fix paths
@@ -42,13 +45,12 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf $(use_enable opengl)
+	econf $(use_enable opengl)
 }
 
 src_install () {
 	default
 	newicon icons/KDE/icons/32x32/kobodl.png ${PN}.png
 	make_desktop_entry kobodl "Kobo Deluxe"
-	prepgamesdirs
-	fperms 2775 "${GAMES_STATEDIR}"/${PN}
+	keepdir /var/lib/${PN}
 }
diff --git a/games-arcade/komi/Manifest b/games-arcade/komi/Manifest
index d69792b73ddc..f405f426999d 100644
--- a/games-arcade/komi/Manifest
+++ b/games-arcade/komi/Manifest
@@ -1,5 +1,5 @@
-AUX 1.04-DESTDIR.patch 970 BLAKE2B a5341e6a3b687cc8b6d3c72f7354a031a3365c1ba124340345f0ca23fe62e4b15aab2a8d6f65d8b7ee23fdbdb23615859d7c0aa26b1d0bfa9e81bb198a72a75a SHA512 41b9fb217509c2bea480b751a1fa4fe6962418a585916b712117ec0c69aac0b41451ba70e71dcf82178a8f181608e003c2aa0749a068c9cffab3abc925b33441
-AUX komi-1.04-install.patch 380 BLAKE2B fc642808a92847511f74e614bbf34f4d12d5fb6baa7ed68ba7fc9db5752080508447109fd8e67b41f25f4947b4ae46d3e5502ea9f187262adbd2c16a240c59c6 SHA512 6e7d649903c4078aed9bacddbfb771525e1808a33bf310a25c341eb92ae1696632d59264441743945abc7dfb6d4a127c9d8625c5bda937de038834c43043ba52
+AUX 1.04-DESTDIR.patch 974 BLAKE2B be10af269f5c812e921cf2d7e355b2d4d9380ac4b70910cb43f488572f753da34b3b162aa7e7aa5138eefc62ba17c3e678a59e9954f50165cc3954d0d33defdc SHA512 225ff9737d8cbb76d20be02fded66a12f70d0e65dddfd979f5b72fe1f1dffb74b47ccb065235b1c2ea7d71a198e10bbad144fb22ce4743e4d9842c138b696598
+AUX komi-1.04-install.patch 384 BLAKE2B fcc975cbbc6fce54edb399b73d0f0672e30ab6cf7db8bb68c80468fb4a17c19331444c4d7c3428e0c812dac9468b1fce9cb87e65adcea49a733aca2e875249e3 SHA512 65174431b1668e842795af8f0e17d8e1ea004af29068cc968494ee81bf5fe3c9308192c772f6f37f97388cd1630b7e67f65a8c0973365e7aa2b260c9104e03e0
 DIST komi-1.04.tar.gz 954526 BLAKE2B b7be781da0143f4cd563e885ff7688c2f50b5c1be6fbd8d383aeda06873b25a2081ae58b750a00a70d140757a57ec49652ff5e8c4ebf6ba0f306539707c06c31 SHA512 60babb3642bea7598089b342ba582b2f63f6aa051352ad9b2fa5bad0222a32306775a207712d2e7a9242be5e3ff5b4734f5b62708e451e7230499c6812d4c8a3
-EBUILD komi-1.04.ebuild 995 BLAKE2B eb010f92db431a9a6f18fa97be6e8ff050d1fe7cb70941246c701c6b91b9c70c934faf6a3629663459fb18ac77fffdbc39273c3be6c946801e7bd46b5cf8be44 SHA512 dee24063a5c673431282b059714094683d636708f86af32b346191a097a2bdd69558f63af01b4ae8169208591e6a524016f21fb23cfb2b3a984098ebc0ca874e
+EBUILD komi-1.04-r1.ebuild 918 BLAKE2B 7361900135a1206de147ecfc4a855441fbf20d64f81ba2d0c0d307f32cf943a11e44d7ea5d1f68081b3c007f0b30f7ef5b9557562aa24b90e8aaf36144181eab SHA512 5b1498f26459c6b83ace2efbfcc27ffddb02f4484e3416512ad5a8056e8b97010a0ccd1dabf285d9c28ae0f76df1c3cab61cfdfeb83b8498a87ca12966da0f52
 MISC metadata.xml 327 BLAKE2B 0a50ef4f37ade105c52d1bce332efbbcd2d7b38622c65d684930e75db0a0333ba7ee0f022ee5fb5d60feb3d6e7ab22b6c0186699bf3cbff9d7c341d9bcc64c2d SHA512 15af3d90fcfbbcb824625719c4adf55d6b57cfb1d31903731678d5b3170770595e9d1a0dcb0e0151c463cad0493931f49db0d210136e51c269571649cbbc4476
diff --git a/games-arcade/komi/files/1.04-DESTDIR.patch b/games-arcade/komi/files/1.04-DESTDIR.patch
index 2573b01e5c91..4060d51f3a7d 100644
--- a/games-arcade/komi/files/1.04-DESTDIR.patch
+++ b/games-arcade/komi/files/1.04-DESTDIR.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2004-12-11 01:36:11.000000000 -0800
-+++ Makefile	2004-12-11 01:36:14.000000000 -0800
+--- a/Makefile.orig	2004-12-11 01:36:11.000000000 -0800
++++ b/Makefile	2004-12-11 01:36:14.000000000 -0800
 @@ -13,9 +13,7 @@
  MIXER=-lSDL_mixer
  SDL_LIB=$(shell sdl-config --static-libs) $(MIXER)
diff --git a/games-arcade/komi/files/komi-1.04-install.patch b/games-arcade/komi/files/komi-1.04-install.patch
index d00a48d296fb..30395eaff72b 100644
--- a/games-arcade/komi/files/komi-1.04-install.patch
+++ b/games-arcade/komi/files/komi-1.04-install.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2015-01-05 11:35:24.794160467 +0100
-+++ Makefile	2015-01-05 11:36:23.181058180 +0100
+--- a/Makefile.old	2015-01-05 11:35:24.794160467 +0100
++++ b/Makefile	2015-01-05 11:36:23.181058180 +0100
 @@ -24,8 +24,6 @@
  install:
  	install -d $(DESTDIR)$(DATAPATH)
diff --git a/games-arcade/komi/komi-1.04.ebuild b/games-arcade/komi/komi-1.04-r1.ebuild
index 00fa29a72ff4..5e0804c4843e 100644
--- a/games-arcade/komi/komi-1.04.ebuild
+++ b/games-arcade/komi/komi-1.04-r1.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 DESCRIPTION="Komi the Space Frog - simple SDL game of collection"
 HOMEPAGE="http://komi.sourceforge.net"
@@ -14,16 +14,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer"
+	media-libs/sdl-mixer
+"
 RDEPEND="${DEPEND}"
-DOCS=( CHANGELOG.txt README.txt TROUBLESHOOTING.txt )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-DESTDIR.patch \
+	default
+	eapply "${FILESDIR}"/${PV}-DESTDIR.patch \
 		"${FILESDIR}"/${P}-install.patch
 	sed -i \
-		-e "/^BINPATH/s:=.*:=${GAMES_BINDIR}/:" \
-		-e "/^DATAPATH/s:=.*:=${GAMES_DATADIR}/${PN}/:" \
+		-e "/^BINPATH/s:=.*:=/usr/bin/:" \
+		-e "/^DATAPATH/s:=.*:=/usr/share/${PN}/:" \
 		-e '/^SDL_LIB/s:$: $(LDFLAGS):' \
 		-e '/^SDL_LIB/s:--static-:--:' \
 		Makefile \
@@ -39,5 +40,4 @@ src_install() {
 	newicon komidata/sprites_komi.bmp ${PN}.bmp
 	make_desktop_entry komi Komi /usr/share/pixmaps/${PN}.bmp
 	doman komi.6
-	prepgamesdirs
 }
diff --git a/games-arcade/monster-masher/Manifest b/games-arcade/monster-masher/Manifest
index e65a12ea037d..c68e40c543fc 100644
--- a/games-arcade/monster-masher/Manifest
+++ b/games-arcade/monster-masher/Manifest
@@ -1,5 +1,5 @@
 AUX monster-masher-1.8.1-desktop.patch 470 BLAKE2B a604c781aaba110642b2046ceb8b189fa7a897c80d2811d885b441922f5950601c9d48b921be6e51c46c27da9fe566854c77ff445a0f7870825f8895ae441f1e SHA512 0779315496ccb270e3ca7f41808b39a8cf021de743bfe03ca3eae87bc21bfcd1c64e9af1626974cd833c7b060e680159bf32d3bc08466ded43183ad8e522a984
 AUX monster-masher-1.8.1-libcanberra.patch 1835 BLAKE2B 8c7ca8fc711055ebcf041272f7362fd386527e2816679fcef2b8a007be92b373bcd19a3b093c20abb5ae346055fa510216da49cab740b365f8b319782c02c5af SHA512 c37c8fcb2ec16c3388fbe6736b8eab5047fe4cc3e6b28413bfc438901bec45ab3aad60771fc7b2ac1b9d92ade2e98e1a38f2733bbad27522aed8986a0ddef251
 DIST monster-masher-1.8.1.tar.bz2 1042299 BLAKE2B 3c34c3f6f70c84fda8974909e15c16e028063dad90fe9de0be255788fba1e3919b51170e45053bc2d33d605e0fb74ba4475c11bdd1bc9aba8013790fafe19c6c SHA512 250414d6fb4abea12d2fd5328fc003449680b76784bfc6c15cc05d5dfb78e45eee2d2c6d36a3bf2f3c0e055c9ee58cbfaf623f56638fa8462f5006c84057c254
-EBUILD monster-masher-1.8.1-r2.ebuild 1035 BLAKE2B dc74e66a9460d04b4fd62799602b5a4ef97ff01cdbbc99dc7a36f00c8119d7dd9b7cc2bd6c1192e352d5486a8dc183e5e9dc4a1779541f9f89d0445c7bc22c56 SHA512 90c90dc3a3c109a1bf72e11f464f5b32ab19df46f611c695aa425bdd2d0f2818618d5de06ead970da20f88219bcbf799bb7b4f44365e6cfe3b8c2e0d19f0e376
+EBUILD monster-masher-1.8.1-r2.ebuild 1037 BLAKE2B 29e1b7a9a98147f493e3607bf182674d00b8093fb74f857678263480e3c1960f8237d0a6a314d23673230ae34b454e2e8d470de01915761293085c4847cabf53 SHA512 ef934ddc956fe538f54a8746605ba86b819ce86592a1bd40e22bb1ca21687a821ac67d0720852e798b74238aa13b2b037c89c3255a47a807a76d6d114c99076b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild b/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild
index e851818b384f..9ba28fc6378d 100644
--- a/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild
+++ b/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,8 +7,8 @@ GCONF_DEBUG="no"
 inherit autotools eutils flag-o-matic gnome2
 
 DESCRIPTION="Squash the monsters with your levitation worker gnome"
-HOMEPAGE="http://people.iola.dk/olau/monster-masher/"
-SRC_URI="http://people.iola.dk/olau/monster-masher/source/${P}.tar.bz2"
+HOMEPAGE="https://people.iola.dk/olau/monster-masher/"
+SRC_URI="https://people.iola.dk/olau/monster-masher/source/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/games-arcade/primateplunge/Manifest b/games-arcade/primateplunge/Manifest
index a9115346214e..688ffdf2d5f3 100644
--- a/games-arcade/primateplunge/Manifest
+++ b/games-arcade/primateplunge/Manifest
@@ -1,4 +1,4 @@
 AUX primateplunge-1.1-AC_SUBST.patch 615 BLAKE2B 13358475ded92b3cf5e88c7f53bf06bf89e2c0fc17a4bd08ac01934c9e9291975c6c1e7c87ee2d3519059803a59a98c9ca712c5ebe082c686389e4a336f8b375 SHA512 4d0b228471ff977efe48ff8bc29feb46f9af1d124e89e49e512811b33d8f5d863f06f14d6abee9cd9dc03b344513d6fc6cb110d5e5b4ed3f2b2db6745659f99f
 DIST primateplunge-1.1.tar.gz 5245884 BLAKE2B a1496eea4c99dd52f301aa50b6831ce6efffa78e45b97be13e93f64d4c4dd814b87fac17612fb82f994ee125375c75a47d3968b379c7622d78c76cadf5567e3b SHA512 bdc6be0faf28375941e67895c498f59a529521ba46d6b23ea94d3b16ead1541738d7aa5cfa5fa5cf269e7e474ca9002180e7b0663e1b4531300d21564df41b8c
-EBUILD primateplunge-1.1-r1.ebuild 789 BLAKE2B c4d77c07a186f99410241da890e4590587100d709c69d345a84efcdce8f5028db74b85325f550eee9d51da0f37518838dbe6c076601f5a99624a9d5352a153ed SHA512 022543fa221d8a0b08c3661527f0bdd3dd2a4dfb4be355c5f2a67115c7b87b91fb159310ace60c7d25f770b4a6b63793ae908b22d4cccdb86bda9a64e60a62bb
+EBUILD primateplunge-1.1-r1.ebuild 791 BLAKE2B 010e35828cb32f32a79c38e00a876578a21d1bd76a5af5fc02156e78fc48a3cd40872ae94143d5035a498e6663f202f03323f463177f78c17b3cfc1ea83909a6 SHA512 dc318c8f6e83d934c4faedba781f06c5d13d5d55797bf1eba1061f94d782bb7c00801dcee4b19ea7704ce56e59e35be5bbd7dcc3854f95494f46fd421798d345
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild b/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild
index 6ae5589fd417..33eee4b857b6 100644
--- a/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild
+++ b/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils games
 
 DESCRIPTION="Help poor Monkey navigate his way down through treacherous areas"
-HOMEPAGE="http://www.aelius.com/primateplunge/"
-SRC_URI="http://www.aelius.com/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.aelius.com/primateplunge/"
+SRC_URI="https://www.aelius.com/${PN}/${P}.tar.gz"
 
 LICENSE="Primate-Plunge"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-19 14:14:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-19 14:14:48 +0100
commit	5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (patch)
tree	8f255dfacbacb657e3ac3654d01c1e11e651c066 /games-arcade
parent	8aebb228036d5e2863b7eaa6e319ab41c1669269 (diff)