gentoo resync : 02.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-02 14:13:35 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-02 14:13:35 +0100
commit: 7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (patch)
tree: bac2a67fb24ac0836147fe370d30e1610ae1845d /games-puzzle
parent: 2f8db31405fac68eea6f7257d58529243815033b (diff)
159 files changed, 1241 insertions, 1037 deletions
diff --git a/games-puzzle/4stattack/4stattack-2.1.4.ebuild b/games-puzzle/4stattack/4stattack-2.1.4-r1.ebuild
index a076f4776e58..d04ec26a8f3f 100644
--- a/games-puzzle/4stattack/4stattack-2.1.4.ebuild
+++ b/games-puzzle/4stattack/4stattack-2.1.4-r1.ebuild
@@ -1,8 +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
-inherit eutils games
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
 
 DESCRIPTION="Connect-4 game, single or network multiplayer"
 HOMEPAGE="http://forcedattack.sourceforge.net/"
@@ -11,28 +13,33 @@ SRC_URI="mirror://sourceforge/forcedattack/4stAttack-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
+
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND=""
-RDEPEND="dev-python/pygame"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygame[${PYTHON_USEDEP}]
+"
 
-S=${WORKDIR}/4stAttack-${PV}
+S="${WORKDIR}/4stAttack-${PV}"
 
 src_prepare() {
+	default
+
 	# move the doc files aside so it's easier to install the game files
 	mv README.txt credits.txt changelog.txt ..
 	rm -f GPL version~
 
 	# This patch makes the game save settings in $HOME
-	epatch "${FILESDIR}"/${P}-gentoo.diff
+	eapply "${FILESDIR}"/${P}-gentoo.diff
 }
 
 src_install() {
-	games_make_wrapper ${PN} "python ${PN}.py" "${GAMES_DATADIR}"/${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	make_wrapper ${PN} "python2 ${PN}.py" /usr/share/${PN}
+	insinto /usr/share/${PN}
 	doins -r *
-	newicon kde/icons/48x48/forcedattack2.png ${PN}.png
+	newicon kde/icons/64x64/forcedattack2.png ${PN}.png
 	make_desktop_entry ${PN} "4st Attack 2"
 	dodoc ../{README.txt,credits.txt,changelog.txt}
-	prepgamesdirs
 }
diff --git a/games-puzzle/4stattack/Manifest b/games-puzzle/4stattack/Manifest
index 0ee59ca82c15..d16e4839ca28 100644
--- a/games-puzzle/4stattack/Manifest
+++ b/games-puzzle/4stattack/Manifest
@@ -1,4 +1,4 @@
-AUX 4stattack-2.1.4-gentoo.diff 509 BLAKE2B a229056953843cccebaec58dab61db00f075d64c9d54c722c820c8674380e61ffa9bbbe316258709c4f66106f51149c5a67c846a19d238f8e094005d71a3901b SHA512 f370ae8ce74ffe54f028c8646ea8dce87ae4fc5f4eb7ca8343f5441d3dbc80a487c2dd63ba75d363778b450ab47f432aeddcb93e0b6fc895f54a5fa12380f8c9
+AUX 4stattack-2.1.4-gentoo.diff 513 BLAKE2B 9cf9396347fb40d23bf89516653eaca79af24e20137228021a02679dd965a7d6a9db42f4c669cbbfe8da773fa279a3509a7ae3a55b17b57e6ff44d30b0b8d153 SHA512 def42479c82d4a5bce910028b5726602b2d07b97afdabf2cb464ae24bc8d081136c81e437fa8d997e171bda14a0af91e14b8d2f1f1b12d5264ebbb1e96fa727d
 DIST 4stAttack-2.1.4.tar.gz 1828247 BLAKE2B 82575adaa8994939f978a0ae796c6a57d64eacf715465ee3ea9614dda28b1543c199d2776408b989e82bf9e4b28cd90cf7b57dc7c21be1329aac2295043f8a57 SHA512 4819c0915bfe47bb965ea39d49fa007fb18cfa965b15e5e72a4b0ac3be8a03c616d9438c8dedd960ee257e44b48f98f75ced6bed5bfc77f3366328c797b30f3c
-EBUILD 4stattack-2.1.4.ebuild 980 BLAKE2B 2ebd942ed5f058674507965825bfa07d339c98b41bc546ee5aef3b738911220280d99c12310b0dece9ffcb9a8be5239224efafbe3e65dfeaf28df2a6cfd6eddc SHA512 926fc12f8827c18f0c6dd338c7ad16d9a508b768c37396a3b9380f113da41b574013018c11e25a055d502202e39b8e5acf1eb5e4f0659996b02a196f87cfa65d
+EBUILD 4stattack-2.1.4-r1.ebuild 1070 BLAKE2B 27bc1a5465bf2191adbf28c2ff6ce29bbfda912e8f68ba594898c4e8c116498d9bcffc65b015b5b167ac4b826976436b5ec48258858df2cd460c1e987f4cb7bc SHA512 dfbad8200b667ac60167305922db97fc1730072f37c059a3857cc0d70371498e8dd76b3641b6e1d5eb3d8d5f85fece3a34ff90045cb92fe67701545b8e7c405a
 MISC metadata.xml 335 BLAKE2B 558a9365482fa1fec17fec2f638b22f02bbcdfa90529f0bc1524c611f7f90e192583f344105a9e619b009278f130e0c58a13a74d68860760486486aa84606a74 SHA512 eff7c6df19ba9adc535fcc0e33216dcbdad8a04a8a09544263c120ee6185842709c0d08065b64d89be09c37afa270f6736216e78ef779e3a13ac8b82ca0fa299
diff --git a/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff b/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff
index be7d32ed3ff2..9cb5be53b793 100644
--- a/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff
+++ b/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff
@@ -1,5 +1,5 @@
---- 4stattack.py
-+++ 4stattack.py
+--- a/4stattack.py
++++ b/4stattack.py
 @@ -28,6 +28,9 @@
  images	= None
  screen	= None
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 998d49effc2c..3b088bfa3f03 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/anagramarama/Manifest b/games-puzzle/anagramarama/Manifest
index f0bce7a1bd31..251355711db0 100644
--- a/games-puzzle/anagramarama/Manifest
+++ b/games-puzzle/anagramarama/Manifest
@@ -1,4 +1,4 @@
-AUX anagramarama-0.2-gentoo.patch 914 BLAKE2B c05a1a90ba66e388f948d832a7efcac570e5bd04101b3b075840f2e40b2bc669a605285703b2230aa1af263ee6ecc9d6edf0daab5f891e862086d3a3fdfdc293 SHA512 8047ae5593d242d4755ade02ed792dcebdde7f36df30edf56155fcc14c65cec6d8a55ebe1ef7e7d012f58faf692515bf3d8fb609b07501dd77d2db28e0b317f7
+AUX anagramarama-0.2-gentoo.patch 918 BLAKE2B da8f286fd932f9bf8f8b00541565ea11f60e3d13581a46b86c4b9cb0572fbaa821b672554b3448da026ad15e97c87e39766fcba8ab4ece464cf605cbbb582712 SHA512 d87759b401efc4bb51dcf7f121548038b736d89b026cfc9fb82e467c131dae10cc933dd0aa2ec668c3636d93cb37bb8b6325691ed46366b7668605d8921308ab
 DIST anagramarama-0.2.tar.gz 861484 BLAKE2B 9fb6b759b9d2f7a797e8ecf214c8723676577b8a7a88049da7b59a1e4287363c3ac58ee203033e7d7cad777d175599433fffc37fe824da4ca5511e85918b6ae8 SHA512 7cdafaf489100c184a71859f50b64fe8534210d953c4144d822727815ae2f7dd12302447b159039d95c9b3097711ab14931538789ac81c01233cc2c767291603
-EBUILD anagramarama-0.2.ebuild 985 BLAKE2B 29750c3e12a48678d70dba5baee15d8e708d84543f7f4e15333d56b7fa018110e0be64bed07e2e136d2f39c4f7ae61b0adff892a331a2b7186ab3aa323ae6500 SHA512 ac7fdfc5a854611976f68768e235b007f6f684b07f06b39359e38c9b67659134b2a4e9e02307cfb15da90e2dfc7faefd135ca132111be4bff2aacd4d5adaaba8
+EBUILD anagramarama-0.2-r1.ebuild 981 BLAKE2B c9684174378d228f6c147cd4677cb15c680073988797472fbde1f98b3fb624e4b31d0976b068948c8c32c37277ff1a2c46e814c1f8eb5762ca4db63430040398 SHA512 fbe12367b60218d971a180506d29b077aa7d8561874ff067b0b49570a81aea8fce7c0b199d7e684feb83dd7268e7b0603e7e2d70f43bba111ff5155349e4726a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/anagramarama/anagramarama-0.2.ebuild b/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild
index 5dc26f04662d..4e1bc1d0b0b2 100644
--- a/games-puzzle/anagramarama/anagramarama-0.2.ebuild
+++ b/games-puzzle/anagramarama/anagramarama-0.2-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 vcs-clean
 
 DESCRIPTION="Create as many words as you can before the time runs out"
 HOMEPAGE="http://www.coralquest.com/anagramarama/"
@@ -17,26 +17,28 @@ DEPEND=">=media-libs/libsdl-1.2
 	>=media-libs/sdl-mixer-1.2
 	>=media-libs/sdl-image-1.2"
 RDEPEND="${DEPEND}
-	sys-apps/miscfiles"
+	sys-apps/miscfiles
+"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
+	default
+	ecvs_clean
 	sed -i \
-		-e "s:wordlist.txt:${GAMES_DATADIR}\/${PN}\/wordlist.txt:" \
-		-e "s:\"audio\/:\"${GAMES_DATADIR}\/${PN}\/audio\/:" \
-		-e "s:\"images\/:\"${GAMES_DATADIR}\/${PN}\/images\/:" \
+		-e "s:wordlist.txt:/usr/share/${PN}/wordlist.txt:" \
+		-e "s:audio/:/usr/share/${PN}/audio/:" \
+		-e "s:images/:/usr/share/${PN}/images/:" \
 		src/{ag.c,dlb.c} \
 		|| die "sed failed"
-	ecvs_clean
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eapply "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_install() {
-	newgamesbin ag ${PN}
-	insinto "${GAMES_DATADIR}/${PN}"
+	newbin ag ${PN}
+	insinto "/usr/share/${PN}"
 	doins wordlist.txt
 	doins -r images/ audio/
 	dodoc readme
-	prepgamesdirs
+	make_desktop_entry ${PN} "Anagramarama"
 }
diff --git a/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
index 85b194ea7928..fb60615055db 100644
--- a/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
+++ b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
@@ -1,5 +1,5 @@
---- makefile.old	2009-02-08 18:24:33.000000000 +0100
-+++ makefile	2009-02-08 18:29:12.000000000 +0100
+--- a/makefile.old	2009-02-08 18:24:33.000000000 +0100
++++ b/makefile	2009-02-08 18:29:12.000000000 +0100
 @@ -1,5 +1,4 @@
 -LFLAGS=-Wall -funroll-loops -fomit-frame-pointer -pipe -O9
 -CFLAGS=-Wall `sdl-config --cflags --libs` -funroll-loops -fomit-frame-pointer -pipe -O9 -lSDL_mixer
diff --git a/games-puzzle/angrydd/Manifest b/games-puzzle/angrydd/Manifest
index 1ef5a15ac97f..14abbd385135 100644
--- a/games-puzzle/angrydd/Manifest
+++ b/games-puzzle/angrydd/Manifest
@@ -1,3 +1,3 @@
 DIST angrydd-1.0.1.tar.gz 5331883 BLAKE2B de8a418b881f17e0869d9b8004b6db3cee56c1bb05729a5238f6357d3072ff10afb864252fcb3cef5c90d136ad7c8739afd71b88c932545203f2e9752c5eac81 SHA512 e0901833febcabb6622bb85405189bfaf3c917c3254ce282045d58e8e5b5c6c6565ca0e7c56fe2819e0d3f344df3bb285cca54c360b467d284739673d1aa74f0
-EBUILD angrydd-1.0.1-r1.ebuild 1111 BLAKE2B eaa007cc08469eb2ecefc62e299ded4f5d587753dc731edb00b44ff3d08ac3aee150cc23491034bb7ec3dd28819b596d3be39b366768af957a03c03a2b91ba03 SHA512 d3a0585c6445b16815eae8b05fd39f2cc54581de1763cf95a975bb93c2ee49814e9c4ea1e74821abc060fcd8c8d47f769cb6cd95203625bdb68bd2615c955999
+EBUILD angrydd-1.0.1-r2.ebuild 1006 BLAKE2B 7e309de57f4417e00355df3c1a5da1441d1cabdcb105b00448e12933522ae61901e3da9b4ffa0b576067156268d7ac9b148e2bd2771e41279c7d78e77748b901 SHA512 6134d6a094786875b9f9b06ed4ab8b19c3496898752378a408145d3812de548039df78d86d0dccd2acfc677745c811d1ec469c54a1cf63457e838ebf9c4ff325
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild
index 6e2173c76467..822cc2d5e973 100644
--- a/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
+++ b/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 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 python-single-r1 games
+
+inherit desktop python-single-r1
 
 DESCRIPTION="Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter"
 HOMEPAGE="https://www.sacredchao.net/~piman/angrydd/"
@@ -12,39 +13,35 @@ SRC_URI="https://www.sacredchao.net/~piman/angrydd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-RDEPEND=${DEPEND}
+IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygame[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	python_fix_shebang .
 }
 
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		PREFIX="${GAMES_DATADIR}" \
+		PREFIX="/usr/share/" \
 		TO="${PN}" \
 		install
-	rm -rf "${D}${GAMES_DATADIR}/games" "${D}${GAMES_DATADIR}/share" || die
+	rm -rf "${ED}/usr/share/games" "${ED}/usr/share/share" || die
 
-	python_optimize "${D}${GAMES_DATADIR}/${PN}"
+	python_optimize "${ED}/usr/share/${PN}"
 
-	dodir "${GAMES_BINDIR}"
-	dosym "${GAMES_DATADIR}/${PN}/angrydd.py" "${GAMES_BINDIR}/${PN}"
+	dodir /usr/bin
+	dosym "${ED}/usr/share/${PN}/angrydd.py" "/usr/bin/${PN}"
 	doman angrydd.6
 	dodoc README TODO HACKING
 
 	doicon angrydd.png
 	make_desktop_entry angrydd "Angry, Drunken Dwarves"
-
-	prepgamesdirs
 }
diff --git a/games-puzzle/color-lines/Manifest b/games-puzzle/color-lines/Manifest
index d85226a2877d..558fbc61372e 100644
--- a/games-puzzle/color-lines/Manifest
+++ b/games-puzzle/color-lines/Manifest
@@ -1,4 +1,4 @@
-AUX color-lines-0.6-Makefile.patch 995 BLAKE2B 97571d7152eb327dd42b935053851c51d0342f34d813fb8008bb083407d1c629740803a8e73e11593d80204799c0439876f5622c345431050a32ddb60d2210a9 SHA512 7c130c83d0a31a8e865812defdf70ac5113783cdbcf0ca88df72920d4c634b6705b2f686a27a3ae0e35cf2c9e3d2fdeadc7bfeb9123e9b5f1f65bb916e4d5db2
+AUX color-lines-0.6-Makefile.patch 999 BLAKE2B 81490ece15e51ea8c267155152675def9442cd403e1f8736ee23f8c453d50d3b2712c10249999ad0a05e046f8d13bea5498cfd00e5e0debaa69218931107a947 SHA512 372707ef56d86fd4f8c439767495cb10eadcd9e9683053c7179dac7e655cf423a8a2b4a1b1e0a23667263370ac4e188aa8ec6a4123416f76d40b2d115ad41148
 DIST lines_0.6.tar.gz 862137 BLAKE2B 11be598d89963b7a32479565538d85531d8bab16e46b8c5851e30cda7fd480a9d40d43b10fd3d74f2d0f820f0606aabe775ff44bbe5dd9f55551095aeb95cb60 SHA512 fe9e96b598fb6cf0980d0970facbc070715b33491a8f0ad979c57332a22e97ab801e85dd17b5d0b2a1b8aba69b48b6c42dc115b01a36654ad05a5e9a06c5405a
-EBUILD color-lines-0.6.ebuild 1046 BLAKE2B 8c3c6652cd058f4720cd3777db809475fec36529e7de89f8a652c0f0f533f1c3b22ef37544f70200c760f6f7d33ca93032b70203ea979aa11f7005e178ace87e SHA512 a65e15e2697273644198492be2fcd18987a836fc3509fcd7e5f03b4fc37e1e45ed9a7dacdeb043d5107960af98cd2c537e4f02e46ab969e77490570bbdead70c
+EBUILD color-lines-0.6-r1.ebuild 995 BLAKE2B 305616400e1967f08416b18813a78586d647e9e5fc1e976cbc96926429a883c72338ea53f46267567adc17b35e98e959b9e520bc5447b75b433246f74b3b21a5 SHA512 53ac641a27f9a3e4b71a4a042f419bd3ad5f42f3b54b05ef01580e13bdb43b06838e4d280556507e67f54407067867a8549067601b705ae242ffbf234fc8920d
 MISC metadata.xml 333 BLAKE2B 2a8b880fbec7f3e76183adc5b788587326e5560ee88419e72353c3450c106b362413b9a21d077ad336523626c11a83ad2059c5f7b0b30c21e10c3449788b75d7 SHA512 f0ff7b81095a841ea93ad665fb91e9504b5cbf97b5e3f020e61173f92fa1e2750a77732f49a2f3636b33f3d80505c4cfe0edfc9267f05e5279c38ef04e791d2a
diff --git a/games-puzzle/color-lines/color-lines-0.6.ebuild b/games-puzzle/color-lines/color-lines-0.6-r1.ebuild
index a9937b1a62ad..e239fd1588a2 100644
--- a/games-puzzle/color-lines/color-lines-0.6.ebuild
+++ b/games-puzzle/color-lines/color-lines-0.6-r1.ebuild
@@ -1,9 +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="Color lines game written with SDL with bonus features"
 HOMEPAGE="https://github.com/OpenA/color-lines-sdl"
@@ -13,37 +12,36 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
-RDEPEND="media-libs/libsdl[X,sound,video]
+RDEPEND="
+	media-libs/libsdl[X,sound,video]
 	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[wav,mod]"
+	media-libs/sdl-mixer[wav,mod]
+"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/lines-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-Makefile.patch"
+	default
+	eapply "${FILESDIR}/${P}-Makefile.patch"
 
 	sed -i \
 		-e '/^Encoding/d' \
 		-e '/^Version/d' \
 		-e '/^Icon/s/.png//' \
 		color-lines.desktop.in || die 'sed on color-lines.desktop.in failed'
-
-	epatch_user
 }
 
 src_compile() {
-	emake BINDIR="${EPREFIX}${GAMES_BINDIR}/" GAMEDATADIR="${EPREFIX}${GAMES_DATADIR}/${PN}/"
+	emake BINDIR="${EPREFIX}/usr/bin/" GAMEDATADIR="${EPREFIX}/usr/share/${PN}/"
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}/${PN}"
+	insinto "/usr/share/${PN}"
 	doins -r gfx sounds
 
 	domenu ${PN}.desktop
 	doicon icon/${PN}.png
-	dodoc ChangeLog
-	dogamesbin ${PN}
-
-	prepgamesdirs
+	einstalldocs
+	dobin ${PN}
 }
diff --git a/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch b/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
index 9f552d712713..bf1339b94a01 100644
--- a/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
+++ b/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.unix.orig	2013-04-12 13:56:42.131113000 +0400
-+++ Makefile.unix	2013-04-12 13:57:26.595946027 +0400
+--- a/Makefile.unix.orig	2013-04-12 13:56:42.131113000 +0400
++++ b/Makefile.unix	2013-04-12 13:57:26.595946027 +0400
 @@ -2,18 +2,18 @@
  VERTITLE := lines-$(VERSION)
  ARCHIVE := lines_$(VERSION).tar.gz
diff --git a/games-puzzle/concentration/Manifest b/games-puzzle/concentration/Manifest
index 11084c17c225..4af5be1be537 100644
--- a/games-puzzle/concentration/Manifest
+++ b/games-puzzle/concentration/Manifest
@@ -1,4 +1,4 @@
 AUX concentration-1.2-gentoo.patch 4615 BLAKE2B 9057a3518a3f93d4db73019e3128d00deb5b578ff6dcda11a5a05d0cae6a48b40832c1e0dd638d32aef75d70f81f9c2d75404300c261f35f3c16e9ed2115b092 SHA512 a513b43e96e6d401ea705fc9ebcfb868c4680af117551b166c20900417e977a588ab12d19ee6d7e4f58cfea1dc3799845581fb122470093b6fdba187d73689c4
 DIST concentration-1.2.tar.gz 1044563 BLAKE2B 2bd6c36be747ab16c77e5a9d01d270d82674957d3e66c07571c5dc5edbcb86aae59213992fe7a2d8ee34bbbbe8ff32157b5f5dd3125acc0ab0726e977c28c119 SHA512 afa9007cfaaa9a1cedcbfc490cb63d93d8ed1e91230ee714cece481ed3a39b73c82ec4cda65b29a27e9e71a7d2215be7f476e3217b487af54716eb4d692ca005
-EBUILD concentration-1.2-r1.ebuild 682 BLAKE2B ea9120aa2fe51d78f676f642d6c0b96cc7f6947e910c9125521a62a19ea7a40fa0bd046f5ac40cecb9b1db526695b8e9f28805ca5937f07e57cc4c15165b4537 SHA512 be7e02a4b6ddef1ac92c8e148fd9422553725da53a077a00863e4dd12cf425a337654bfcf766d9ce5621072f7b4b1632aae644762c5b097acb8fcaffd581bdca
+EBUILD concentration-1.2-r2.ebuild 650 BLAKE2B abc116b14da1f8cb4c34ebf80f927c462336f45176ee2173c351375f25e9b1bed91a28242c138ba3af9ab3e3407fb1fd1d24111e4ac101dbd19a94365de18d8e SHA512 58296e33b985c3f77f148e32c4934c8ea923ea2ba46d65586b05bf01f486c40e76539d66f7a7e16d755af8a77215728b35b8f178ac8a890026af1a98a85b9527
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/concentration/concentration-1.2-r1.ebuild b/games-puzzle/concentration/concentration-1.2-r2.ebuild
index 1aa804b6b341..5233b13dc8d8 100644
--- a/games-puzzle/concentration/concentration-1.2-r1.ebuild
+++ b/games-puzzle/concentration/concentration-1.2-r2.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="The classic memory game with some new life"
 HOMEPAGE="https://packages.gentoo.org/package/games-puzzle/concentration"
@@ -17,15 +17,12 @@ DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-ttf"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_install() {
 	default
 	newicon pics/set1/19.png ${PN}.png
 	make_desktop_entry ${PN} Concentration
-	prepgamesdirs
 }
diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
index cd1ba289d62a..ae456e550f7c 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.ebuild 1023 BLAKE2B 7c64fc731d02fbfd2b409e0f529fe319b5303ea1d4eec0852dbbe788343ae29426d07202d7c795a77b4dd38e75dec9f473d9741e14b80376681d04d233821031 SHA512 1313ce1ee24855360c9315cce257dddc7c72489f2694dbca8f03e3a89dbace79880cd6954a38bc01c08f03d8f1b65f27cde7a999928e7534533800760f48a851
+EBUILD connectagram-1.2.1-r1.ebuild 933 BLAKE2B 22baf28d3d8baf3d7e1da72bd87960143a1b3fb29a77b4f74706e9c903d7c3d7a6350d37363298ba315d328c2f44b031e0c3a72935d120b1cdcbda3eed209faa SHA512 3449296162e5e4c29599064c544ef23123ce803aaecd59081e0ffa355c90d724594592abf97e7e9620e73c2565f1f396cc5907a1470bfcb4ddb73a09d838d33a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/connectagram/connectagram-1.2.1.ebuild b/games-puzzle/connectagram/connectagram-1.2.1-r1.ebuild
index a3cf9d1c896b..2ea5d017d259 100644
--- a/games-puzzle/connectagram/connectagram-1.2.1.ebuild
+++ b/games-puzzle/connectagram/connectagram-1.2.1-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 gnome2-utils qmake-utils games
+EAPI=6
+inherit gnome2-utils qmake-utils
 
 DESCRIPTION="A word unscrambling game"
 HOMEPAGE="https://gottcode.org/connectagram/"
@@ -13,18 +13,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-qt/qtcore-5.2:5
+RDEPEND="
+	>=dev-qt/qtcore-5.2:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
-	>=dev-qt/qtgui-5.2:5"
+	>=dev-qt/qtgui-5.2:5
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	default
+
+	eapply "${FILESDIR}"/${P}-gentoo.patch
 
 	sed -i \
-		-e "s#@GAMES_BINDIR@#${GAMES_BINDIR}#" \
-		-e "s#@GAMES_DATADIR@#${GAMES_DATADIR}#" \
+		-e "s#@GAMES_BINDIR@#/usr/bin#" \
+		-e "s#@GAMES_DATADIR@#/usr/share#" \
 		${PN}.pro src/{locale_dialog,new_game_dialog,wordlist}.cpp || die
 }
 
@@ -34,18 +38,15 @@ src_configure() {
 
 src_install() {
 	emake INSTALL_ROOT="${D}" install
-	dodoc CREDITS ChangeLog NEWS README
-	prepgamesdirs
+	einstalldocs
 }
 
 pkg_preinst() {
 	gnome2_icon_savelist
-	games_pkg_preinst
 }
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	games_pkg_postinst
 }
 
 pkg_postrm() {
diff --git a/games-puzzle/construo/Manifest b/games-puzzle/construo/Manifest
index f0a61e4ed5f8..6f0031e82025 100644
--- a/games-puzzle/construo/Manifest
+++ b/games-puzzle/construo/Manifest
@@ -1,5 +1,5 @@
-AUX construo-0.2.2-gcc43.patch 1785 BLAKE2B 5dcfbdfcc63bf4150e4d3667527660bf715fbb5fa588250cec5be8ca0451b814f966267fd88e5fc5c4776d9fa0aed2a776baea69d9c4db58c2b4640b3ff31cc0 SHA512 25b226897804de23fa45f89a2b94bc86f69766916180f61d6c59e7a47c69b6b574fe649a9d6e37d8488600747210e06adde7a5fed26b4fea4663e32e46d13d42
-AUX construo-0.2.2-lGLU.patch 425 BLAKE2B a231ac485cdb9af52479199795674a2d87d60bdc81e870224dfdc08a92e56353dfd58b3521673e683a3ad2c6d32c112c8fc682410c6d2d55a420a78bd71b85a9 SHA512 a450d5dee7f71d649b2d7d853875576701311de7c6dee2f21217d07dce59f19226dabe3be99d85f74454a690ce409cf7450c8f1cbe942f7388cfde2be5a05208
+AUX construo-0.2.2-gcc43.patch 1813 BLAKE2B 514c17651894fa7f991abe397696fae5de567579730635d6b115cfe18099bd98a575e7bb104f73607b0809be90b7e882d41a72875fc4d34801694ec4c6479c6d SHA512 5865311df15e510a4212778cf7bfc2cf82c60449841f3d9717b4d04a2a241977319296b7696567a39c95e16b1f94fe2959c9eb8775b3b56b0e804335c73159ed
+AUX construo-0.2.2-lGLU.patch 429 BLAKE2B da44fd32544394f66fd0ab5f5cda3cccf0cbe65646b73d38b672902cc639355ddb9bbbfe8f6255fc9253fe78444468593dfffc7d6bf9c6b69aa16dfa0027a314 SHA512 2fcba9fdc7f96bd802341a42bba33ca659152421d1ba7f6a1d56a5de75f5811ee08298831f1c3951e364600146364e64efdc9a67a45bb9f946ab19867bff27b2
 DIST construo-0.2.2.tar.gz 442626 BLAKE2B c6c9c566c8e4014aba1e06d12af2c3c3076d533a9f11513e903a6fff027ecbd3b492c1ca35a50b42dbd0aea5064614147529f2dcfd6b75af2376a7a410fdc470 SHA512 b73854a64aedcb9ddcd8f2c3e809f975ef3d2f63bdefd2e126c808a4154d7ff3d402457f9da5f866e6b9d74c6010ffc58d44b04277976fe1a9aeabc20ea786a9
-EBUILD construo-0.2.2.ebuild 821 BLAKE2B 4b053fc9d4e98183075bf8d87d3ec72b4befd062c357f870cba9bd7761b39391a4c7aa878701f628cfb225c242e5e2764a4f829c12b5823eff551149ed0fdc63 SHA512 70f125e1ce726ec0e78f304956d947dbed0931057871cf11d7e5337434063ab31c454946f3efb1f156098a76b4fc96ffcfbaa1a0e9d53cf4074ae373c030373a
+EBUILD construo-0.2.2-r1.ebuild 836 BLAKE2B 4268fff99a65022d6d2903b831e4ecb09d2583cdacaf0511d06bb422e94004bde92e323afdee1ed4999cdb376b933ac7d7b907db292618c509e8a6fb9fc969a3 SHA512 64de5fbaddb4a5287cebf8b609b5fb9f820ad2e2295e19369211e3334e6ac9f64dd857d953b92a6134f3d93c4c0fb54636a8ab90b47cd68e860055b1838824d0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/construo/construo-0.2.2.ebuild b/games-puzzle/construo/construo-0.2.2-r1.ebuild
index d74b179844e6..1f7406534412 100644
--- a/games-puzzle/construo/construo-0.2.2.ebuild
+++ b/games-puzzle/construo/construo-0.2.2-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 autotools games
+EAPI=6
+inherit autotools desktop
 
 DESCRIPTION="2d construction toy with objects that react on physical forces"
 HOMEPAGE="http://www.nongnu.org/construo/"
@@ -13,26 +13,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	virtual/glu
 	media-libs/freeglut
-	x11-libs/libXxf86vm"
+	x11-libs/libXxf86vm
+"
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-lGLU.patch
 	sed -i -e 's/^bindir=.*/bindir=@bindir@/' Makefile.am || die
 	eautoreconf
 }
 
-src_configure() {
-	egamesconf --datadir="${GAMES_DATADIR_BASE}"
-}
-
 src_install() {
 	default
-	prepgamesdirs
+	make_desktop_entry "${PN}.glut" "${PN}.glut"
+	make_desktop_entry "${PN}.x11" "${PN}.x11"
 }
diff --git a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
index cc946b043bae..48165ed21df0 100644
--- a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
+++ b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
@@ -1,5 +1,5 @@
---- command_line.cxx
-+++ command_line.cxx
+--- a/command_line.cxx
++++ b/command_line.cxx
 @@ -19,7 +19,9 @@
  
  #include <config.h>
@@ -11,8 +11,8 @@
  #include "settings.hxx"
  #include "command_line.hxx"
  
---- config.hxx
-+++ config.hxx
+--- a/config.hxx
++++ b/config.hxx
 @@ -21,6 +21,7 @@
  #define CONFIG_HH
  
@@ -21,8 +21,8 @@
  
  class Config
  {
---- lisp_reader.cxx
-+++ lisp_reader.cxx
+--- a/lisp_reader.cxx
++++ b/lisp_reader.cxx
 @@ -17,6 +17,7 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -31,8 +31,8 @@
  #include "construo_error.hxx"
  #include "lisp_reader.hxx"
  
---- unix_system.cxx
-+++ unix_system.cxx
+--- a/unix_system.cxx
++++ b/unix_system.cxx
 @@ -17,8 +17,9 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -45,8 +45,8 @@
  #include <unistd.h>
  #include <sys/time.h>
  #include <time.h>
---- vector.cxx
-+++ vector.cxx
+--- a/vector.cxx
++++ b/vector.cxx
 @@ -16,8 +16,8 @@
  	totally replaced old CL_Vector with this code
  */
@@ -58,8 +58,8 @@
  #include "vector.hxx"
  
  CL_Vector::CL_Vector(float x, float y, float z, float w)
---- world.cxx
-+++ world.cxx
+--- a/world.cxx
++++ b/world.cxx
 @@ -17,7 +17,8 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -70,8 +70,8 @@
  #include <algorithm>
  #include "config.h"
  
---- x11_display.cxx
-+++ x11_display.cxx
+--- a/x11_display.cxx
++++ b/x11_display.cxx
 @@ -19,6 +19,7 @@
  
  #include <config.h>
diff --git a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
index 4c0b018cfdc1..be8e7b604d6f 100644
--- a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
+++ b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
@@ -1,5 +1,5 @@
---- configure.ac.old	2009-11-24 18:27:48.000000000 +0100
-+++ configure.ac	2009-11-24 18:28:29.000000000 +0100
+--- a/configure.ac.old	2009-11-24 18:27:48.000000000 +0100
++++ b/configure.ac	2009-11-24 18:28:29.000000000 +0100
 @@ -114,7 +114,7 @@
  AC_CHECK_LIB(glut, glutMainLoop,
  [
diff --git a/games-puzzle/cuyo/Manifest b/games-puzzle/cuyo/Manifest
index 068e56945ac0..789809a6823c 100644
--- a/games-puzzle/cuyo/Manifest
+++ b/games-puzzle/cuyo/Manifest
@@ -2,5 +2,5 @@ AUX cuyo-2.1.1-gcc44.patch 161 BLAKE2B f6b288dfdf81ac39d0c58e144e36ed554bbec67c5
 AUX cuyo-2.1.1-gcc6.patch 1024 BLAKE2B 12331f090b146d9f26b1a1300830153a599354c302cbe6d400eb3b39b403071853fcdc0a9559da23a0167d863794499e97f9a1f409333b722d9b95cfa9492e3c SHA512 ae8733da8afceee4e54ac8cac5a11d20a1adce494d76cdfaa821ffeba64886d9b0c9680fdab013c67e641bac9c96ba3dc23d1ecb86d1b59ca3f354692d218d2c
 AUX cuyo-2.1.1-gentoo.patch 851 BLAKE2B 70c082a9e19ca1a093810c810825986390abe5a0b0c671eb97dd95e731ee529a9aea1491f3c59651648ad0e9c451ecb269a66d0b17b4f0b237b961e47117e9a7 SHA512 c96c855c4650f50d6ed1c38d7105047f386c1828592389ce482cecefeb46bae224ee46f6f07dc63bbed67d81e4beadd5868962ad52dcca8fd9f99f3ea0899f8a
 DIST cuyo-2.~-1.1.tar.gz 3005426 BLAKE2B af83365568b16d230b8f253589c0300e1ba29471c8a406bd161da20b8282da4ca845aa1a06b8c5b2bf076828a71e0add9c317b710c476f56540a29f87dc53194 SHA512 a29c6ffc7e63b74dd93e8aeeace78bdbc50398771922aaf06a43256c883f9eff23e10fa91e4964b716cd209551cef771cf00108fb7977ce13a463da542322787
-EBUILD cuyo-2.1.1.ebuild 1022 BLAKE2B 1c2242783c94d5b1ee76cbd5e0373600dc8165dc28bf8f117886accbfa643c3cd96598a31caa51bc71308646242ab1978fe46e1603ecde7d5046f19f7b487b10 SHA512 86e60646a246caf007efd78d56ca2d3b7c294d35cb5868a138138bac14e32be0c83f8197465f740153fc33fbf2bc3bd69b02cdbc05803025a51ab3cff7014026
+EBUILD cuyo-2.1.1-r1.ebuild 941 BLAKE2B 37b6a8a120d67ec0fa16474ec79a42f320493d9e14b540eeccd3601f80bc3844f73ea44cb3e17b27cc7a909df24b2915cc261378f2a3d78486f4f7bb6f851f16 SHA512 e779d2b956903e8f587b52f5268bd264bbfbbc39a7c60340e2a968a2507059c63292afd6d3e0d96e90c1a88bf2f43492334b3f005c79e94ac595cf1873d87a60
 MISC metadata.xml 324 BLAKE2B 2d20b6235b6445d30b7da2729b4e3367456ebd9ea2b4ce290044e1202714ed0b460151e02af09648fe23e8095ee8aacac77923d232be8d8e0656f35e6f54387b SHA512 3392ab16d9e90d0dd6dba06994ba2096940075961de7e6fed43d70946e82916af7b40e95bd27e25d5eba9d9eb46afe61fe4200147385cc93211ab14c0e6b13ce
diff --git a/games-puzzle/cuyo/cuyo-2.1.1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild
index 3469a41670fb..55b13cc7ed85 100644
--- a/games-puzzle/cuyo/cuyo-2.1.1.ebuild
+++ b/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild
@@ -1,10 +1,10 @@
-# 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 gnome2-utils versionator games
+EAPI=6
+inherit autotools gnome2-utils versionator
 
-MY_P=${PN}-$(get_version_component_range 1).~-$(get_version_component_range 2-3)
+MY_P="${PN}-$(get_version_component_range 1).~-$(get_version_component_range 2-3)"
 DESCRIPTION="highly addictive and remotely related to tetris"
 HOMEPAGE="http://www.karimmi.de/cuyo/"
 SRC_URI="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz"
@@ -18,31 +18,26 @@ DEPEND="sys-libs/zlib
 	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer
 	music? ( media-libs/sdl-mixer[mod] )
-	media-libs/sdl-image"
+	media-libs/sdl-image
+"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-gentoo.patch \
 		"${FILESDIR}"/${P}-gcc6.patch
 	eautoreconf
 }
 
-src_install() {
-	default
-	prepgamesdirs
-}
-
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-puzzle/einstein/Manifest b/games-puzzle/einstein/Manifest
index 77a9c48f7471..11ee45776453 100644
--- a/games-puzzle/einstein/Manifest
+++ b/games-puzzle/einstein/Manifest
@@ -1,7 +1,5 @@
-AUX einstein-2.0-64bit.patch 990 BLAKE2B 326faa3086f700751adffdb77d3fc36c1bf19d2ead4c89d3b77966f1c61a768791f58676dfef752e811b0bf1455d95e604403221bc014282bde97505777d9784 SHA512 36115b1519edfd1e666f14ca3c98b50ea963bec35a2b75a77c3923debf40f3aced1b8d5b2bccf079fd8cdbf45df7ec9619a5eb6f4caaafcad293e9b90aef270b
-AUX einstein-2.0-as-needed.patch 310 BLAKE2B 8819ca86ac76155b4a15920318b1b3d0718665c1bf347720f8ebe594cc4ef92d05696e797f5dc5afe806876a0d4423fee3effb20f4150df8a59c4f27cfac1ec5 SHA512 b535f4dae3fd20728805b3ddbf45f7b9bd29ab82047455bdccc7a1714d75dafd7608a6488ff3a41d5effd9c92ca26a8c74c767b3cc2b835130d8a1e411a26f09
-AUX einstein-2.0-gcc43.patch 391 BLAKE2B 155966d1dcd412dd56903d15f9fd10569abb4cd1c518f04a43cdc28973992b15cd725d59807cd1f826743c28bd0a17d8f4ba486a3daa2bd2b987ad2ffee0e857 SHA512 40900fc551f794b58bd3458a5289c2adfbf439a6bfcb477ce777531545e69056747e856dbe24a181c7748e583fadab14ab622e5d044a0836115dd9ee15a40e98
-DIST einstein-2.0-src.tar.gz 722301 BLAKE2B 3cb857bbbbfe9d3dab763d461dfe0c91ed204ac2e080a6d546e35cb869da05a8735900bd1db071074628b11f77e675bc21a811a79079587c6388b58ba401dcd1 SHA512 45599546f2f7fce32f7441cfdae88b72297f4a506d9eb98a64c3b24ec2e2fd86a63d59961a21e017df6a7a676d864ad12598d735f9049adf43cddd91d661f619
+AUX einstein-2.0-as-needed.patch 314 BLAKE2B a76c5d93cf391eed152c151618c47db2029f70fa711dca0b816de9d6c282cb3da9f3455e99ddf0ba308db14daca1f228eef32ab76c26b5d53b300acb5ba0afc8 SHA512 4943199a89fb19025618c1a95afc4e57f740259992997460292af1cbdd764d668538c5acca2e1077bdfb78936c66b3a88e698194167ad72b3ee8e42501070dd3
+DIST einstein-2.1.1.tar.gz 1317979 BLAKE2B 7924774c2d540ecd7cbecb344907d20ab9514219407a02852bbd80bbb9d1d27bac14654a1553dbe30e8f0fd79e08f12338a4e43dfc3c06bfb433fb3a46330a64 SHA512 e34e8e0ef47c311d7417c42ba306b9e9cf94d1fd1829b3948d791543d1fb5f8f1d8d975154bab2559691cf3b94574d5485f8541882d59dd0b6284ff76e435cf3
 DIST einstein.png 932 BLAKE2B 13ecf24e5600bf39bbaec662afda5b4fdba2c5adf4560e8f08996b2e6c475002857187be2dac2d2c898cdb63854cc7ea1748b6b1d34a67adcc2f4789aafd5c25 SHA512 9e19d351e915509a11d7275ef0ea7e246d0d334933ec4b48ea0f56aa552ac69041a5c2a64075b02ec3601b1c2b8307cef314c9427ab7615b16e689faaa074283
-EBUILD einstein-2.0.ebuild 1035 BLAKE2B ce339be8aa005c0c626eb2c36705e6625aa89c5464f1767f6fa5cb7b79e0bc3c6a4aea0e025d0ad1ca309120dbeaef4a5733115fd3b06ad254406db7ccf7f105 SHA512 d8ee94e45def134377571f16a55aa4cac09b4ad4f9fd72cbf9892817d62f8700f911371c7b87d471d35594e9a4f7af7110df3dcdfdcaa3c15cb30d4f9485fdac
+EBUILD einstein-2.1.1.ebuild 909 BLAKE2B d01a1d5614203f3da997ce819cab6a1660187c615ea4f987ebb55a797348fba072ae57e06b8853fb6fe27d253e38038b88439cb94c5bad6a504c79cf0d0b9d65 SHA512 cf7c474f025a4e0d9a8eef09d5e50047ece42e9c33682a9c84453ee0aff03753be660d310d8abbb71e15854e5f54906b55cfeea04a8a0f70da097eb323ad536a
 MISC metadata.xml 334 BLAKE2B bd52f381c3b7a79dfad6318f086d3ac04f1e52e0707dc4556a886dcd37416f191a36d4e47e22b67b7539d99b00159f179a12b12faeafe2c2c1ca7b42c4226255 SHA512 defe221da415005e05b0b8d58edd84050a565b3249bfd0eae9875f92a67ee0faf320f86cd2b6f703add270f86edfc187e8597fb659b4499e092825b82cd91f64
diff --git a/games-puzzle/einstein/einstein-2.0.ebuild b/games-puzzle/einstein/einstein-2.1.1.ebuild
index a689cf7dc9f5..857e57a6e54a 100644
--- a/games-puzzle/einstein/einstein-2.0.ebuild
+++ b/games-puzzle/einstein/einstein-2.1.1.ebuild
@@ -1,12 +1,12 @@
-# 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 puzzle game inspired by Albert Einstein"
-HOMEPAGE="https://freecode.com/projects/einsteinpuzzle"
-SRC_URI="mirror://gentoo/${P}-src.tar.gz
+HOMEPAGE="https://github.com/lksj/einstein-puzzle"
+SRC_URI="https://github.com/lksj/einstein-puzzle/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	mirror://gentoo/${PN}.png"
 
 LICENSE="GPL-2"
@@ -19,24 +19,22 @@ DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-ttf"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/${PN}-puzzle-${PV}"
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}*.patch
+	default
+	eapply "${FILESDIR}"/${PN}-2.0-as-needed.patch
 	sed -i \
-		-e "/PREFIX/s:/usr/local:${GAMES_PREFIX}:" \
-		-e "s:\$(PREFIX)/share/einstein:${GAMES_DATADIR}/${PN}:" \
-		-e "s:\$(PREFIX)/bin:${GAMES_BINDIR}:" \
+		-e "/PREFIX/s:/usr/local:/usr:" \
 		-e "s/\(OPTIMIZE=[^#]*\)/\0 ${CXXFLAGS}/" Makefile \
 		|| die
-	sed -i \
-		-e "s:PREFIX L\"/share/einstein:L\"${GAMES_DATADIR}/${PN}:" main.cpp \
-		|| die
 }
 
 src_install() {
-	dogamesbin "${PN}"
-	insinto "${GAMES_DATADIR}/${PN}/res"
+	dobin "${PN}"
+	insinto "/usr/share/${PN}/res"
 	doins einstein.res
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} "Einstein Puzzle"
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-puzzle/einstein/files/einstein-2.0-64bit.patch b/games-puzzle/einstein/files/einstein-2.0-64bit.patch
deleted file mode 100644
index 4d6656252898..000000000000
--- a/games-puzzle/einstein/files/einstein-2.0-64bit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- einstein-2.0.orig/formatter.cpp
-+++ einstein-2.0/formatter.cpp
-@@ -58,7 +58,7 @@
-             if ((c.type == INT_ARG) || (c.type == STRING_ARG) ||
-                     (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG))
-             {
--                int no = (int)c.data;
-+                long int no = (long int)c.data;
-                 args[no - 1] = c.type;
-             }
-         }
-@@ -123,7 +123,7 @@
- std::wstring Formatter::format(std::vector<ArgValue*> &argValues) const
- {
-     std::wstring s;
--    int no;
-+    long int no;
- 
-     for (int i = 0; i < commandsCnt; i++) {
-         Command *cmd = &commands[i];
-@@ -135,8 +135,8 @@
-                 
-             case STRING_ARG:
-             case INT_ARG:
--                no = (int)cmd->data - 1;
--                if (no < (int)argValues.size())
-+                no = (long int)cmd->data - 1;
-+                if (no < (long int)argValues.size())
-                     s += argValues[no]->format(cmd);
-                 break;
- 
diff --git a/games-puzzle/einstein/files/einstein-2.0-as-needed.patch b/games-puzzle/einstein/files/einstein-2.0-as-needed.patch
index fe870bf036e7..3edb666ad690 100644
--- a/games-puzzle/einstein/files/einstein-2.0-as-needed.patch
+++ b/games-puzzle/einstein/files/einstein-2.0-as-needed.patch
@@ -1,5 +1,5 @@
---- Makefile.old        2009-02-09 16:37:58.000000000 +0100
-+++ Makefile    2009-02-09 16:38:13.000000000 +0100
+--- a/Makefile.old        2009-02-09 16:37:58.000000000 +0100
++++ b/Makefile    2009-02-09 16:38:13.000000000 +0100
 @@ -49,7 +49,7 @@
  
  
diff --git a/games-puzzle/einstein/files/einstein-2.0-gcc43.patch b/games-puzzle/einstein/files/einstein-2.0-gcc43.patch
deleted file mode 100644
index 25e1815e5e41..000000000000
--- a/games-puzzle/einstein/files/einstein-2.0-gcc43.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- einstein-2.0.orig/convert.h
-+++ einstein-2.0/convert.h
-@@ -5,6 +5,7 @@
- #include <iostream>
- #include <sstream>
- #include <string>
-+#include <typeinfo>
- 
- #include "exceptions.h"
- #include "unicode.h"
-
---- einstein-2.0.orig/unicode.cpp
-+++ einstein-2.0/unicode.cpp
-@@ -1,5 +1,6 @@
- #include <wchar.h>
- #include <stdlib.h>
-+#include <string.h>
- #ifdef WIN32
- #include <windows.h>
- #endif
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index 6d892b370f13..95e29c1ff023 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,5 +1,5 @@
 AUX enigma-1.21-build.patch 3543 BLAKE2B bb4cd5fc8105b15cf913e8a5f6baeb58cba93965a422a7bd514fc4eea848f73f65853595da023e3458a48f861d7a42f1300dfd90418600f4432c327114ab4f17 SHA512 accfb31abaadbee476961f38cc2f76a1fceac4befbf4721d4e08061a3509d05f2e534b4f8f69f1765e082a4ed4f70ccbba0c73c4479a49ee1cfde4c1ae1cdcc4
 AUX enigma-1.21-gcc6.patch 927 BLAKE2B 279415c5cf96e9f4db37b29b4555fe2d66ce82c3c04199281c175176bab812351a342633888c524558d4f9362ccd1b1602fd7fc100e062e45bbac85fe966e06f SHA512 d0eb1f356370431e3b3b96c7fa3a56ca52ed15fa94286d1b5075ba8a4b4b349deb676479bd8e045a7463f65a3885c44aab90166549850e19c510d606aed2e746
 DIST enigma-1.21.tar.gz 56409951 BLAKE2B c03cf3c66cb1df771671c6c92d5a64e66ab78c2abbf25008285dedb5db10fb1c8daf2053c15a09147e00f0a22a7882e47b1c6ed66588b2397deec084456af1b9 SHA512 0cca56a193f0f416e0fde02caf2e30b61eef506b6c62e151ff575f5c130f1e2e778d77149007b114ebaeec3a3e793434328555cb5190954a0ae13ed6cee229f0
-EBUILD enigma-1.21-r2.ebuild 1576 BLAKE2B 1bdc2534233e343d263d5fb413e8edfcaeb4d40471b8b035e803b8e7c66bb2d4e646a6fb5477c0f80ab9b3b3285fa66c0cac474c1bfeb3ec76e99d544dd97ee5 SHA512 94bb0f9654e601b7357fb994fe36f8c066b98fe95ca00bdf8b3fc39e2ba9f49e8143611ea95bbf93fdd650c7909c3845cc219162997b791e8eef0cbdf2792679
+EBUILD enigma-1.21-r3.ebuild 1503 BLAKE2B 3e1a2bc825ed265e7cb362c9d42b73e01157123c48552406ed6ce52844759189292da998da668c6791f96eb18900d40f26aad125ec482a0a100e79e44ab352ed SHA512 052f053424ddafe241002e78a8107eafe412048113bd0d97f8ca0351d7fb3fd0fb30d021ec2b76ebc57ec9ed1a176559128afdfd517d59c95f25c3ebf1010ae2
 MISC metadata.xml 334 BLAKE2B 8e61a1119a930895b0773b8865550fde4bf532532ea4e904d537a6f4f93a27580841d121ff246bc4f9f60849a2224bedaf91bcb2e8ce3aa0b2a6ebee51dff1a8 SHA512 885fc4263252767f8861f2d45dc11a319cb5b0a7a9eccdf073a0433ba4908d97f7a590a96ae542372e53f16780a41cee4ee80556c0cedffbf34f6e4bcadeacc6
diff --git a/games-puzzle/enigma/enigma-1.21-r2.ebuild b/games-puzzle/enigma/enigma-1.21-r3.ebuild
index c9b2e6c38ed0..bdecef930251 100644
--- a/games-puzzle/enigma/enigma-1.21-r2.ebuild
+++ b/games-puzzle/enigma/enigma-1.21-r3.ebuild
@@ -1,10 +1,10 @@
-# 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 gnome2-utils games
+EAPI=6
+inherit autotools gnome2-utils
 
-DESCRIPTION="puzzle game similar to Oxyd"
+DESCRIPTION="Puzzle game similar to Oxyd"
 HOMEPAGE="http://www.nongnu.org/enigma/"
 SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz"
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-COMMON_DEPS="media-libs/sdl-ttf
+COMMON_DEPS="
+	media-libs/sdl-ttf
 	media-libs/libsdl[video]
 	media-libs/sdl-mixer
 	media-libs/sdl-image[jpeg,png]
@@ -22,16 +23,20 @@ COMMON_DEPS="media-libs/sdl-ttf
 	net-misc/curl
 	|| ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] )
 	net-libs/enet:=
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 DEPEND="${COMMON_DEPS}
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 RDEPEND="${COMMON_DEPS}
 	media-fonts/dejavu
-	x11-misc/xdg-utils"
+	x11-misc/xdg-utils
+"
 
 src_prepare() {
+	default
 	cp /usr/share/gettext/config.rpath .
-	epatch "${FILESDIR}"/${P}-build.patch \
+	eapply "${FILESDIR}"/${P}-build.patch \
 		"${FILESDIR}"/${P}-gcc6.patch
 	sed -i \
 		-e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \
@@ -40,32 +45,28 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		--with-system-enet \
 		$(use_enable nls)
 }
 
 src_install() {
-	DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \
+	HTML_DOCS="doc/*" DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \
 		default
 	dosym \
 		/usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \
-		"${GAMES_DATADIR}"/${PN}/fonts/DejaVuSansCondensed.ttf
+		/usr/share/${PN}/fonts/DejaVuSansCondensed.ttf
 	dosym \
 		/usr/share/fonts/dejavu/DejaVuSans.ttf \
-		"${GAMES_DATADIR}"/${PN}/fonts/vera_sans.ttf
-	dohtml -r doc/*
+		/usr/share/${PN}/fonts/vera_sans.ttf
 	doman doc/enigma.6
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-puzzle/fbg/Manifest b/games-puzzle/fbg/Manifest
index 5b283427f3d5..26743052b907 100644
--- a/games-puzzle/fbg/Manifest
+++ b/games-puzzle/fbg/Manifest
@@ -1,3 +1,3 @@
 DIST fbg-0.9.tar.gz 1127384 BLAKE2B c732f0bfce5cdf92ed94b75764403f1e64efebdb6be92b900704601922a9a3e9f86de975613778aad9c5685303fc9e31dbd624283cc8ad2964cbf3c9c42b27b6 SHA512 8aede56515da472509068037bd295d7a37f365dd54ea8332c02409e84bf685b76f1733b93b90fa49ca58e9094a4506137c6459d4761a929cfa2e60bb0907a353
-EBUILD fbg-0.9-r1.ebuild 822 BLAKE2B 0288f9fb43dd0872f87abece38045e1f56448cb96502bc355d80cb384c617acec2ece4b2a0d9590629d980cde6b8c7c13cd3681fb665d209ca8f4df4cc875204 SHA512 9808c33e1e774510299f5da527473be44898aabe696fdb1c6f78e204eace6dfdd6aecc149c9af846fdcdb189ef821b596c37e2bd0de5f8ae07a0fb930f081c5d
+EBUILD fbg-0.9-r2.ebuild 791 BLAKE2B 0eec4a1245d54542666bc46299034668774242b606a9e904d879661b295460b448f03ee9d02c99b15caed692c6b190ace7acfce91a8146b81c448d3abc59b01b SHA512 34ee1ebd58eaccb2dddbe8742c006dd5a6ddf47d8b5dc572cdd7ce0fbdd473313c80fdd1f5856c94d25f434b22cf80909a2d80a1b92ccb250b894d43cb8b96a5
 MISC metadata.xml 326 BLAKE2B 8488642d926fbabc6c18c7739859dbf7b3ff8f14253d3bf30bf6402000cc7dbc4d9143ecf4bcf04309200f5ce346b958e1a8c148ee8cc15455763b5983d9499f SHA512 530accf52134a0d9947a35e2499225d8557410008a5df1b8bb2189eabe7c8cda7787a5ce05ec4efe5af67a9a2e1aae30008c18bf97f2c46a9608d3625bdc5ea2
diff --git a/games-puzzle/fbg/fbg-0.9-r1.ebuild b/games-puzzle/fbg/fbg-0.9-r2.ebuild
index e516d714b0d6..b0c84fa8eeca 100644
--- a/games-puzzle/fbg/fbg-0.9-r1.ebuild
+++ b/games-puzzle/fbg/fbg-0.9-r2.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 Tetris clone written in OpenGL"
 HOMEPAGE="http://fbg.sourceforge.net/"
@@ -19,23 +19,23 @@ DEPEND="virtual/opengl
 	media-libs/libsdl[opengl,video]
 	media-libs/libmikmod
 	x11-libs/libXt"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
 	sed -i \
-		-e "/FBGDATADIR=/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" \
+		-e "/FBGDATADIR=/s:\".*\":\"/usr/share/${PN}\":" \
 		-e '/^datadir=/d' \
 		configure || die
 }
 
 src_configure() {
-	egamesconf --disable-fbglaunch
+	econf --disable-fbglaunch
 }
 
 src_install() {
 	default
 	newicon startfbg/icon.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Falling Block Game" ${PN}
-	rm -rf "${D}/${GAMES_PREFIX}"/doc
-	prepgamesdirs
+	rm -rf "${ED}/usr/doc"
 }
diff --git a/games-puzzle/fish-fillets/Manifest b/games-puzzle/fish-fillets/Manifest
index 2016d253d06a..92509c1e6f18 100644
--- a/games-puzzle/fish-fillets/Manifest
+++ b/games-puzzle/fish-fillets/Manifest
@@ -1,4 +1,4 @@
 DIST fillets-ng-1.0.1.tar.gz 380290 BLAKE2B 675839cb451686c35611120b0b8e1044bc6511ce2369157f7d7c934eb0477b10e925268ffb35d5415070f25d7469da249027f148ac06ba65bd139fbddfb20a03 SHA512 fe4a5186f94e953cbc85fe8b0ce804c881c96feda385cfc36e1840e448cf094c3d815fdbe32976a6697a855038951f97a384c277a1c52a048520e8da71136718
 DIST fillets-ng-data-1.0.0.tar.gz 146418413 BLAKE2B 0359cee1db5d54a124f76520c4c416d954969bd9fc79eb9305613549722133684c2f6696b754729316ca4f4ebcc3aff63db845fd71ffc955d5e9584d89a50999 SHA512 61c7fe3980510a7dbd85f4c246e7e42a0f79d8e2aacd96a0c7a14189c5dee92292efb030ac92299474162995039073288283fee0f352cf08be6975a2c86703e7
-EBUILD fish-fillets-1.0.1.ebuild 1267 BLAKE2B 89f4d0006be91c0b2399fc71f3243f5752b0b982d74d9c444cf229f86ca825b15b302fb4c6d744eddf661023c31310acc56746989008374e3abd0b6b1a29db03 SHA512 b6b97f23b9d5ecdc5b3d9ccc8b26513727977657874364bb77bdb49866416c1794c67b1bec4c360bd38c59cb861fd8925ee0e8e1aceb7a9a2f269e36cdf20556
+EBUILD fish-fillets-1.0.1-r1.ebuild 1292 BLAKE2B 0b87179878b44942f3341a23c965f96db07abe3e86eeb312e0081484196648d363a29635b9dc152ca6a2ef65c63cc6e55d216902e3812b1edc80a0e398f93891 SHA512 84a81e5956a0a23143d8f2c75936938b865c2705f093091a0ade7fb1808c26629c41beab6c5de90a1b585421836511ed33a943188fbcdb7f2c6825d36bfb92c6
 MISC metadata.xml 330 BLAKE2B 47ef211faf9977fbf1b3f58ead7b59c2b025e3b731433586d948d82b3f25b95470beb1904981bc001cd4f086deb133c809ac4676c553135502f0b00699c6b996 SHA512 dbe794bba7ca2d4414f5ea3b4ef5b8958268abf2f8bd45705300baddcca5cbb485ddc24b3328e25568b9aa741c50251417ee4100f3f118827fcc5c1a285dba66
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
index fec0213902dd..722c291c1dd8 100644
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.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 autotools eutils games
+EAPI=6
+inherit autotools desktop
 
 DATA_PV="1.0.0"
 DESCRIPTION="Underwater puzzle game - find a safe way out"
@@ -15,41 +15,45 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=media-libs/libsdl-1.2[sound,video]
+RDEPEND="
+	>=media-libs/libsdl-1.2[sound,video]
 	>=media-libs/sdl-mixer-1.2.5[vorbis]
 	>=media-libs/sdl-image-1.2.2[png]
 	media-libs/smpeg
 	x11-libs/libX11
 	media-libs/sdl-ttf
 	dev-libs/fribidi
-	>=dev-lang/lua-5:0"
+	>=dev-lang/lua-5:0
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-S=${WORKDIR}/fillets-ng-${PV}
+S="${WORKDIR}/fillets-ng-${PV}"
 
 src_prepare() {
+	default
 	#.mod was renamed to .fmod in lua 5.1.3 - bug #223271
 	sed -i \
 		-e 's/\.mod(/.fmod(/' \
 		$(grep -rl "\.mod\>" "${WORKDIR}"/fillets-ng-data-${DATA_PV}) \
 		|| die "sed failed"
 	rm -f missing
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
-	egamesconf \
-		--datadir="${GAMES_DATADIR}/${PN}"
+	econf --datadir="/usr/share/${PN}"
 }
 
 src_install() {
 	default
-	insinto "${GAMES_DATADIR}/${PN}"
+	insinto "/usr/share/${PN}"
 	cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
 	rm -f COPYING
+	einstalldocs
 	doins -r *
 	newicon images/icon.png ${PN}.png
 	make_desktop_entry fillets "Fish Fillets NG"
-	prepgamesdirs
 }
diff --git a/games-puzzle/flobopuyo/Manifest b/games-puzzle/flobopuyo/Manifest
index 54b62d323c4d..59ba75160a57 100644
--- a/games-puzzle/flobopuyo/Manifest
+++ b/games-puzzle/flobopuyo/Manifest
@@ -1,7 +1,7 @@
 AUX flobopuyo-0.20-gcc4.patch 967 BLAKE2B befdc13ec4da55497fae89f79aa1ad518738ffd69a8eae10167551dc45daeffbb9130adb319e426a8d5c65e2743a0bfc0d83dfec2ee19855d72fe86d0dba4478 SHA512 f1bfdbf6ba4e4fc2be453aa7d2299f70a2a47a1906e2b7043ef8c14a7b4c8e5bc1de29565e1404ba9c6688c03f4439f123b3325f3223bd3771eee9fe458ecd62
 AUX flobopuyo-0.20-gcc41.patch 447 BLAKE2B 189a5e2f970fd4e9ea1e5e12b6344e9c96d29a4de99ace9a9fbcaba35b832369159535d3195c871b91e75678b97f274fc0e4bf788a17608fdf7ab84a75716228 SHA512 05b888959fcc4e1bc0a1248c9efdbdc9768ee25382fb67dad1d49214c7180e97fa498853bca4483c7786f946d9b0527cfbd79065e5585cc26f72ade3900219ec
-AUX flobopuyo-0.20-libs.patch 4683 BLAKE2B 90711649b460b3a335cdd70fd337b4db275cc5eeb4671bf1a55e26c9cfb72119f4873ad0bb90ebe354fe65439c46c7972a85631c361e7ae49e205f934393c73a SHA512 5d68b1be731762057435e0a2201aa68ea1050b9260b54d80a0e0e43abc2a3571e8fe39029f018bdec951feabcd96e53cd577628104f6b552d46635dfb5c8cc2b
+AUX flobopuyo-0.20-libs.patch 4687 BLAKE2B fc571a5de46bb52bfa65eacc3078fddbe6b5c5f1e58378b2ff7e1f91b6130a0011705f6f17cf47dbe3c5417fbc7dfa3f708b970548f81f7234d467d11b6cf09e SHA512 fd879dca79a8532909286a50ec9d3d66b2fdf149a64602ee8990aad2a3de8dbed268f6837d39039db77774ab7e29a91b121f06dc172eae59a6c69c0f799a810b
 DIST flobopuyo-0.20.tgz 2949750 BLAKE2B 5e6b451ca05c4e3c497889fe350ceea8dffd9a0bc53b69747449e1ab607c26328ee3d2d1acb9ebf8a7fa634e43e12746f02c50166f16c7e2d3bbfa6531878250 SHA512 8ec7e690e53cfc171959663ef07912f2b23ae1842b72faa0125de8d6d2ad93672b9b4d68593b1f49f97c53a13409aca7bc5a598858fc7cff4698a4064ec95276
 DIST flobopuyo.png 25038 BLAKE2B ab9af4d0785614725c5b03942956c5cabfdfa38b3f5b2870dfbed9428ab51c553dad784b643f3387bfb4d90073befe9ea6d6bac57bbb266154b28092410d5c1d SHA512 6eca6fd1559d8ecb62b19be9fcaef2af1edb727154dd4e10f9f0f9ef9863d99c9445689bd64724cb5da0b251384efc491acfa40bf5105fa9bdcecad3f809ceb6
-EBUILD flobopuyo-0.20-r1.ebuild 1128 BLAKE2B 52541ac21a1273827f29be3fedfc59ea1262c8d2d3e236c2fd6054d1cdc313654dc9ef52516ae9d677792cb7fa4f32ea5e1a19ec59cdb07f2f964999988b4420 SHA512 668e70b009c44aea27dd88575e9e1af2d9bc79ea30b4105e31bf4dec3679037312eb222fe786b07694792939f634e2efc82bc36d853050da664cc0f8adf66a1e
+EBUILD flobopuyo-0.20-r2.ebuild 1109 BLAKE2B 28e3b6500145e50fe01bc40f990b110859de6e3a60d39b818f5f24078e5e8d9697f2ab4a6b880c47f52513dfd429c90e52e2483ad177ea49af8c86a00779c426 SHA512 c47cd9c0d5475b7a8d4065d4d9cc8558612c9dcdbefb9e5405ae8f294da92553273d362e377d62af657bfd5e16e8cd24fba9d46faf7fac8cec557a7f4be26663
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
index 64cd0335ce9c..b9b55a333cb6 100644
--- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
+++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2004-10-08 18:41:12.000000000 -0400
-+++ Makefile	2008-08-06 19:48:47.000000000 -0400
+--- a/Makefile.orig	2004-10-08 18:41:12.000000000 -0400
++++ b/Makefile	2008-08-06 19:48:47.000000000 -0400
 @@ -41,15 +41,13 @@
  ##############
  
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
index 93dbd923bb86..41ee671603ff 100644
--- a/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.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 toolchain-funcs eutils games
+EAPI=6
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Clone of the famous PuyoPuyo game"
 HOMEPAGE="http://www.ios-software.com/?page=projet&quoi=29"
@@ -17,25 +17,28 @@ IUSE="opengl"
 DEPEND="media-libs/libsdl
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer[mod]
-	opengl? ( virtual/opengl )"
+	opengl? ( virtual/opengl )
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-gcc4.patch \
 		"${FILESDIR}"/${P}-gcc41.patch \
 		"${FILESDIR}"/${P}-libs.patch
 
 	find . -type f -name ".*" -exec rm -f \{\} \;
 	sed -i \
-		-e "s:^DATADIR=.*:DATADIR=\"${GAMES_DATADIR}/${PN}\":" \
-		-e "/^INSTALL_BINDIR/s:/\$(PREFIX)/games:${GAMES_BINDIR}:" \
+		-e "s:^DATADIR=.*:DATADIR=\"/usr/share/${PN}\":" \
+		-e "/^INSTALL_BINDIR/s:/\$(PREFIX)/games:/usr/bin:" \
 		Makefile \
 		|| die
 }
 
 src_compile() {
-	emake CXX="$(tc-getCXX)" \
+	emake \
+		CXX="$(tc-getCXX)" \
 		ENABLE_OPENGL="$(use opengl && echo true || echo false)"
 }
 
@@ -44,5 +47,4 @@ src_install() {
 	doman man/flobopuyo.6
 	doicon "${DISTDIR}/${PN}.png"
 	make_desktop_entry flobopuyo FloboPuyo
-	prepgamesdirs
 }
diff --git a/games-puzzle/freesweep/Manifest b/games-puzzle/freesweep/Manifest
index ebb396f24cdd..223568c85522 100644
--- a/games-puzzle/freesweep/Manifest
+++ b/games-puzzle/freesweep/Manifest
@@ -1,3 +1,3 @@
 DIST freesweep-0.92.tar.gz 87353 BLAKE2B 8775a5c135e5a7faba00af2e2fd279c619a8092ad905c8dfa3d3ac7755d0b6337cb39f4b93e0c4bb1e905a87770e946cb728256bc5a2897794802424fa5ebdc2 SHA512 9f7f33ba5fab62d1ea3a6a57b9a60323281c91255218afb51251c4e20500c123769f003ae1a3622205be34fa7cfe11b691e58ad8787782da4d0a7045d4f41122
-EBUILD freesweep-0.92.ebuild 586 BLAKE2B 4344df2f63618e5633b3a683b48e4a9136f598aed0deeefef685b372982ba178f8ee3304654f916bc21f240fd59b5456b060b582ab885f7da61faa431978cc42 SHA512 ff6959030c2a75aea65504b782afb4ee4fbdc5f0ab3769991068f21b2adb597950ec5561d828fbddda428ba639193e8027bc87426196016c2815ac2ee1828407
+EBUILD freesweep-0.92-r1.ebuild 562 BLAKE2B 39f1d588d6245207d91fcb7637cd90f5abf278b3365284d4abbae573a3fa05168386293b45e32a5251a41f29d3cf13c6753067a82b239ae941523def9a2caed4 SHA512 0ac25425de4675260d51871255debb06e54603843afd8559e077c7421fa62a865519b4b64c63c3b91317f9c928cca758d97bbd2fe0dcf0263b04c4af599ff2f2
 MISC metadata.xml 330 BLAKE2B e435f3a2e4a5c8fba959c2e181052f9ae3cfabbd1d6ebb57b6a12704db3d2dd6acfefadb84bf4b27dbd0a68c201384dd2edf9a6373158655598f1a3680d02001 SHA512 4df540d39a83e0bfc22135a1463f8bce474615410c58d5fab2e323c82c5e9b3d732428417da18a76c09bd4ca41e1f04b8d141e29743690eb38b4142ce3920a37
diff --git a/games-puzzle/freesweep/freesweep-0.92.ebuild b/games-puzzle/freesweep/freesweep-0.92-r1.ebuild
index 711e5c61c6fa..fe5d96ca8f6d 100644
--- a/games-puzzle/freesweep/freesweep-0.92.ebuild
+++ b/games-puzzle/freesweep/freesweep-0.92-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 toolchain-funcs games
+EAPI=6
+inherit toolchain-funcs
 
 DESCRIPTION="Console Minesweeper"
 HOMEPAGE="http://freshmeat.net/projects/freesweep"
@@ -12,17 +12,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos"
 
-RDEPEND="sys-libs/ncurses:0"
+RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_compile() {
 	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)"
 }
 
 src_install() {
-	dogamesbin freesweep
-	dodoc README
+	dobin freesweep
+	einstalldocs
 	doman freesweep.6
-	prepgamesdirs
 }
diff --git a/games-puzzle/galaxis/Manifest b/games-puzzle/galaxis/Manifest
index b46fefefcaf2..b73b13ef9377 100644
--- a/games-puzzle/galaxis/Manifest
+++ b/games-puzzle/galaxis/Manifest
@@ -1,4 +1,4 @@
 AUX galaxis-1.8-gentoo.patch 1412 BLAKE2B be1f33db0ddd13a5db8dc4f7c5e7c7bd7e1311d8d9eba60b60a816bd9c7f79b7b123d8898d6ec74f696234744cea14424ed8158da02bb0810833f8450c249ea0 SHA512 110c500bdd46e7ea5fdd90bf93468e7560f9de7735b2f7b89f74ddd273d5d9afc1983891106103632429b73f3af16c667d7133987218ca7c5a7f5cceb1106301
 DIST galaxis-1.8.tar.gz 8962 BLAKE2B 3380d44ca6b168ddc71edf4e7fb61bc9a22c24cf73e1bbd4b60a87517a769f3b3b2475d64281168fe6ade7b88bbc75b3eec923cf1d26532b097d6820b14f9817 SHA512 9d4c7447827fea333ddec8a289d5d6415777379c7aab53fc2088418051f3a38c8abeceff2e8ba0472f792fac457345f2307b3f51c8366aa0b9affa37c3eee05f
-EBUILD galaxis-1.8.ebuild 583 BLAKE2B a50ae04fd6e358af77bcaa6e1406af138f9ae80ec1c7cc735c9df45add298c94c7984a3134883b1cd69f347878a6dfa3518a2d8f89e6a87fc9880732c8fa902a SHA512 d24f71ddb7cf878de764796d90ae8de51526f4a91244fadca13fb55435a71be6746f94fa6575f48c2445b0da840156d3c611f41623bee73a778a3cbbbb2d44a3
+EBUILD galaxis-1.8-r1.ebuild 531 BLAKE2B 6fd0836871c4b21c54392fe80970695beafd8dcaa4f14ba71d382c3c1048cf54b1d28fe3dbf03e038f35730b440c0ca601cc84500c5bfddee675cc740efc356b SHA512 24c6ddf649ace9a4ff56297a6f91c05e1eb03a6ec268aaae3c0c0b1c14887744b3ae60b478517854a2055319b374e5494fc45d6ecc0ea844ce8467e252882537
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/galaxis/galaxis-1.8.ebuild b/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
index 1fee81603db0..73020c4a91e1 100644
--- a/games-puzzle/galaxis/galaxis-1.8.ebuild
+++ b/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
@@ -1,8 +1,7 @@
-# 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
 
 DESCRIPTION="Curses-based clone of the nifty little Macintosh freeware game Galaxis"
 HOMEPAGE="http://www.catb.org/~esr/galaxis/"
@@ -13,16 +12,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
-DEPEND=">=sys-libs/ncurses-5.3:0"
-RDEPEND=${DEPEND}
+DEPEND=">=sys-libs/ncurses-5.3:0="
+RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_install() {
-	dogamesbin galaxis
+	dobin galaxis
 	doman galaxis.6
-	dodoc README
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-puzzle/gemdropx/Manifest b/games-puzzle/gemdropx/Manifest
index 1aa1c92dfe60..33b0de50b644 100644
--- a/games-puzzle/gemdropx/Manifest
+++ b/games-puzzle/gemdropx/Manifest
@@ -1,3 +1,3 @@
 DIST gemdropx-0.9.tar.gz 903036 BLAKE2B 8ac4a7df1e0983cc48e17db07d3c0e66c76c23f34df5c094ddd690a8f18bc50ee0a4c0c378b23da1f266b61d4da634655d051daa71592f35d5a8645f0db29761 SHA512 f99292f44575cb86c50e29f220d5fd358b3e6dd379148dcd764eac5bca5edcc49f88e119f9bebddb14017403985378f1bc07633c987556a9264f36ce20cc6fb2
-EBUILD gemdropx-0.9-r1.ebuild 974 BLAKE2B 1f1c1cedbebfb61fe828802f91dc1589fa5f0dabc2a009954dbb5c1c8e1bac024ed9b0d5ea014894e4e0a0a883b207243ef5217ba86a379115187fa7121a26fa SHA512 6d13589496d95a1b7048dbcae43cf569580ae7233d156568be013cfe1588dae2ba694a00a500f877934d98a047d051e415e83d7c6a7f74fb93cbbd90abc8c81f
+EBUILD gemdropx-0.9-r2.ebuild 1068 BLAKE2B 9f647c38a0730c05d5fb97b6380964dddf8d20f7530f37544f8408a935c32f56b0a39c52d7377ab307c519af104ae46b3d33e1efbfb13068019cfa16e9787f66 SHA512 e1cab173982a30529b7a86bae686988f15ead3e027e8bdefbf2f3cc0103e1142f346d3f09244e75de9d5b5eb985cfac0b266748d6c5242b1bb171aeeae7460a9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild b/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild
index b7e04a7574c1..307663065741 100644
--- a/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild
+++ b/games-puzzle/gemdropx/gemdropx-0.9-r2.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 games
+EAPI=6
+inherit desktop
 
 DESCRIPTION="A puzzle game where it's your job to clear the screen of gems"
 HOMEPAGE="http://www.newbreedsoftware.com/gemdropx/"
@@ -13,11 +13,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.2.3-r1[joystick,video]
-	>=media-libs/sdl-mixer-1.2.1[mod]"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	>=media-libs/libsdl-1.2.3-r1[joystick,video]
+	>=media-libs/sdl-mixer-1.2.1[mod]
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/^CC/d' \
 		-e '/^CXX/d' \
@@ -30,14 +33,15 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		DATA_PREFIX="${GAMES_DATADIR}/${PN}" \
+		DATA_PREFIX="/usr/share/${PN}" \
 		XTRA_FLAGS="${CFLAGS}"
 }
 
 src_install() {
-	dogamesbin gemdropx
-	dodir "${GAMES_DATADIR}/${PN}"
-	cp -r data/* "${D}/${GAMES_DATADIR}/${PN}/" || die
+	dobin gemdropx
+	dodir "/usr/share/${PN}"
+	cp -r data/* "${ED}/usr/share/${PN}/" || die
 	dodoc AUTHORS.txt CHANGES.txt ICON.txt README.txt TODO.txt
-	prepgamesdirs
+	newicon data/images/gemdropx-icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Gem Drop X" /usr/share/pixmaps/${PN}.xpm
 }
diff --git a/games-puzzle/gfifteen/Manifest b/games-puzzle/gfifteen/Manifest
index 60e2cb3ac573..39ef45aa8121 100644
--- a/games-puzzle/gfifteen/Manifest
+++ b/games-puzzle/gfifteen/Manifest
@@ -1,3 +1,3 @@
 DIST gfifteen-1.0.3.tar.gz 525454 BLAKE2B 253f74439d491b8ff30697c755dd8e04203a9282de0640603ae4e90fc37f3965ca7f1a02dc1263a71f5b00a18ccf42e7ac371cd20c5bc518fe9b12361fc80818 SHA512 a3699a2484ec3334ec9489c6ae6d8b332e41a769c72ea2971684197f8eb9e6c30431232f3423aaa85ded0fa57410929d432b2efe4370409bdcc63f2fb0b31ae4
-EBUILD gfifteen-1.0.3.ebuild 920 BLAKE2B 91199326398ab5cf5b4025c0a4a2a1dfb37db1f060b27619c5aa41b3936da0b97668d0e0256872d49d387af16599fb146201c020783be6ba3e491e5645286bbc SHA512 4f5d5c60421ba8db25d7cf977d52cf7f11fc6a754fb27f1ce4cd0a6f0b0b419cdb905885019beee3509c2fa9f72b9a6725f55bc552a437f390bde24427809910
+EBUILD gfifteen-1.0.3-r1.ebuild 866 BLAKE2B 5f7df7a00769db391a9b2f678b0744efcfc79db8e20d55e8f81a9f67ceadd166402c61ce4d9aade6cbc57afe5f1988f8a5b930cb59f061b278f748f98130c9a1 SHA512 65147433ed36d9c67a979270adc0b371898b217681830173956d82de847e103c87f4eaa61d62d07f43be0520b6a6b131fe8c61b26aa79fd5666385a7d813a176
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
index 25f254cd5548..863fc84ff7f1 100644
--- a/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild
+++ b/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
@@ -1,10 +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
-inherit eutils gnome2-utils games
+EAPI=6
+inherit desktop gnome2-utils
 
-DESCRIPTION="graphical implementation of the sliding puzzle game fifteen"
+DESCRIPTION="Graphical implementation of the sliding puzzle game fifteen"
 HOMEPAGE="https://frigidcode.com/code/gfifteen/"
 SRC_URI="https://frigidcode.com/code/gfifteen/${P}.tar.gz"
 
@@ -15,9 +15,11 @@ IUSE=""
 
 RDEPEND="x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
+	default
 	# make it compile against newer gtk+:3 (bug #536994)
 	sed -i \
 		-e 's/-DGTK_DISABLE_DEPRECATED=1 //' \
@@ -25,24 +27,21 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf --disable-assembly
+	econf --disable-assembly
 }
 
 src_install() {
 	default
 	doicon -s scalable ${PN}.svg
 	domenu gfifteen.desktop
-	prepgamesdirs
 }
 
 pkg_preinst() {
 	gnome2_icon_savelist
-	games_pkg_preinst
 }
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	games_pkg_postinst
 }
 
 pkg_postrm() {
diff --git a/games-puzzle/gnudoku/Manifest b/games-puzzle/gnudoku/Manifest
index 2cbd6626f2a4..0f6ccc3a65eb 100644
--- a/games-puzzle/gnudoku/Manifest
+++ b/games-puzzle/gnudoku/Manifest
@@ -1,4 +1,4 @@
-AUX gnudoku-0.93-gcc43.patch 321 BLAKE2B da5375cb8864f066f325767e5fa895544aeab86d5238ea4208448e68ac6b8fd08875e6968b0fa5efc2b0863aa90ed4836d123e2da46de79c8fe7d7423e8224e7 SHA512 2d4286187e8f5314a19263073cc3b9bd1e5eb68b243d4d7695ef37fee7004a95111ec3420c434d4791b8d6d0a8facb36f02c2dd6ea2f6d012ffbb17816572e04
+AUX gnudoku-0.93-gcc43.patch 329 BLAKE2B 7c76007733a0d78c71d0e11416a2ccc415cbe44260cb231d5391c980c018d0d759e07844376fe8ef92b0c6bf40966ddcc3b990534be8532ef5192577cef5fac8 SHA512 b7cbfbaad6a73029ee0b31cab0c630a594e7ac6433c6972255ed7ea475a5729fe004fe5791ec82b97df84f19637cbc40a37df8fa5ff29fde115d343b836bdfe0
 DIST GNUDoku-0.93.tar.gz 26212 BLAKE2B 77d47294dbdfb3b9074e7ffb4a2083d13a33caa7a6268bb70722970beb5b065e54b4cb16733686ab2c8d08d4e88855ed51cacdd639aff5a84f1c62c5ab43aa35 SHA512 124bde796149136320758de5088f7d177ec8a4ffe03190f22bd8b228c00d1adb790450c760110e14d1cc9bf70f7dd54477405582c313c91e8da97d39c8fc55a6
-EBUILD gnudoku-0.93.ebuild 880 BLAKE2B d8b6f7de014e95cfa70d63423804d1a6da8be9db0fdb31f7370317e39480522bf37322fed760b5bb9300bf1b41e3bbc80caa25ffbdb42e0efd83fad32d3f83d2 SHA512 5aea5cb10eb9d6c35b67c5892245e2318016b5c26113ae305539e12b71c9d9bdedded97cb9a99f1dac1bfdfca0b50d952a0fe37e5565b211c4f48e7d50c9a477
+EBUILD gnudoku-0.93-r1.ebuild 867 BLAKE2B db5adacbe1fe2ca0f41a87e85b7b7ac609e73cb57199a5008cd32b1c2b10dc30b7865b3bbd77cb1385807165e030c92788bd025c00d13fe09c033e1f9135d621 SHA512 5e615e8a0b5384084b90fa1ff5582c90e9b9cae2692f4cbe2b00d15466f552832de995867daf3051160603867735b9ffcae9b6df25916bb2a768fb02051a0fb9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch b/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch
index 69dd08c3e8b0..bb92102a37de 100644
--- a/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch
+++ b/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch
@@ -1,5 +1,5 @@
---- GNUDoku.C
-+++ GNUDoku.C
+--- a/GNUDoku.C
++++ b/GNUDoku.C
 @@ -25,6 +25,7 @@
  #include <cstdlib>
  #include <cstdio>
@@ -8,8 +8,8 @@
  
  #include <vector>
  #include <cassert>
---- sudoku.C
-+++ sudoku.C
+--- a/sudoku.C
++++ b/sudoku.C
 @@ -10,6 +10,7 @@
  #include <cstdio>
  #include <cstdlib>
diff --git a/games-puzzle/gnudoku/gnudoku-0.93.ebuild b/games-puzzle/gnudoku/gnudoku-0.93-r1.ebuild
index b4bbd4305682..bfd07d1a9a25 100644
--- a/games-puzzle/gnudoku/gnudoku-0.93.ebuild
+++ b/games-puzzle/gnudoku/gnudoku-0.93-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
 
 MY_PN="GNUDoku"
 MY_P=${MY_PN}-${PV}
@@ -18,12 +18,14 @@ RESTRICT="test"
 
 RDEPEND=">=dev-cpp/gtkmm-2.6:2.4"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
+	default
+	eapply "${FILESDIR}"/${P}-gcc43.patch
 	append-cxxflags -std=c++11
 	sed -i \
 		-e "s:\$(CXX):\$(CXX) ${CXXFLAGS} ${LDFLAGS}:" \
@@ -32,9 +34,8 @@ src_prepare() {
 }
 
 src_install() {
-	dogamesbin GNUDoku
+	dobin GNUDoku
 	newicon GNUDoku.png ${PN}.png
 	make_desktop_entry ${MY_PN} ${MY_PN}
 	dodoc ALGORITHM Changelog README TODO
-	prepgamesdirs
 }
diff --git a/games-puzzle/gnurobbo/Manifest b/games-puzzle/gnurobbo/Manifest
index 4713a979e1fe..8e94145345ed 100644
--- a/games-puzzle/gnurobbo/Manifest
+++ b/games-puzzle/gnurobbo/Manifest
@@ -1,4 +1,5 @@
-AUX gnurobbo-0.66-underlink.patch 854 BLAKE2B 97a2dfb7c331623650524c0148e836dd414a9cf5e5997e2f6bfbcb6ed9af661b8e498c840c4b3764aa2961b7017876dfb124567759333c242c455cb2a2f74241 SHA512 ceb1b173aec2302de8639cd150cae038e14454bf82cdd2389c2c6a183c17e74090c1e1af9023a54d8d53e233ddb996b1ecb73403caba2962508e2f791012b355
+AUX gnurobbo-0.66-hardening.patch 6763 BLAKE2B ffaf88e59d8843da40e9b5d5860483e9670f47a77c709df1fd9274e2f0693dca30a2e0aaf0440c9f867189761b99e4f9071286be66724362def98404cb438c80 SHA512 8a755d2b0815736c9a872d716af619fd899c426a2da0d7f77f5a7954ef866ed568bfc4324620cb9ca3bede1a36b28bada24ac780e8377c3010914f60ae41b737
+AUX gnurobbo-0.66-underlink.patch 858 BLAKE2B b3ddef3a919afd45c5d949d5f48cecaaea1c013e1924fffd8ce17e32c407562c9054059696db92750322d9378b900ce8432cc30741d0c43b86b5c6b8dd407e4c SHA512 b2053326e1e06cc780647f0c40452729430dd7d0c641406719ce48ba5159e7dd160efc9c892de9424f50ac43386cd6f2a598558e604c34be41a3ccf15d937375
 DIST gnurobbo-0.66-source.tar.gz 1765034 BLAKE2B 4a88d1281fdea44516c86e704a828e1d3ef2116cc7d6401960524ea53435828bb09f73adf57016bf3b7a0fa107ee411c575ca2f288375148658bf1bdf0b16aa2 SHA512 5f217ba87e8d1c56d9630cca44bde8d405c93929ebb1722c80955fceedec93a5e02ab3dbafd557c3cbedd63a97a73abe6e8aeff115931844a11f6cc1dd00533c
-EBUILD gnurobbo-0.66.ebuild 962 BLAKE2B cf05fdfe5771a6a295988c25e11856c087e2cbff913ec87d7dbeda7829fba7493f67abeeeec9f2faed443016679a133e79d8a14c463efc0cd27d1ee83a524797 SHA512 64cf6fb4fab1e171dbb9024148df1eb2ea64eb3634482e6c11a07a7093ec4c92457f201d9baf47296da1c7c6c7d75cc590d7d5bb95c5b12b6a6e3d409071e3d6
+EBUILD gnurobbo-0.66-r1.ebuild 910 BLAKE2B 8b6e1f9b6d9a76d23a64a3a60231fb28763b6669a9d4ef861fdd8e31d85fead9f77650c263c82682a9cfef2e7bdb392f8ee16858a5335358b9a95133ef7cc78d SHA512 c59070e20efad3ccf4716bfc66408c059a25215517605b6d3b4defd4bbd221b025b772b40cb34b3e01a267117e3c5d10402df74285ac4bf94834ba77e54d054e
 MISC metadata.xml 331 BLAKE2B 9e3cb9283f67936d5be789e0c65509547ddbfee86c3695ded8ff72310458e7937710915e82b2f9c9f50102b0a78ab08d3d78e5da7e05923bc53bdb69bf8b75e1 SHA512 56663c15b5d9135317f5cfdef851959613abd44ced462fc3429540a76be55970f831bfc284d2fe06ace79ea98586109bc64489ba9d12fab9a0909186f40365da
diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.66-hardening.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.66-hardening.patch
new file mode 100644
index 000000000000..c1502aca4290
--- /dev/null
+++ b/games-puzzle/gnurobbo/files/gnurobbo-0.66-hardening.patch
@@ -0,0 +1,220 @@
+Index: konstruktor.c
+===================================================================
+--- a/konstruktor.c	(Revision 412)
++++ b/konstruktor.c	(Arbeitskopie)
+@@ -247,7 +247,7 @@
+     else if (level.w == 32 && level.h == 31)
+ 	gsize = 1;
+     inforedraw = 1;
+-    sprintf(infostring, txt_konstruktor_Welcome_to_GNU_Robbo_Designer);
++    strcpy(infostring, txt_konstruktor_Welcome_to_GNU_Robbo_Designer);
+     robbo.keys = k_count_obj(KEY);	/* count keys on a map */
+     robbo.bullets = k_count_obj(BULLET) * 9;	/* count bullets */
+     game_area.redraw = REDRAW_EVERYTHING;
+@@ -688,7 +688,7 @@
+ 		create_object(nx, ny, BOMB2);
+ 	    switch (K_icons[selected].game_obj) {
+ 	    case GROUND:
+-		sprintf(infostring, txt_konstruktor_Ground);
++		strcpy(infostring, txt_konstruktor_Ground);
+ 		break;
+ 	    case STOP:
+ 		sprintf(infostring, "%s (%d %s)",
+@@ -745,7 +745,7 @@
+ 			txt_konstruktor_on_map);
+ 		break;
+ 	    case EMPTY_FIELD:
+-		sprintf(infostring, txt_konstruktor_Empty_Field);
++		strcpy(infostring, txt_konstruktor_Empty_Field);
+ 		break;
+ 	    case BUTTERFLY:
+ 		sprintf(infostring, "%s (%d %s)",
+@@ -783,9 +783,9 @@
+ 	    case WALL:
+ 		board[nx][ny].state = wallnumber;
+ 		if (wallnumber != 3)
+-		    sprintf(infostring, txt_konstruktor_Wall);
++		    strcpy(infostring, txt_konstruktor_Wall);
+ 		else
+-		    sprintf(infostring, txt_konstruktor_Black_Wall);
++		    strcpy(infostring, txt_konstruktor_Black_Wall);
+ //		    game_area.redraw=REDRAW_EVERYTHING;
+ 		break;
+ 	    case TELEPORT:
+@@ -905,7 +905,7 @@
+ 		break;
+ 	    case K_RELOAD:
+ 		if (cnt == lastselected) {
+-		    sprintf(infostring, txt_konstruktor_Level_reloaded);
++		    strcpy(infostring, txt_konstruktor_Level_reloaded);
+ 		    clear_screen();
+ 		    level_init();
+ 		    konstruktor_viewport_init();
+@@ -923,7 +923,7 @@
+ 		    k_redraw_all();
+ 		    cnt = -1;
+ 		} else {
+-		    sprintf(infostring,
++		    strcpy(infostring,
+ 		    	txt_konstruktor_Reload_level_select_again_to_reload);
+ 		    lastclick = 50;
+ 		};
+@@ -1048,7 +1048,7 @@
+ 		inforedraw = 1;
+ 		break;
+ 	    case EMPTY_FIELD:
+-		sprintf(infostring, txt_konstruktor_Empty_Field);
++		strcpy(infostring, txt_konstruktor_Empty_Field);
+ 		inforedraw = 1;
+ 		break;
+ 	    case WALL:
+@@ -1055,9 +1055,9 @@
+ 		if (cnt == selected)
+ 		    wallnumber = (wallnumber + 1) % 10;
+ 		if (wallnumber != 3)
+-		    sprintf(infostring, txt_konstruktor_Wall);
++		    strcpy(infostring, txt_konstruktor_Wall);
+ 		else
+-		    sprintf(infostring, txt_konstruktor_Black_Wall);
++		    strcpy(infostring, txt_konstruktor_Black_Wall);
+ 		inforedraw = 1;
+ 		break;
+ 	    case K_LASER:
+@@ -1078,7 +1078,7 @@
+ 		    teleportnr = (teleportnr % 11) + 1;
+ 		break;
+ 	    case GROUND:
+-		sprintf(infostring, txt_konstruktor_Ground);
++		strcpy(infostring, txt_konstruktor_Ground);
+ 		inforedraw = 1;
+ 		break;
+ 	    case BIRD:
+@@ -1101,16 +1101,16 @@
+ 	    direction = (direction + 1) % 4;
+ 	    switch (direction) {
+ 	        case 0:
+-	        sprintf(infostring, txt_konstruktor_Direction_right);
++	        strcpy(infostring, txt_konstruktor_Direction_right);
+ 	        break;
+ 	        case 1:
+-	        sprintf(infostring, txt_konstruktor_Direction_down);
++	        strcpy(infostring, txt_konstruktor_Direction_down);
+ 	        break;
+ 	        case 2:
+-	        sprintf(infostring, txt_konstruktor_Direction_left);
++	        strcpy(infostring, txt_konstruktor_Direction_left);
+ 	        break;
+ 	        case 3:
+-	        sprintf(infostring, txt_konstruktor_Direction_up);
++	        strcpy(infostring, txt_konstruktor_Direction_up);
+ 	        break;
+ 		}
+ 		inforedraw = 1;
+@@ -1119,13 +1119,13 @@
+ 		ltype = (ltype + 1) % 3;
+ 		switch (ltype) {
+ 		case 0:
+-		    sprintf(infostring, txt_konstruktor_Laser_Gun);
++		    strcpy(infostring, txt_konstruktor_Laser_Gun);
+ 		    break;
+ 		case 1:
+-		    sprintf(infostring, txt_konstruktor_Blaster_Gun);
++		    strcpy(infostring, txt_konstruktor_Blaster_Gun);
+ 		    break;
+ 		case 2:
+-		    sprintf(infostring, txt_konstruktor_Regular_Gun);
++		    strcpy(infostring, txt_konstruktor_Regular_Gun);
+ 		    break;
+ 		}
+ 		inforedraw = 1;
+@@ -1136,16 +1136,16 @@
+ 		movable = (rmstate & 1);
+ 	    switch (rmstate) {
+ 	        case 0:
+-	        sprintf(infostring, txt_konstruktor_Fixed);
++	        strcpy(infostring, txt_konstruktor_Fixed);
+ 	        break;
+ 	        case 1:
+-	        sprintf(infostring, txt_konstruktor_Moveable);
++	        strcpy(infostring, txt_konstruktor_Moveable);
+ 	        break;
+ 	        case 2:
+-	        sprintf(infostring, txt_konstruktor_Rotating);
++	        strcpy(infostring, txt_konstruktor_Rotating);
+ 	        break;
+ 	        case 3:
+-	        sprintf(infostring, txt_konstruktor_Moveable_Rotating);
++	        strcpy(infostring, txt_konstruktor_Moveable_Rotating);
+ 	        break;
+ 		}
+ 		inforedraw = 1;
+@@ -1152,7 +1152,7 @@
+ 		break;
+ 	    case K_INSERT:
+ 		if (lastselected == cnt) {
+-		    sprintf(infostring, txt_konstruktor_Level_created);
++		    strcpy(infostring, txt_konstruktor_Level_created);
+ 		    insert = 1;
+ 		    /*
+ 		     * Clear board 
+@@ -1176,7 +1176,7 @@
+ 		    cnt = -1;
+ 
+ 		} else {
+-		    sprintf(infostring,
++		    strcpy(infostring,
+ 		    	txt_konstruktor_New_level_select_again_to_create);
+ 		    lastclick = 50;
+ 		}
+@@ -1187,7 +1187,7 @@
+ 		 * Clear board 
+ 		 */
+ 		if (lastselected == cnt) {
+-		    sprintf(infostring, txt_konstruktor_Level_cleared);
++		    strcpy(infostring, txt_konstruktor_Level_cleared);
+ 		    robbo.screws = 0;
+ 		    robbo.keys = 0;
+ 		    robbo.bullets = 0;	/* Thunor: I added this as it was missing */
+@@ -1206,7 +1206,7 @@
+ 		    clear_entire_board();
+ 		    cnt = -1;
+ 		} else {
+-		    sprintf(infostring,
++		    strcpy(infostring,
+ 		    	txt_konstruktor_Clear_level_select_again_to_clear);
+ 		    lastclick = 50;
+ 		}
+@@ -1215,9 +1215,9 @@
+ 	    case K_SAVE:
+ 		if (lastselected == cnt) {
+ 		    if (insert == 1)
+-			sprintf(infostring, txt_konstruktor_New_level_appended_to_pack);
++			strcpy(infostring, txt_konstruktor_New_level_appended_to_pack);
+ 		    else
+-			sprintf(infostring, txt_konstruktor_Changes_saved);
++			strcpy(infostring, txt_konstruktor_Changes_saved);
+ 		    cnt = -1;
+ 
+ 		    k_save_map();
+@@ -1228,10 +1228,10 @@
+ 		    lastclick = 50;
+ 
+ 		    if (insert == 1)
+-			sprintf(infostring,
++			strcpy(infostring,
+ 				txt_konstruktor_Save_select_again_to_save_new_level);
+ 		    else
+-			sprintf(infostring,
++			strcpy(infostring,
+ 				txt_konstruktor_Save_select_again_to_save_changes);
+ 		}
+ 		inforedraw = 1;
+@@ -1297,7 +1297,7 @@
+ 		    konstruktor_end();
+ 		    cnt = -1;
+ 		} else {
+-		    sprintf(infostring,
++		    strcpy(infostring,
+ 		    	txt_konstruktor_Exit_designer_select_again_to_exit);
+ 		    lastclick = 50;	/* very long click is used as
+ 					 * another click */
diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
index 9034a6fac0e2..af69bd9e1c9d 100644
--- a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
+++ b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2011-06-20 21:19:49.578922392 +0200
-+++ Makefile	2011-06-20 21:20:28.535421648 +0200
+--- a/Makefile.old	2011-06-20 21:19:49.578922392 +0200
++++ b/Makefile	2011-06-20 21:20:28.535421648 +0200
 @@ -39,14 +39,13 @@
  CFLAGS?=-O3 -pipe
  CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild
index b3b59d5f3fc6..39a81fdcd790 100644
--- a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild
+++ b/games-puzzle/gnurobbo/gnurobbo-0.66-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="Robbo, a popular Atari XE/XL game ported to Linux"
 HOMEPAGE="http://gnurobbo.sourceforge.net/"
@@ -13,29 +13,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl[sound,video,joystick]
+RDEPEND="
+	media-libs/libsdl[sound,video,joystick]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf"
-RDEPEND=${DEPEND}
+	media-libs/sdl-ttf
+"
+DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlink.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
 
 src_compile() {
 	emake \
-		PACKAGE_DATA_DIR="${GAMES_DATADIR}/${PN}" \
-		BINDIR="${GAMES_BINDIR}" \
+		PACKAGE_DATA_DIR="/usr/share/${PN}" \
+		BINDIR="/usr/bin" \
 		DOCDIR="/usr/share/doc/${PF}"
 }
 
 src_install() {
-	dogamesbin gnurobbo
-	insinto "${GAMES_DATADIR}/${PN}"
+	dobin gnurobbo
+	insinto "/usr/share/${PN}"
 	doins -r data/{levels,skins,locales,rob,sounds}
 	dodoc AUTHORS Bugs ChangeLog README TODO
 	newicon icon32.png ${PN}.png
 	make_desktop_entry ${PN} Gnurobbo
-	prepgamesdirs
 }
diff --git a/games-puzzle/groundhog/Manifest b/games-puzzle/groundhog/Manifest
index d3bad3e5a28d..b0bc9139eefb 100644
--- a/games-puzzle/groundhog/Manifest
+++ b/games-puzzle/groundhog/Manifest
@@ -1,5 +1,5 @@
-AUX groundhog-1.4-flags.patch 604 BLAKE2B 6e553ae4af73ecfd852eb10b81d83a020017e4588341bb590ee229380b107ac4e96aa068fdf90a2e1781d0038b01b84661c00b3d928cf17beb6c7265ea4a98e4 SHA512 d81fbb87f1732673e0c2b3053c6a8d6f47c27a12a0f0b8349da20d43cf78ceeed2f4aa1a87803216dfcd0c71f77f615c3f9bba7516a69a43f3ec6f11be53c071
+AUX groundhog-1.4-flags.patch 608 BLAKE2B aec098b6453a3541a087d382f93e4aa1c9ba9deb6435118836cef9825c617e417981a25040ca2b36268de6c688a29d71f62c8e1bab197e824aee9bec81da0d1d SHA512 ee6e08ead434e9285ee6d2b8580effd33528a8c4c13635e9ecf1973ca25a7869a98ed6231f95e4e789867bfa56e8b57e2a939ebf35107f15959eb643df880862
 DIST groundhog-1.4.tar.gz 221871 BLAKE2B e9b7dd2c7498b6320ee4fe396679ba76831c13357b1e7fc9cd14578f387de6d1ca38fa0f5aa4fb3461afb3c27080751de45e3b26ded281dcb59475d85eccbe35 SHA512 9d1cf9073658cd325c4dceb6009825f50d8d4c55d0cca1b762cfdd066663257958d92e0e67ad49593add5821ce202e19c1106793ae8c77e4776c3b2e1fdc093c
 DIST groundhog_1.4-9.diff.gz 8613 BLAKE2B 5bbfd5deaa0f7579369baea93be40e5b2ced14d9356417b0aaef595df830bb29abb4b3676878f49005e68ec81c5ec762ab418fce55c26fbbd2af062263757335 SHA512 ddbb7c8b51fe63a1d318e080133737a851276ab55324875e5d68650d2399ac141667c62ab79ee41ababd2b5426e7bee5f158e7aa4edfe8ee82c6c3b6fb8179b8
-EBUILD groundhog-1.4.ebuild 1129 BLAKE2B 0c732dbd926f0d07229d3f4a91acd8eaaee242edcd4c8b7972a70d662c6c42c7c0796604bddc6e6a9857dbbed3029c034ba03c04bf829f0a0b9b6e41aac5cefa SHA512 a07900afb4988863719ba5c568991b40b6efc78a029175f25a9b320c1cfcdd3326bc3511b978194802bc171708d46fab31209817b5a4ad49c15ee2caae6fd8bd
+EBUILD groundhog-1.4-r1.ebuild 1221 BLAKE2B c282f82e888dadf7330bce1e4b99018e17fcb3713894ff27591320de9a167b86bebdb93a7ddd9b29545eb205946f61c38b64f5614b958ea554299e9a3b9a6410 SHA512 982cefcc7b8b5df623a5d7e49531334c7453072569efdb9304b7a8445109c0051733c92f88a15c0f6a2b2cce9c00a6c8a4d71828336868776ecfd661f61cf72f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/groundhog/files/groundhog-1.4-flags.patch b/games-puzzle/groundhog/files/groundhog-1.4-flags.patch
index 48275a8c39b1..9726f249820b 100644
--- a/games-puzzle/groundhog/files/groundhog-1.4-flags.patch
+++ b/games-puzzle/groundhog/files/groundhog-1.4-flags.patch
@@ -2,8 +2,8 @@ respect flags
 
 applied on top of debian patches
 
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -46,8 +46,6 @@
  dnl Checks for libraries.
  dnl AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR(Groundhog needs GTK 2.0))
diff --git a/games-puzzle/groundhog/groundhog-1.4.ebuild b/games-puzzle/groundhog/groundhog-1.4-r1.ebuild
index 0682e563376e..ba93616b6702 100644
--- a/games-puzzle/groundhog/groundhog-1.4.ebuild
+++ b/games-puzzle/groundhog/groundhog-1.4-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 autotools games
+EAPI=6
+inherit desktop epatch autotools
 
 DEB_VER="9"
 DESCRIPTION="Put the balls in the pockets of the same color by manipulating a maze of tubes"
@@ -15,19 +15,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND="x11-libs/gtk+:2
-	nls? ( virtual/libintl )"
+RDEPEND="
+	x11-libs/gtk+:2
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 src_prepare() {
+	default
 	cd "${WORKDIR}"
 	epatch groundhog_${PV}-${DEB_VER}.diff
 	cd "${S}"
 	sed -e "s:groundhog-1.4/::" -i \
 		debian/patches/sv.po.patch || die
-	epatch \
+	eapply \
 		$(sed -e 's:^:debian/patches/:' debian/patches/series) \
 		"${FILESDIR}"/${P}-flags.patch
 	mv configure.in configure.ac || die
@@ -37,10 +41,11 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf $(use_enable nls)
+	econf $(use_enable nls)
 }
 
 src_install() {
 	default
-	prepgamesdirs
+	doicon src/pixmaps/${PN}.xpm
+	make_desktop_entry ${PN} "Groundhog" /usr/share/pixmaps/${PN}.xpm
 }
diff --git a/games-puzzle/gtkballs/Manifest b/games-puzzle/gtkballs/Manifest
index 58235e0ae814..7c768bd25574 100644
--- a/games-puzzle/gtkballs/Manifest
+++ b/games-puzzle/gtkballs/Manifest
@@ -1,3 +1,3 @@
 DIST gtkballs-3.1.5.tar.gz 1176977 BLAKE2B b1da2eee3876df889cec576ce526d1f475b45b10aad40549bc36d710beb7e27b963719509818959bac884add72f0e91ae48e76745ab76c3d1e6063c780591067 SHA512 a22352a19368c3b957e6fbd21aea0b4636efd3042f4e6b1c44a40f946643eb89873b182fe35a8888111ca42277e69fccfe2e2b683e804358ad36f4feca235e8a
-EBUILD gtkballs-3.1.5-r1.ebuild 834 BLAKE2B 6ad71e814922fbe5394aa91f7a6f76f700ba4f4f3cec8008fa808ea27c3da7a533243af8b9e1e5832ddff54e38abb9e06da8847f446e236bbbb37ecf86a1b834 SHA512 8cf3d902a6661a01728e9601943df2de21f29d98e365124926f143f43aff44f43fee54c9affbafa78d881eb0877806be20c8a6ee9831add0f1d40419b53223a0
+EBUILD gtkballs-3.1.5-r2.ebuild 822 BLAKE2B c7ff0c7a44a6988346cf28ff6c1f5d70a194321aa9221407e232bd3266a62f8a89b02f78f646cc7a1e5ebdd5f00300558e5d587cfc9f876bf61edf7e54c61ea7 SHA512 cd1748adadf92e287a4da3cfe8ca87184d52b341d35604f0d72f75373dbbeccf8ebbcaee8c489ba39be71be4405b22412722a44664578d77953c9c15cc8b42c7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild b/games-puzzle/gtkballs/gtkballs-3.1.5-r2.ebuild
index 8e7c4cdd73d8..eece76f8cc06 100644
--- a/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild
+++ b/games-puzzle/gtkballs/gtkballs-3.1.5-r2.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="An entertaining game based on the old DOS game lines"
 HOMEPAGE="http://gtkballs.antex.ru/"
@@ -13,13 +13,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND="x11-libs/gtk+:2
-	nls? ( virtual/libintl )"
+RDEPEND="
+	x11-libs/gtk+:2
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.10.38 )"
+	nls? ( >=sys-devel/gettext-0.10.38 )
+"
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/^nlsdir=/s:=.*:=/usr/share/locale:' \
 		-e '/^localedir/s:=.*:=/usr/share/locale:' \
@@ -27,12 +31,11 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf $(use_enable nls)
+	econf $(use_enable nls)
 }
 
 src_install() {
 	default
 	newicon gnome-gtkballs.png ${PN}.png
 	make_desktop_entry gtkballs "GTK Balls"
-	prepgamesdirs
 }
diff --git a/games-puzzle/gweled/Manifest b/games-puzzle/gweled/Manifest
index 421049953d74..5c80c135821e 100644
--- a/games-puzzle/gweled/Manifest
+++ b/games-puzzle/gweled/Manifest
@@ -1,4 +1,4 @@
-AUX gweled-0.9.1-gentoo.patch 356 BLAKE2B 3a6104e86e35699effcf24a7cc3aed23f81465e69d245d96432c134a9b3eea8e6f873c0172527c3419277bd6197c7c5c3bddbb54c68f8ecd9fa255b9df07d922 SHA512 9191f8f520afd9126c42f86472b868536c0bcad0f227e161e38a76a511dc0f59e60b81a54f7462d2bafbe174007f27aaba60b4f9559bdf82f4f638130c222d07
+AUX gweled-0.9.1-gentoo.patch 360 BLAKE2B a1e618e443d08693fe9cce4d263f1ba7095606f0af5a8504fef8eccbb5d46d3fc42792468263c36e26b448cafc487b92258422c2eb3d46c5ac3c83e7bd9b3a15 SHA512 38efa262f9144d64363d0724291d786545875c0e81fe2e537be456b9fbade2d3a29210e70c4680f28009f317dce9c907745259bc4bc6ded22b0acffb19cb4db4
 DIST gweled-0.9.1.tar.gz 403252 BLAKE2B 6a80e10fecc858a94d79deb7ad1a9dce0f5af36649bcb61c819816218fbcd72e70cdbfaa8915db13082a6274b75bd4c585c5f583f9f290bb95c2cb4468c4d2dd SHA512 12ac6f0033e9af037febca3ecc86f7531491498a38cdc36d7baf113fecece75da4a5b83f6c6e8f4fc6beebb24d479eac10087baa9effec4966cfcfb6c42df75a
-EBUILD gweled-0.9.1-r1.ebuild 743 BLAKE2B b54531686fa3b509bfa109f771f5834744bc0c86466f0ed64e340e9bd15b28b3d1b5ed95e83fe77783feb7c71ef3ea8e8b022682d9e564d4aee32e9dca85688e SHA512 a161550c8a6c5a5e39b34ce1c5ebb19e20d201152fa2cf9187b987020a53f311f9792eaaec2ff108a0857558e316b4f90cfd3c4600808e2aad7f2da3c4e077d0
+EBUILD gweled-0.9.1-r2.ebuild 696 BLAKE2B ce6a0c0215106eba80d0188bfc4e419cd0358f4ef44aef4bae606ea42e518d70690ff162d04523955f16458850eeae574c4625ce5934d1e28eeb832418052781 SHA512 538a19c85daf8808cee07785c427c272ed334ec85df64f63d023f2b13e4a79e3df8a7d61e42a37851bbcfbdf081519b17f8713b5c294f5952c6360ed7017c804
 MISC metadata.xml 327 BLAKE2B 7ffb95636156cb62206ed6ec1de127958d12d19ec71835683022f87da8943b715762871e930a678dd51bd3533fbf0ffacf4f9302c657d8a17ae4ddf59841d019 SHA512 cc3134245580e54c44dffa610e7910e4081dd175125bd4fad074eeeb119715f24698417dcc0683ae32e943d28cb79c5b82239648d1f70a00857fdba04b6804c4
diff --git a/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch b/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
index 81a8cece8870..fa5857492da3 100644
--- a/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
+++ b/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
@@ -1,5 +1,5 @@
---- configure.in.old	2014-06-03 09:21:52.868225743 +0200
-+++ configure.in	2014-06-03 09:22:06.604614448 +0200
+--- a/configure.in.old	2014-06-03 09:21:52.868225743 +0200
++++ b/configure.in	2014-06-03 09:22:06.604614448 +0200
 @@ -66,7 +66,7 @@
      *) AC_MSG_ERROR([bad value ${enableval} for --disable-setgid]) ;;
     esac],[setgid=true;enable_setgid=yes])
diff --git a/games-puzzle/gweled/gweled-0.9.1-r1.ebuild b/games-puzzle/gweled/gweled-0.9.1-r2.ebuild
index 514d95cea835..0f88623656e1 100644
--- a/games-puzzle/gweled/gweled-0.9.1-r1.ebuild
+++ b/games-puzzle/gweled/gweled-0.9.1-r2.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 flag-o-matic autotools games
+EAPI=6
+inherit autotools flag-o-matic
 
 DESCRIPTION="Bejeweled clone game"
 HOMEPAGE="http://www.gweled.org/"
@@ -13,26 +13,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	media-libs/libmikmod
-	gnome-base/librsvg:2"
+	gnome-base/librsvg:2
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	default
+	eapply "${FILESDIR}"/${P}-gentoo.patch
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
 	filter-flags -fomit-frame-pointer
 	append-ldflags -Wl,--export-dynamic
-	egamesconf \
-		--disable-setgid
-}
 
-src_install() {
-	default
-	gamesowners -R "${D}/var/games/gweled"
-	prepgamesdirs
+	econf --disable-setgid
 }
diff --git a/games-puzzle/hangman/Manifest b/games-puzzle/hangman/Manifest
index 6c010f5ae55d..aa3651698e14 100644
--- a/games-puzzle/hangman/Manifest
+++ b/games-puzzle/hangman/Manifest
@@ -1,3 +1,3 @@
 DIST hangman-0.9.2.tar.gz 1023712 BLAKE2B d9d12e02cb48fb80e0cf9c5f9dcb52f57e6305342b41443a791252701758c302bdbfb15dfefcfbbc7c4fc39fe1bfaccd961d1eb3d9a351f937c219ce98c26a26 SHA512 cbf940310b4821cf4de27a99a5228bccf42093a65ca83b0a2582556865ee5cea5a4ee2ebe08d2e02ac93f0cfc8d190b1f5427adbd74e7ddb57b90cee84f85d65
-EBUILD hangman-0.9.2.ebuild 747 BLAKE2B f9b03daa1c8541d8547162289e1c72076ffda98dc391f6b974b512615f90de67280b835b203546c4e423b4995caa9fd9b2fc4133d5fa1462b66bebb0234f6981 SHA512 01537c2a67b744caade5b893b553507b083f81cf6bc9b8c398a3bc5d49c022e529ffb8ae3108379f0ed10fb5dd03775a6c2e33e04ba297d5fbe2d5bc54004bab
+EBUILD hangman-0.9.2-r1.ebuild 736 BLAKE2B df7383c6bc804a56b9af4df28c2c63bef82acded3ae43acf4f3362bea4ad413b918525987edd6dd16e667db4ddc80aa69291faf5b72d3e15a0b92ae7e35bff6e SHA512 8ed9ba6285e05d5b87a8b3f8613618630c65fcf832f6ce52962cce900d25135d314c4d89d5d53654ff9529c357bb68708a80cdb9be29ac0a50fd18236d378451
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/hangman/hangman-0.9.2.ebuild b/games-puzzle/hangman/hangman-0.9.2-r1.ebuild
index 468a996b6fa2..abfc77ca017b 100644
--- a/games-puzzle/hangman/hangman-0.9.2.ebuild
+++ b/games-puzzle/hangman/hangman-0.9.2-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="The classic word guessing game"
 HOMEPAGE="http://www.shiftygames.com/hangman/hangman.html"
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}
 	sys-apps/miscfiles"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's/inline void SE_CheckEvents/void SE_CheckEvents/' \
 		src/hangman.c \
@@ -32,5 +33,4 @@ src_install() {
 	default
 	newicon pics/noose.png ${PN}.png
 	make_desktop_entry ${PN} Hangman
-	prepgamesdirs
 }
diff --git a/games-puzzle/hexamine/Manifest b/games-puzzle/hexamine/Manifest
index a9ec7a00ccf8..ac8b8fd309e6 100644
--- a/games-puzzle/hexamine/Manifest
+++ b/games-puzzle/hexamine/Manifest
@@ -1,3 +1,3 @@
 DIST hexamine-0.2.1.tar.gz 130603 BLAKE2B e49b60e78346d59f5d0bf60f8aaa3f1230e87e6e76052c49197984df695cb4aacf947a2b5855f0388ed62f59fa04e47853f2c36583c38c9249100910eb5b5ff7 SHA512 eaf7c110f1c2434c2ea7bc01cc13266ed8e91cbbf0fff4ee8d8a78c549f9fd3f8d877210f574ba1cefad5a6ea230f376aab7d9ced6a4e2f477b6be776332a640
-EBUILD hexamine-0.2.1.ebuild 868 BLAKE2B 4e8a3f8676af16f19da1007df9a09b2f59a1ab1ead150354d41883e1b4d1ee3f6c4dcccb4c805cbd15a404a0a053bfb508ee3a59b7ceb6b4cd62ba9008759bc4 SHA512 a9cf88b36adcc4c56986e48b0a999147ce34c8ed8bf31ee1f5bc3ccf8963e509f55b5e5284111789503870db56a7866fe49198addc0104a222e9c6935258a425
+EBUILD hexamine-0.2.1-r1.ebuild 807 BLAKE2B 43c3d0be8faf714bd021d6505b020eb75d337753005c78865f381716795fbdaac28e73436834cab63a1981bb2311028cb0b3b4e28b83188fff84d2ea8790a57f SHA512 cdcc4a822d89da500a130542bb2582db91d15159a457bc55e158ec326e27367aa0f2eb6ce1762b2047e4587b7157660b43bae6175c2fcd1fad40361d70550c06
 MISC metadata.xml 331 BLAKE2B f3ccbece9bcd1b9fe00383805f636401bb5b3bd10d2e1a2d5564182aebfe2a7e6614e3366ddf28e90ba5a62725d78dc08d1072c65c07ec3bc4ab5761bd2d2f39 SHA512 452f03abf92762a26c6492a3823b4fb3957abd627ec039daa73bb90c14079b71f0b79ce5af0548e3290c74275f5bf02ff264655cff6bb72a607e258a32e36bde
diff --git a/games-puzzle/hexamine/hexamine-0.2.1.ebuild b/games-puzzle/hexamine/hexamine-0.2.1-r1.ebuild
index 0551f1e713ad..67529d0521a4 100644
--- a/games-puzzle/hexamine/hexamine-0.2.1.ebuild
+++ b/games-puzzle/hexamine/hexamine-0.2.1-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
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 games
+
+inherit desktop python-single-r1
 
 DESCRIPTION="Hexagonal Minesweeper"
 HOMEPAGE="https://sourceforge.net/projects/hexamine"
@@ -12,32 +13,30 @@ SRC_URI="mirror://sourceforge/hexamine/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-python/pygame
-	${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
+IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-S=${WORKDIR}/${PN}
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygame
+"
+DEPEND=""
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
+	default
 	# Modify game data directory
 	sed -i \
-		-e "s:\`dirname \$0\`:${GAMES_DATADIR}/${PN}:" \
+		-e "s:\`dirname \$0\`:/usr/share/${PN}:" \
 		-e "s:\./hexamine:exec ${EPYTHON} &:" \
 		hexamine || die
 }
 
 src_install() {
-	dogamesbin hexamine
-	insinto "${GAMES_DATADIR}/${PN}"
+	dobin hexamine
+	insinto "/usr/share/${PN}"
 	doins -r hexamine.* skins
-	dodoc ABOUT README
-	prepgamesdirs
+	einstalldocs
+	make_desktop_entry ${PN} "Hexamine"
 }
diff --git a/games-puzzle/icebreaker/Manifest b/games-puzzle/icebreaker/Manifest
index 1502c209c0cb..886ec33ffad3 100644
--- a/games-puzzle/icebreaker/Manifest
+++ b/games-puzzle/icebreaker/Manifest
@@ -1,7 +1,7 @@
-AUX icebreaker-1.9.6-gentoo.patch 8571 BLAKE2B 0b2fe5a4c370a994646a4b6951cdc2f6e2216746550eaf094971429f3a5d8ebbd4520e3d961ce72c5cdd041c97de3c14fdac73e2d887dc2cf73bdcac78335cde SHA512 11eead6a2c01b45b9ee18d761ca6ddd3fc565f046e03ac32a270232e90251470abf9b02cb179fabd734432ae0d5330f524cc6ce07ff975b9f330f6c6f0d0e0ca
-AUX icebreaker-1.9.6-ldflags.patch 870 BLAKE2B e76dfab6a28b607fe0e9c2953735c38364bfd935e3a6737639ce79064899b3d61e46b46d56233f60fcc45481fcbeedaf302e044bc5e75605877124ae347b3307 SHA512 5f3a2788cad993e625b8a6f848b2b839d07b257dd8c401e2699683a585175d686c25c69b7b477d4062db6fec9f03730c53c90dd92e9854070f9fdd6d17d7cdbf
-AUX icebreaker-1.9.6-ovfl.patch 695 BLAKE2B 4fbce0ef21e060dde1bae921b661706a7ca977a04084e861c25f698174115a3cf9ac7ba6fc33af7efc63370625ce440bd3e3c4d58526dbce9b87caef22b16f33 SHA512 0875ed515da7f03e49bb7ccaf58c7dfcbd03574c2742e54da248423c0c8bd4257f2d7ce9f2fd3aac6d00336fd23bdb131fdb1a9398e31600f6bddbd23e513c1e
-AUX icebreaker-1.9.6-parallell-install.patch 1183 BLAKE2B 666ccf94d47b1e8e614009e8d5b67eb0c67d7fbb5eb40bc33b520230a8e5a90410f6316b9dd2d4fd6453331007120f0f3ed62cb4bdb9817ca4026c8a563794e5 SHA512 7eeaa07111ee6443f9ebcb3b0bd55dccb1ed6ca3137df2b5c407dcc696c5946bc7643847d0d347761e4e8311871788cf9120a615da715e602f27af077858cfc7
+AUX icebreaker-1.9.6-gentoo.patch 8599 BLAKE2B b572190c99b2d3d27cebf80751df57d6c80e36189d95e98c11987232ce630668d1158fa2bdb62d09e584a48d42e1cc1618cd607661809b4972e558ce796843a4 SHA512 36685c3a0534305d13385f88b259ece8befdeb1115c0e5958ec2edde5cb3502b213c4b7b2f39a8a2183bab94385b0c2e678346b4175f1a1aa057269b011a6a1c
+AUX icebreaker-1.9.6-ldflags.patch 874 BLAKE2B e888051b968e3139f21a4a912e8dbeb891d9c93bbe96d1a9ceb5a3d5690eb2ae4f74d7afe9aca3892011341d034f2648e41f8ee5bfc5d6ad392add8d3ea85457 SHA512 1c27aa4373744f3a5d59643d36a950aa50377b5ef26fec988754d66860dc3f262bb46e82e40cf4222abb000f0a7ab4aac03d9508e55536212fa5eb7d1a0f5e5f
+AUX icebreaker-1.9.6-ovfl.patch 699 BLAKE2B 9203cb2007abe94d6746512c1bdeca9a0163fda87c443ce9ca4b99a0a435d5553ed972ea368f7717912ec8c9c994f3471f14f187be336738dee6ee70de95c2f8 SHA512 49dae47f4f4d446fbdcb0f5faaa6ff01ecacd695d0af01e10f70001245680116e83aa78b2a9cb4fa80e0641e4cb02c5fc09c0fa87cc79207aa5c5d4dca5f0658
+AUX icebreaker-1.9.6-parallell-install.patch 1187 BLAKE2B 52c23882a6a1f6c265232effed850f34caebdbc8c63e15268e3f1a6fe42c604c5a9ca7d2c20eaee22c896733f7d77752ce7f75e30fdc49664954e302ea4034e5 SHA512 d315283c5e0605e4cddaebc1d891b72a86cd0e6f27693864896ac6557fd4c0f9e748e648b11ae8682d6d47ad9ff0f4c9d63fd4dde09e621886a70828001b8327
 DIST icebreaker-1.9.6.tgz 137333 BLAKE2B 3fdfde734f868493313a2a7b018582f79d6140fa71c1802a27b558d2973968eb9cc01efb55c0b5a45d95cd4d1bc94b66f74809a82853d6d8c0ce1b7bf767e362 SHA512 c3b085dc42d33757011d6d526016477312c5e1cbab4c5584c1e271a1e43b40d61ad1e7f0c96c8f41348550b2e198b3ee7bca65fbef90125dbfa32544cbdf357b
-EBUILD icebreaker-1.9.6.ebuild 1077 BLAKE2B 1f4755180f454020836538466b1cc6b509ca69d157fdebe6b79e0978c18590fb81c11b7d743d57e2c0711d53e03a3c066452be5fa65a0484f0c5ba32e64882b1 SHA512 8a6562e7f03886ee3a364c48679a01c930f63d35527c41ad847875bc9d008b9bef6d709622339572fe921d9e81bf6190b18318f6941de1e07ee41415e91df9da
+EBUILD icebreaker-1.9.6-r1.ebuild 963 BLAKE2B 7e603e75245f247bc1f4f0312228891a585fbc791dfb09da804af15741c03ee66acbd7f991b36d4a190057c8216890eb6b22991c1aa3329b32ac0c5631f38e17 SHA512 2a65988b2199477a930771f03b0a2c215e6e7844c87ace0a2499358c9e8f0a0789c8db658f8963a4f93a82d87b021c0cb2324661163cb04322447ed0cf1e7e0b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
index d6e16a6c39a6..846d5b4141bc 100644
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
@@ -1,5 +1,5 @@
---- dialog.c
-+++ dialog.c
+--- a/dialog.c
++++ b/dialog.c
 @@ -279,10 +279,10 @@ PopupReturnType popuphighscores()
  
  	for (i=0;i<HISCORENUM;i++)
@@ -22,8 +22,8 @@
  	puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*3,1,color.copyrighttext,buf);		
  	puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*1-3,1,color.copyrighttext,"Thanks to my wonderful wife Karen for inspiration (and for patience)!");		
  	
---- menu.c
-+++ menu.c
+--- a/menu.c
++++ b/menu.c
 @@ -193,12 +193,12 @@ PopupReturnType popupoptionsmenu()
  
  	if (strlen(commandline.theme)>0)
@@ -57,8 +57,8 @@
  			}
  			else // right or middle or scroll back
  			{
---- hiscore.c
-+++ hiscore.c
+--- a/hiscore.c
++++ b/hiscore.c
 @@ -72,7 +72,7 @@
  	// make sure all entries are zeroed out to start.
  	for (i=0;i<HISCORENUM;i++)
@@ -102,8 +102,8 @@
  		hival[i]=temphiscoreval[arrayindex[i]];
  	}
  }
---- line.c
-+++ line.c
+--- a/line.c
++++ b/line.c
 @@ -30,8 +30,9 @@
  
  Line createline(int linenum)
@@ -115,8 +115,8 @@
  	switch (linenum)
  	{
  		case 1: 
---- options.c
-+++ options.c
+--- a/options.c
++++ b/options.c
 @@ -66,7 +66,7 @@
  	options.autopause=AUTOPAUSEOFF;	
  	options.difficulty=NORMAL;
@@ -171,8 +171,8 @@
  			}	
  		}
  		else if (strncmp(argv[i],FLAGTHEMELONG,strlen(FLAGTHEMELONG)) == 0)
---- penguin.c
-+++ penguin.c
+--- a/penguin.c
++++ b/penguin.c
 @@ -40,8 +40,9 @@
  
  Penguin createpenguinxy(int x, int y)
@@ -184,8 +184,8 @@
  	switch (random() % 4)
  	{
  		case 0:
---- themes.c
-+++ themes.c
+--- a/themes.c
++++ b/themes.c
 @@ -183,7 +183,7 @@
  
  	foundcolor.spritetransparent = 0;
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
index 44ef9bdf8631..93b40fc67687 100644
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2010-10-11 12:20:01.274684641 -0400
-+++ Makefile	2010-10-11 12:22:02.256897083 -0400
+--- a/Makefile.orig	2010-10-11 12:20:01.274684641 -0400
++++ b/Makefile	2010-10-11 12:22:02.256897083 -0400
 @@ -1,5 +1,3 @@
 -CC=gcc
 -
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
index 03050be548fb..5e8ffc01d8d2 100644
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
@@ -1,5 +1,5 @@
---- menu.c.old	2013-06-24 22:09:11.606750080 +0200
-+++ menu.c	2013-06-24 22:25:51.635735351 +0200
+--- a/menu.c.old	2013-06-24 22:09:11.606750080 +0200
++++ b/menu.c	2013-06-24 22:25:51.635735351 +0200
 @@ -522,7 +522,7 @@
  		{ // "random", at the end/beginning of the list
  			
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
index de388d9b5758..419262791d98 100644
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-19 10:26:18.000000000 +0200
-+++ Makefile	2010-10-19 10:38:28.000000000 +0200
+--- a/Makefile.old	2010-10-19 10:26:18.000000000 +0200
++++ b/Makefile	2010-10-19 10:38:28.000000000 +0200
 @@ -196,26 +196,30 @@
  themes-install: install-themes
  
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild
new file mode 100644
index 000000000000..f064951fac68
--- /dev/null
+++ b/games-puzzle/icebreaker/icebreaker-1.9.6-r1.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
+
+DESCRIPTION="Trap and capture penguins on Antarctica"
+HOMEPAGE="http://www.mattdm.org/icebreaker/"
+SRC_URI="http://www.mattdm.org/${PN}/1.9.x/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl[video]
+	media-libs/sdl-mixer
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-parallell-install.patch
+	"${FILESDIR}"/${P}-ovfl.patch
+)
+
+src_compile() {
+	emake \
+		OPTIMIZE="${CFLAGS}" \
+		prefix=/usr \
+		bindir=/usr/bin \
+		datadir=/usr/share \
+		highscoredir="/var"
+}
+
+src_install() {
+	emake \
+		prefix="${D}/usr" \
+		bindir="${D}/usr/bin" \
+		datadir="${D}/usr/share" \
+		highscoredir="${D}/var" install
+
+	newicon ${PN}_48.bmp ${PN}.bmp
+	make_desktop_entry ${PN} IceBreaker /usr/share/pixmaps/${PN}.bmp
+	einstalldocs
+}
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
deleted file mode 100644
index 449e0864f626..000000000000
--- a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Trap and capture penguins on Antarctica"
-HOMEPAGE="http://www.mattdm.org/icebreaker/"
-SRC_URI="http://www.mattdm.org/${PN}/1.9.x/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-parallell-install.patch \
-		"${FILESDIR}"/${P}-ovfl.patch
-}
-
-src_compile() {
-	emake \
-		OPTIMIZE="${CFLAGS}" \
-		prefix=/usr \
-		bindir="${GAMES_BINDIR}" \
-		datadir="${GAMES_DATADIR}" \
-		highscoredir="${GAMES_STATEDIR}"
-}
-
-src_install() {
-	emake \
-		prefix="${D}/usr" \
-		bindir="${D}${GAMES_BINDIR}" \
-		datadir="${D}${GAMES_DATADIR}" \
-		highscoredir="${D}${GAMES_STATEDIR}" install
-	newicon ${PN}_48.bmp ${PN}.bmp
-	make_desktop_entry ${PN} IceBreaker /usr/share/pixmaps/${PN}.bmp
-	dodoc ChangeLog README* TODO
-	prepgamesdirs
-}
diff --git a/games-puzzle/jools/Manifest b/games-puzzle/jools/Manifest
index 30b7d29d4f0d..b082e4e04e8a 100644
--- a/games-puzzle/jools/Manifest
+++ b/games-puzzle/jools/Manifest
@@ -1,4 +1,4 @@
 DIST jools-0.20.tar.gz 1710143 BLAKE2B 715c8be3e1e223cc5e8b8e6a0dfb0655c25bdd713bf5df678482063a6f68178449354f984b2ef0e52268379936e217786d0be7952ac2083f936d9bfe3551eca3 SHA512 11eadceb8208a72846a9e16a2dae0a1b1d7f8995d5ff2487ee03dd62811f3a232c0d08dc044c351f44c120e6e75eba11df1a727a9d5c6c57ce5e2ef8ee4d0986
 DIST jools-musicpack-1.0.tar.gz 4447501 BLAKE2B 2786a30d8a6cd09a05f1d13963b2c5f232b8d7c7c94bf83a5dc13979fc62349b9385bac1f08c2288e73134e38f78ef9bd48d84b4849f22c9ac791059be3b721b SHA512 1773beb8cd7df756cb4f7ba55729a6dfa995ca860f3381e2fed3884f42227d19955e13f8be9b2f6f64d4d86e452be9fe876963e24c85cd2c3cc42df62804b9c2
-EBUILD jools-0.20-r2.ebuild 1309 BLAKE2B c3ed0a87eff9fac0d3463e77090f7f19835e4fcc4c862a488234b785c052048b3d20755c24522b4788b4e6f1beba562e7f3632884462424537280bce70d794f0 SHA512 fcfb7e222c21234dca729ee5db4693178864bca6dda053acc214833ad229e5c1159d94cf24f2180269f29815fe563ccb6d5f51738df9c8984967131c9f6f9e01
+EBUILD jools-0.20-r3.ebuild 1242 BLAKE2B c0db451dc3fad43264e5212de8ef3db07af83d4b939ba5c387fe8aa76aaedc0dda3af9b6681f86862794aa27c6c44fb286169fb90fcfd1a26a64eaec1137481d SHA512 578d076e12e0e71e9873b90bf0b5edfb9cf5e1beeb227ebd0238a40ec4bb7cb23d78b8395da9753d21690a44a5a6d584564be71ae37c1446175d33276276fd4c
 MISC metadata.xml 671 BLAKE2B 3d2b8089c8988076718719b26c9e0678ee0197297e72653baf5011a6a45a65bf210e0dababf5a17a254858af8c73155fad6d5cdde684c71169c76338e5630f9a SHA512 928c0217e8ef9222cee84694ef0da21cb7fa50bc190361979c4eb44e01081b49e805e441128baddfb13269b7a8f02f991cc4cb08b253cc1a475859d393f786c6
diff --git a/games-puzzle/jools/jools-0.20-r2.ebuild b/games-puzzle/jools/jools-0.20-r3.ebuild
index 21bb3113dafd..e70ad0267d87 100644
--- a/games-puzzle/jools/jools-0.20-r2.ebuild
+++ b/games-puzzle/jools/jools-0.20-r3.ebuild
@@ -1,11 +1,12 @@
-# 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 python-single-r1 games
 
-MUS_P=${PN}-musicpack-1.0
+inherit eutils python-single-r1
+
+MUS_P="${PN}-musicpack-1.0"
 DESCRIPTION="clone of Bejeweled, a popular pattern-matching game"
 HOMEPAGE="http://pessimization.com/software/jools/"
 SRC_URI="http://pessimization.com/software/jools/${P}.tar.gz
@@ -14,19 +15,16 @@ SRC_URI="http://pessimization.com/software/jools/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-RDEPEND=${DEPEND}
+IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-S=${WORKDIR}/${P}/jools
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygame[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
+S="${WORKDIR}/${P}/jools"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -35,22 +33,23 @@ src_unpack() {
 }
 
 src_prepare() {
-	echo "MEDIAROOT = \"${GAMES_DATADIR}/${PN}\"" > config.py
+	default
+	echo "MEDIAROOT = \"/usr/share/${PN}\"" > config.py
 	python_fix_shebang .
 }
 
 src_install() {
-	games_make_wrapper ${PN} "${EPYTHON} ./__init__.py" "$(games_get_libdir)"/${PN}
-	insinto "$(games_get_libdir)"/${PN}
+	make_wrapper ${PN} "${EPYTHON} ./__init__.py" /usr/"$(get_libdir)"/${PN}
+	insinto /usr/"$(get_libdir)"/${PN}
 	doins *.py
-	python_optimize "${D}$(games_get_libdir)/${PN}"
+	python_optimize "${ED}/usr/$(get_libdir)/${PN}"
 
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r fonts images music sounds
 
 	newicon images/ruby/0001.png ${PN}.png
 	make_desktop_entry ${PN} Jools
+
 	dodoc ../{ChangeLog,doc/{POINTS,TODO}}
-	dohtml ../doc/manual.html
-	prepgamesdirs
+	HTML_DOCS="../doc/manual.html" einstalldocs
 }
diff --git a/games-puzzle/lpairs/Manifest b/games-puzzle/lpairs/Manifest
index b2b1b854dc08..21f4686caf6f 100644
--- a/games-puzzle/lpairs/Manifest
+++ b/games-puzzle/lpairs/Manifest
@@ -1,3 +1,3 @@
 DIST lpairs-1.0.4.tar.gz 536625 BLAKE2B f020f50b47290b961d77335d567dd68bc009e0952e7ebd39d39c041fcc5a2d9e97d6827921b862dd3dd59c7bef0f11165356f41eda022d7583ca27f584e4b02b SHA512 637f9782c1c1faee3fe0d02adeeb7ea70704f1b625922e1ba086cd03e9a6cf1d61a082eff4753a2ec8be5fc7041bd029f193adf847a39e773e4eedd9eafb2b97
-EBUILD lpairs-1.0.4.ebuild 970 BLAKE2B 99afd1416113855afa93f209206af3bf82e8d2752be4da24c12865cd17e8d4c05215b91c164d32678c11a8f42648752dd3db2632114731943ecda28f271e7ee1 SHA512 06aaa08867747febf449a5b660af6742a0ef7c2691fec15f277bf4e80ef96211ec8b6f3d579168c50199d295bbf1963f3d7eabce72cb34ad8776f1ed1bddd0c5
+EBUILD lpairs-1.0.4-r1.ebuild 939 BLAKE2B 93d2d8c38038efc7ceed0ca8a0554fa5489ca838591f2d36f918b4a54bfd3c6680f12332288b73f99d8d9c518a9e6632eb887c45b2d50fd710ed4b920b9399a2 SHA512 5ecf4fcbcdc5bd6487959c9fecc8027af2e60c01d7200072424ae3a212db96a59ae76984b23cf711456c65bb38abee596864d910d02607fe54eef88eab482fb2
 MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/lpairs/lpairs-1.0.4.ebuild b/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild
index 054dd29a9f4a..0f13cdb89b69 100644
--- a/games-puzzle/lpairs/lpairs-1.0.4.ebuild
+++ b/games-puzzle/lpairs/lpairs-1.0.4-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="A classical memory game"
 HOMEPAGE="http://lgames.sourceforge.net/LPairs/"
@@ -13,12 +13,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls sound"
 
-RDEPEND="media-libs/libsdl[sound?,video]
-	nls? ( virtual/libintl )"
+RDEPEND="
+	media-libs/libsdl[sound?,video]
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's:$localedir:/usr/share/locale:' \
 		-e 's:$(localedir):/usr/share/locale:' \
@@ -28,8 +32,8 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf \
-		--datadir="${GAMES_DATADIR_BASE}" \
+	econf \
+		--datadir=/usr \
 		$(use_enable nls) \
 		$(usex sound '' --disable-sound)
 }
@@ -38,5 +42,4 @@ src_install() {
 	default
 	doicon lpairs.png
 	make_desktop_entry lpairs LPairs
-	prepgamesdirs
 }
diff --git a/games-puzzle/ltris/Manifest b/games-puzzle/ltris/Manifest
index 0268de347ed4..7c4903844dc4 100644
--- a/games-puzzle/ltris/Manifest
+++ b/games-puzzle/ltris/Manifest
@@ -1,4 +1,4 @@
 AUX ltris-1.0.19-gentoo.patch 1769 BLAKE2B e7e30abae3b5d6a0ce088476164ad084c37acd95014a44ada8fdb2dcd27eb9331037bc3160d7956abe081fd746cc4267f2d97b6b02a054729df12a577681f69c SHA512 c0040258b95252efba67cc9da7e598ee2c2cb92b97702b14487d6b0c796bf25022af05350459540a95caf84249b95245d80d5da4be09bff6670f15ca754505a6
 DIST ltris-1.0.19.tar.gz 883543 BLAKE2B c175f8e85377e66b446bc5060c0808a258a22258b72e0b1f48491e12272e4ca63eb69900308d522877407b9aeb231e3a0885c6ca3da010755666d8151c1b4f10 SHA512 ab43b3d8f04ab40016be5b5c414f8679bee4f5f344ef9cab52c3628d48017458b84b0fbc0bcaecdfab43853a1ef628ee1cabf3a1373ea108650d4e76015881c5
-EBUILD ltris-1.0.19.ebuild 834 BLAKE2B a5ead4cad508a14850382d0ca2a594eab312bf5e31c7f0e4837bfb411757b474a1661d6b0ab1c7b023446867e04aa63464469517938d83581fc52182b887420b SHA512 e689ea089f26eb86a5633651e8f73f740d569dfe25540e39f6f1a005fe545231548d95b0de0df3d78a6ec12c72f3058872fc681ba00dcc5ec4966249d0439b0e
+EBUILD ltris-1.0.19-r1.ebuild 822 BLAKE2B db6f23c999eaeb776a37658d8e073239b7cae3b165a141264372593b8a50b04e0defad9549f71251bfc8fea18c3b481936ee1b742f1d740c8d126412bb42ffd2 SHA512 819deaabff7c0c303b34eb62fa24987d2d65e687b09b4c06fc538c8912d055855ff9afe6e0bdef7542e12b8c8413fbdeea8a89adb3304c832b8f4f33e5bebddb
 MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/ltris/ltris-1.0.19.ebuild b/games-puzzle/ltris/ltris-1.0.19-r1.ebuild
index 439782b6b496..9f3d02d2cc06 100644
--- a/games-puzzle/ltris/ltris-1.0.19.ebuild
+++ b/games-puzzle/ltris/ltris-1.0.19-r1.ebuild
@@ -1,10 +1,10 @@
-# 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 flag-o-matic eutils games
+EAPI=6
+inherit autotools desktop flag-o-matic
 
-DESCRIPTION="very polished Tetris clone"
+DESCRIPTION="Very polished Tetris clone"
 HOMEPAGE="http://lgames.sourceforge.net/LTris/"
 SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 
@@ -13,26 +13,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND="media-libs/libsdl[video]
+RDEPEND="
+	media-libs/libsdl[video]
 	media-libs/sdl-mixer
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	default
+	eapply "${FILESDIR}"/${P}-gentoo.patch
 	mv configure.in configure.ac || die
 	AT_M4DIR=m4 eautoreconf
 	append-cflags -std=gnu89 # build with gcc5 (bug #570966)
 }
 
 src_configure() {
-	egamesconf $(use_enable nls)
+	econf $(use_enable nls)
 }
 
 src_install() {
 	default
 	newicon icons/ltris48.xpm ${PN}.xpm
 	make_desktop_entry ltris LTris
-	prepgamesdirs
 }
diff --git a/games-puzzle/magiccube4d/Manifest b/games-puzzle/magiccube4d/Manifest
index 099111b04085..97074b4f57d1 100644
--- a/games-puzzle/magiccube4d/Manifest
+++ b/games-puzzle/magiccube4d/Manifest
@@ -1,7 +1,8 @@
 AUX magiccube4d-2.2-64bit-ptr.patch 1406 BLAKE2B 7741efef6045568adfb19b9cf64191ff682969dbcc4b12fdbbe62c55a9f4a4ae87a1208ad56fbd9ae8c331a33a79cde2ad28296da2a72d0c54810d1e183334ed SHA512 eb684cca4f6f02903c71e970146f6c110d9634ce2f1416e64bdf258b85264c79eaaa9b869f05ddb116373d908f4d0d2675c87d275ab79f76b21f77c5ce1c1563
-AUX magiccube4d-2.2-gcc41.patch 877 BLAKE2B 21040348b32d25c6e741015b98a96ce35ac73f4f95cc56fa71d651103ab345520ca3a399fe239eee0c76f4d34929b3102a6b67a5a29b026c750b8e4bbd529696 SHA512 e821864c45eb6effa7c613c43cb687def58fda4a770d57909498171db94a17f3f1d5e6ea8f387766eefc788500fc686167333c3c4e42d78a6ce46192d9ee9b1e
-AUX magiccube4d-2.2-ldflags.patch 497 BLAKE2B d8778d1723f146eec12e2dc90e38866fb7069a2b2691515ae534e651f10b43c24ec9ce6eac561801400cc9d81202ece7c7b91a6b16bb9bdc50f727f047c8ba7c SHA512 d1dd876b8fd4a1db40cc534f828370fce679e2db666409af9923cf6e37ff08c42def867b06cf712a2d4ac4b269a0e4a4f07f6abfd797b85680d902f1f4a67e2c
-AUX magiccube4d-EventHandler.patch 425 BLAKE2B d4d0041c373b4a9d14cffd329ac7c4832b3628562cf373c4fc9df984cdcd69265bb1fdf3bc60440c793a137979e884634846abf09fb6993875a51cd69eb0c3af SHA512 940ef99a94c1cea687196d918597785d813df30c6e15217a5a02a97cbb8b94ea67a60ed612a5974a8e2635f5b562c34acaee316d1790297166bf70112ee5db70
+AUX magiccube4d-2.2-gcc41.patch 885 BLAKE2B 42990103d195d793e1b10efa573179373202de3d798168b309c14e96a868a80171501d63993e0adff569c8f5a072c55f312431b2eb0deab9f0f9dbb88fef7489 SHA512 2ac9eed48b4598b006ce866c319075eb6b06e8119890db28a0a88d6c680949606d89f5aa113a946c565a4abae529d07d22c7def72dd17beb810ea2f555833d69
+AUX magiccube4d-2.2-ldflags.patch 501 BLAKE2B 2abc1cf4e4b9d210634fae3da618848d21b818d006d30d67a316e750f4e9c77bb2ab8097fc07a1a34aace7efb64f5b3845d8975aa65e7ed83de662eb2dff7968 SHA512 76183b674fa09d330edb82e3c72b605b992a6fe24273c55a45d819ad08854869a7a73ae2ab0d03c14cd872fb13fc0836b75c8d17e3828559bb49d0064caa41b6
+AUX magiccube4d-EventHandler.patch 429 BLAKE2B 7572ff178552f47fe12012f6d6a822a2e2d2d63115eb14fce6ecc8bf489a7ab3c04a7f028d7a514d8de9adca27e6032051b0930386e7d40db08378ad16690a4c SHA512 e11bc6d31a41dca68b450773f575ff1708426daf1f8750117de81592f7050cebe9ea61385e24bd09186d166d764b2d00351b203552eb9d1c2a10be03b3be4f03
+DIST magiccube4d.gif 20739 BLAKE2B feaf1911e483bff7244476000c75b34794911fe279772b8f5d46ee8bd4125881fb71aaab0ebac891fd0a5db38b746c940991bf5fe9e1ad8a678240b2d6cddf82 SHA512 7a8902710eaa78a6580f024a86bfa1828870dc873a4fef30a7d4fa197a67cd1dde162d6d1d1ba0bea4307c13198d52505fb1a1fa3f6d10b3914af42d7c0ebd49
 DIST mc4d-src-2_2.tgz 144645 BLAKE2B 5b29963d056961ce425f7644b14c35e44ce94bc7be6ea5f3fbbb4048478366951005eb8e91fe7cb12e6f1424ad55add31493e0ad3a4ab18eea9e747f940c35f3 SHA512 19491460bada93b4ee2010004128279cb88ab866a5a8c791080d59fa86e5bacf966d7dab0c9b3074e94b77611ae341480d19b384079e83df549ef25e592b12a6
-EBUILD magiccube4d-2.2.ebuild 879 BLAKE2B 75a690e7f5bb2a236c8498e9e88cea5b60b3ed5ae3bbb01da5e6b656caf060215b7c44eeff44182dc542d368dd11a8d2d0e69174cc0c3d56f03264026160bf5d SHA512 074a222750241fa6f5ebbb80bae93e4329e45c99caea926522877c1499d7b0cb2572f80f3808f3a23125be9422c3f05d24d9aff0ecfc22724b056f3f3f45dd1a
+EBUILD magiccube4d-2.2-r1.ebuild 1028 BLAKE2B d8a43720dd54d430685c2ef90bb4425a764dab690af518c9ed524ba85b830604728f94735d6cf6a678edee6ddfea87d08fff6873e0a13b6b61c16dac8fd61dd9 SHA512 ffcb0d692bca7fb0684cb93f3d1d7eb809f2ddf20d196e6c949f5d4cbef5895ad7e3e5cbc1e63bcb7a778a74c9d4876595d14182c24a18c9f6884f720fce9d08
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch
index adb4d2836a62..8e2aaf2b5fcd 100644
--- a/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch
+++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch
@@ -1,5 +1,5 @@
---- EventHandler.h.old	2006-05-19 22:11:48.000000000 +0200
-+++ EventHandler.h	2006-05-19 22:11:58.000000000 +0200
+--- a/EventHandler.h.old	2006-05-19 22:11:48.000000000 +0200
++++ b/EventHandler.h	2006-05-19 22:11:58.000000000 +0200
 @@ -165,7 +165,7 @@
  
      int  number_of_reference_stickers_needed;
@@ -9,8 +9,8 @@
      void* cur_ui_data;
  
      bool quick_mode;
---- Machine.h.old	2006-05-19 22:12:17.000000000 +0200
-+++ Machine.h	2006-05-19 22:12:29.000000000 +0200
+--- a/Machine.h.old	2006-05-19 22:12:17.000000000 +0200
++++ b/Machine.h	2006-05-19 22:12:29.000000000 +0200
 @@ -31,7 +31,7 @@
  {
  public:
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
index 446eb0cc91ae..73d1b4a59dca 100644
--- a/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
+++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.in.old	2010-10-15 10:38:48.000000000 +0200
-+++ Makefile.in	2010-10-15 10:39:07.000000000 +0200
+--- a/Makefile.in.old	2010-10-15 10:38:48.000000000 +0200
++++ b/Makefile.in	2010-10-15 10:39:07.000000000 +0200
 @@ -72,10 +72,10 @@
  	$(CXX) -c $(CXXFLAGS) $<
  
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch b/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch
index 7dae8981c4aa..d242438d8d05 100644
--- a/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch
+++ b/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch
@@ -1,5 +1,5 @@
---- EventHandler.cpp.old	2004-11-04 22:58:13.735812448 +1100
-+++ EventHandler.cpp	2004-11-04 22:57:03.176539088 +1100
+--- a/EventHandler.cpp.old	2004-11-04 22:58:13.735812448 +1100
++++ b/EventHandler.cpp	2004-11-04 22:57:03.176539088 +1100
 @@ -326,7 +326,7 @@
          number_of_reference_stickers_needed--;
          reference_stickers_needed++;
diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild
index 7d4287d447bd..5f9eac856d8f 100644
--- a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
+++ b/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild
@@ -1,13 +1,14 @@
-# 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_PV=${PV/./_}
-DESCRIPTION="four-dimensional analog of Rubik's cube"
+MY_PV="${PV/./_}"
+DESCRIPTION="Four-dimensional analog of Rubik's cube"
 HOMEPAGE="http://www.superliminal.com/cube/cube.htm"
-SRC_URI="http://www.superliminal.com/cube/mc4d-src-${MY_PV}.tgz"
+SRC_URI="http://www.superliminal.com/cube/mc4d-src-${MY_PV}.tgz
+	http://superliminal.com/cube/cube_transp.gif -> ${PN}.gif"
 
 LICENSE="free-noncomm"
 SLOT="0"
@@ -17,10 +18,11 @@ IUSE=""
 DEPEND="x11-libs/libXaw"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}-src-${MY_PV}
+S="${WORKDIR}/${PN}-src-${MY_PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-EventHandler.patch \
+	default
+	eapply "${FILESDIR}"/${PN}-EventHandler.patch \
 		"${FILESDIR}/${P}"-gcc41.patch \
 		"${FILESDIR}/${P}"-64bit-ptr.patch \
 		"${FILESDIR}"/${P}-ldflags.patch
@@ -35,7 +37,8 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin magiccube4d
+	dobin magiccube4d
 	dodoc ChangeLog MagicCube4D-unix.txt readme-unix.txt Intro.txt
-	prepgamesdirs
+	doicon "${DISTDIR}"/${PN}.gif
+	make_desktop_entry ${PN} "Magic Cube 4D" /usr/share/pixmaps/${PN}.gif
 }
diff --git a/games-puzzle/meandmyshadow/Manifest b/games-puzzle/meandmyshadow/Manifest
index 6b04adf416cd..1b35ee1d225b 100644
--- a/games-puzzle/meandmyshadow/Manifest
+++ b/games-puzzle/meandmyshadow/Manifest
@@ -1,4 +1,4 @@
 AUX meandmyshadow-0.4-cmake.patch 513 BLAKE2B c2a272dea4328ce3348b2fd06b4e050681f09ca2068399f445c3d65d9416b0ad885ca449c14467fdba191d8795b0ed42d31f2a89752cd72346b98a736aafb77a SHA512 e81037c98f55bebe587f878ff1f5f57c6c5558f8305f5e2cd50db0bbb5634bde418c5254f43051b07b0017b380b2144103eae8ae4fcdc3c780ce2b3134e3f538
 DIST meandmyshadow-0.4-src.tar.gz 16962805 BLAKE2B 607c08c0484b049e02ed54d2483f30f1c7af8aeffc31c977dba335e57eb14734517469f345387778875567db7f446b159dfbc7e51832cddc0d29e8352b308b29 SHA512 945f096fdc2df58b29f91314cd88953d897bbdbd094d8092d6712d33f7dbacadd298ca797e678ebad08ca579ed67a7b9d664e1fa202753e687a021935032a92b
-EBUILD meandmyshadow-0.4.ebuild 1441 BLAKE2B 9dd3a50229af96f16df18817b82c923f02de1196ef236eb01e8d4d3dc0055eb32466d9ed8ed534f50cd7567abf559001d0afabd318e555fd1e9022944e83b054 SHA512 07c4c69ce6549dcb5bcd45f9f308e4b64fceaa3c7924fc2bd20b5b526db6ed4dfa9a08094aeefbd3221e759e4c1738342275b1d413ac2058bdf79f6b753ee426
+EBUILD meandmyshadow-0.4-r1.ebuild 1272 BLAKE2B da00fe0388a3a5967f4b8e5bee8a0bcd78e16178f7503d92b30bdd01fbd8aa3d46b4376db81907f221f4146112c17735222db37b222c00572cf3cb5ffd8217fe SHA512 0e398c4133cd1142c23750abc145a8989ec7f7d1897bec8716b2add27425842643034c1a969479105ee7784e831a694d8843ccf51d4e755d5c5bef00cf3ef460
 MISC metadata.xml 336 BLAKE2B ef2dbc4f110f2be12490cafc36b1efa95c025822eebdcda0cbec755f1c943d4111304cb0b0a0b415b297ee8face8bef5328a062d28fac6f00ce5ab4f20a8f321 SHA512 8641b7544c71bf31e801587fb889e92e248b4c3500be88ae976423e39d93a6d870b18f05d7af9ce0e0c1d5e2ec081501cecb070cbf2a1452724cc20851617a55
diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
index fc86ad6a5122..c7d403f40c4d 100644
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit cmake-utils gnome2-utils games
+inherit cmake-utils gnome2-utils
 
 DESCRIPTION="A puzzle/platform game with a player and its shadow"
 HOMEPAGE="http://meandmyshadow.sourceforge.net/"
@@ -22,21 +22,18 @@ DEPEND="media-libs/libsdl[sound,video,X]
 	net-misc/curl
 	app-arch/libarchive
 	x11-libs/libX11
-	opengl? ( virtual/opengl )"
-RDEPEND=${DEPEND}
+	opengl? ( virtual/opengl )
+"
+RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
 
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DDATAROOTDIR="${GAMES_DATADIR}"
+		-DCMAKE_INSTALL_PREFIX="/usr"
+		-DBINDIR="/usr/bin"
+		-DDATAROOTDIR="/usr/share"
 		-DICONDIR=/usr/share/icons
 		-DDESKTOPDIR=/usr/share/applications
 		$(cmake-utils_use opengl HARDWARE_ACCELERATION)
@@ -44,23 +41,16 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 	dodoc AUTHORS ChangeLog README docs/{Controls,ThemeDescription}.txt
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-puzzle/mindless/Manifest b/games-puzzle/mindless/Manifest
index 0bdfc8214008..e8364b713aa5 100644
--- a/games-puzzle/mindless/Manifest
+++ b/games-puzzle/mindless/Manifest
@@ -1,4 +1,5 @@
 DIST OracleAll_050523.txt 1280717 BLAKE2B 8ae2c78cd0c1453785d5d5e382804e2e186d481a0195a92a93adf091dcd51833311d9111806641eff4489a47842eb362f09d9a6d69973817619c07b9be1cadd2 SHA512 d2d46e330a697974bc6c69b8616bdd08c959d1b20840468ccb20ca22a105d7cfac01dd0262113804fb84e790cb1f8ad439c1aa3c17927551617ec2f6de5b83e5
 DIST mindless-1.6.tar.gz 85620 BLAKE2B 5922cdb31ec83a0e7cda6c8646c75f35d1e52ce96711b62bd5749762e5074b39568f499bcd3dce39e4bb6d9d7e70097d62c310235bb59f1eda790d057197544a SHA512 bcb47311aebc127e30e10931e489cbbdb80845c6d95008834abab7ecbb7565eb61a38f47e68d24db5ed9da2cb3467fdaccccd05c6eaaca403afaf41cc76a991f
-EBUILD mindless-1.6.ebuild 1219 BLAKE2B 44f6dcff8980aa7455a4e6aea55c14509142cbaefc06dd9ed34bc5b45b67449f7858d297995336c984bf266e8ff767d039b3ec0185d22e7ade399c698ace6330 SHA512 daf1d1b92265755623e86d641331b0c2aed20a0b1d2f3fe71c0888c3072783b34509fead4d750dccba88d64e6459fb06d6cb956bea506184253bd439a725bb46
+DIST mindless.png 5119 BLAKE2B 19796bda1bc29c7a78a91cf083e98ef1a51fae0581cece3f8822f2474011cab5d20d0ffc797ef83912cebe406816271d67016cfef86393fe554c03dd42956541 SHA512 1a26d6f241889887a4464555189f25936e3961ef6df113dd4d3eab0f60699ea6bba9af3d88517e61ae9ad9dfc630e663a9d4c7ff0876ff3bcf21cbcee6a7f50a
+EBUILD mindless-1.6-r1.ebuild 1364 BLAKE2B 2a4bcd5db9a7155a0068502b1d4fe8489ec7d2a178383551ac0c1af82a74996cc28daff359d393a493910a978818c409b2c04baab93a0e0616f89a71fac4cdf8 SHA512 28097522c5e04e79bc7036e74cf5c728a99d39c10fba8808af23a5589e13e2238277193d91222529fe036a93abebb828c36944ae9249edef0d313debea9b7375
 MISC metadata.xml 331 BLAKE2B 7663f41ea5c4e0ce0680d1815f4d62ff469d25274a253aad5c9597836eaa1fb392636730c25b4535ecba191518b8a4a5cbf2f6cfc58767dcda05738bf3157f30 SHA512 bae00e9836e3224a3f2c4fc7c6be572153b8693f42de869c4670edc2c5b8f103182a5f7c97ab2abd7744a29b0ed30f2c5dc56c7c661bdc28f14aaa5355eb5b5a
diff --git a/games-puzzle/mindless/mindless-1.6-r1.ebuild b/games-puzzle/mindless/mindless-1.6-r1.ebuild
new file mode 100644
index 000000000000..4777d0640580
--- /dev/null
+++ b/games-puzzle/mindless/mindless-1.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop readme.gentoo-r1
+
+ORANAME="OracleAll_050523.txt"
+DESCRIPTION="Play trading card games (Magic: the Gathering etc.) against other people"
+HOMEPAGE="http://mindless.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mindless/${P}.tar.gz
+	http://www.wizards.com/dci/oracle/${ORANAME}
+	http://mindless.sourceforge.net/images/logo.png -> ${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror" # for the card database
+
+RDEPEND="
+	x11-libs/gtk+:2
+	media-fonts/font-schumacher-misc
+"
+DEPEND="${RDEPEND}
+	gnome-base/librsvg:2
+	virtual/pkgconfig
+"
+
+DATAFILE="/usr/share/${PN}/${ORANAME}"
+DOC_CONTENTS="
+	The first time you start ${PN} you need to tell it where to find
+	the text database of cards.  This file has been installed at:
+	${DATAFILE}
+"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cp "${DISTDIR}/${ORANAME}" "${WORKDIR}" || die "cp failed"
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^CC=/d' \
+		-e '/^CFLAGS=/d' \
+		Makefile \
+		|| die 'sed failed'
+}
+
+src_install() {
+	dobin mindless
+	insinto "/usr/share/${PN}"
+	doins "${WORKDIR}/${ORANAME}"
+	einstalldocs
+	readme.gentoo_create_doc
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} "Mindless Automaton"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/games-puzzle/mindless/mindless-1.6.ebuild b/games-puzzle/mindless/mindless-1.6.ebuild
deleted file mode 100644
index 2bc3f3b408c3..000000000000
--- a/games-puzzle/mindless/mindless-1.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-ORANAME="OracleAll_050523.txt"
-DESCRIPTION="Play trading card games (Magic: the Gathering etc.) against other people"
-HOMEPAGE="http://mindless.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mindless/${P}.tar.gz
-	http://www.wizards.com/dci/oracle/${ORANAME}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror" # for the card database
-
-RDEPEND="x11-libs/gtk+:2
-	media-fonts/font-schumacher-misc"
-DEPEND="${RDEPEND}
-	gnome-base/librsvg
-	virtual/pkgconfig"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cp "${DISTDIR}/${ORANAME}" "${WORKDIR}" || die "cp failed"
-	DATAFILE="${GAMES_DATADIR}/${PN}/${ORANAME}"
-}
-
-src_prepare() {
-	sed -i \
-		-e '/^CC=/d' \
-		-e '/^CFLAGS=/d' \
-		Makefile \
-		|| die 'sed failed'
-}
-
-src_install() {
-	dogamesbin mindless
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins "${WORKDIR}/${ORANAME}"
-	dodoc CHANGES README TODO
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "The first time you start ${PN} you need to tell it where to find"
-	elog "the text database of cards.  This file has been installed at:"
-	elog "${DATAFILE}"
-	echo
-}
diff --git a/games-puzzle/mirrormagic/Manifest b/games-puzzle/mirrormagic/Manifest
index e12b61893c2c..bfd2a6a44442 100644
--- a/games-puzzle/mirrormagic/Manifest
+++ b/games-puzzle/mirrormagic/Manifest
@@ -1,9 +1,9 @@
-AUX mirrormagic-2.0.2-64bit.patch 888 BLAKE2B ef8d9ab723b79c213211953b2e44f5f5f650c12825c9ae881896710abb03ece530e0924980e10da5b65b7e0b0d8a3aa7f98f779e9e1c01e13dd886fcd1611341 SHA512 ff81626db66f62213184402bcb8b47393c6463c4db3daf41eb5008a5358775b95446a9f5dfdbd38535c6a3e15cfc09d2543aea6e84868a31f3f0be7bae8356c0
+AUX mirrormagic-2.0.2-64bit.patch 892 BLAKE2B afadf37d81290831ebd6c479d98520e2e3e80df12c84d7fadab93d78d720c9ec1d926a948fc424fa57b64d3d861c16bb5ecd246bfaf07496bb25c07c606f785f SHA512 c625eb00098c4d7c41ce58ed2ca3ee28f34f6a06025d20e0533f6b171cfc2f2b0cb01ce80fb057902d839868303aa20329452c67f7c7e86809472207aeba6207
 AUX mirrormagic-2.0.2-editor.patch 499 BLAKE2B 9b09e8e9962b018945fae2a1c5c6e72134b80e267c189e60774889761b0d5264410ce4015523edce73de1e313e780c2fdf0f62d263d8d3398dd8162eb365be60 SHA512 2d2d497402596b0108b0b79f8ce93d4e7404a64f20107582d40ac5d72291645379f920af5bd156e607f724e0427817bf6557223a7c152ebdf41b6787e81fb353
-AUX mirrormagic-2.0.2-gcc41.patch 267 BLAKE2B 606a9f47d0202381d7c5fbb856e1642fea6ac4fb56a5bd3c9101e2bd850ba5b56dd035c86e1c4c1e093c09baa3644e89a46da4e8ef55eaa28b176dd3a1474fdd SHA512 8cd454154f877257eaa252ee3e5250354ed73ea0e4533048fbac48e6db7bfade345b8740815b8ffde3707df9be71a22655c8982bfe05e74ddfde6814610a2c84
+AUX mirrormagic-2.0.2-gcc41.patch 271 BLAKE2B c9af7a0ca7cbdfeb752b914def445de7089d541e8c0a37b4cb17d6a5c0d2e60ff46c539d32bddf36c7c57ab1ed1adcdbf803e2967dd5932cedee07e3bbe2415a SHA512 7ff5419ecbf4598c30241dc68cf0191abe4b806226628533d261e10eb33b90c1f5909c7b6afedd2f2fad87bea7cc6a06dceafe513ec3a93e4ea9d6bda1d8eaea
 AUX mirrormagic-2.0.2-gcc5.patch 14581 BLAKE2B 70ead8b2ae5fef95d7c465c2dc80380789377f8d59df9a8f24ab641e8ee3fd0c4891de18ad2d85cbfa55fa940f698f19c7ab9395e16e0eff96672452f35aa59b SHA512 bf71d63c5bef22cb49f2dd9b63d7e8150ea6e6a49cc2430a834ebd31f07f9b2e26411330550ff181386654b9695682fd9a71a3975df24ead8e1386746756b59b
-AUX mirrormagic-2.0.2-parallel.patch 234 BLAKE2B 76f3db6cd1a8f59d3b78de16d43a2c85a79b626b595fb8bfcf01abecaefe2544ca8a88ceb4e98999d0a3caea57412f55d0fb2d9c2a17b18e685f38bff5b3cce7 SHA512 34317534acb00fe9947eb53d3c16373866f4ecfd913489b4b9da6e9714ce4b04b0b3ce2680b03ea2fb22913147ac154b4eb0d83f46e76a9bc45c6aaac439c250
+AUX mirrormagic-2.0.2-parallel.patch 238 BLAKE2B 76e437bc253ec82381161748b24ff2b08d5723fc8ce9e6beb294904f8263f95ed06afb648f35898997f6b53524c5f921f3b4c4e4b49c46f892e2b56fc7ac0830 SHA512 54cd926d2278878b7647ef790138e5f9f77ac9086c7d86d047bbea7481e39efd760393c3aa5657070e1fb0d07fb82cab64d63a593234e9dc6eff7ba7794ec5ee
 AUX mirrormagic.xpm 6347 BLAKE2B a5bf1e854b3d0f379567649ddae43891c6929301472618cc5f2beeef0f46e1faa05f8f726825a94714fbe1b77d13ec68663299b4edb8903e812a6759d2cde6eb SHA512 5040a6232ba047fe0038276bf574ca22b5270827c21e9dbba0f130f0b25c2157be611cca1e662af2ff8cc43ab78f69a925b6687fcaedc4778672ebfedfe00227
 DIST mirrormagic-2.0.2.tar.gz 1168098 BLAKE2B 0feefa2e7af82b212c3c08a347154d701a8492c2fef35cf625f4176e4893888904d88a2ee6d36c4e239fbf2cb6f1f77aa8e273023a86dce04dce8f5b77b62946 SHA512 cd49b1325485b68f2b59341e91f0564693dd12117aa3d6b5078c0a7f0e074114196870af11f0a154a0934cfce7106ba9685d886611f2efeff665ea030d705e03
-EBUILD mirrormagic-2.0.2-r1.ebuild 1295 BLAKE2B 8de15f1b9100d798a7ffce03c271d9d69d8a50fa81da4ba9f91ff0d90354b80c48010a9b435885d8a9ac408506a5c0c531b20cd9a282dd8a4b388e4abe2a9355 SHA512 ac95c497b62d1ec484df42697581a50935ecd54c15eddd35484545651a2f6da6d71bede26055ec83b22fd90f22e369857c67047f5d7a9e52757c9b4844dd9370
+EBUILD mirrormagic-2.0.2-r2.ebuild 1231 BLAKE2B 49d51d7b6a58f7eb04619445ad3cf1c4c82e25916649ff997f816d9732d6fea70c4c0cbdaa003d3bd972cb728f2535bb50920f9afefa59fd701861c411b883fe SHA512 96f248137e83883402c99854debe17869524763d7766a093ddd29baf40c54f4e8059f5648761f3f7bf9d20d95cd9651359480263ec50b901304dd7377c503516
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch
index e9b313423699..4817f75786f8 100644
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch
@@ -6,8 +6,8 @@ unsigned long.  Should probably really be uint32_t but I'll leave
 that decision to upstream. Thanks Pelle Nilsson (and son).
 64bit check borrowed from bug #496863.  Closes: #498912.
 
---- src/libgame/gadgets.c
-+++ src/libgame/gadgets.c
+--- a/src/libgame/gadgets.c
++++ b/src/libgame/gadgets.c
 @@ -18,6 +18,12 @@
  #include "text.h"
  #include "misc.h"
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
index c8d386f4e581..be7f701de42f 100644
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
@@ -1,5 +1,5 @@
---- src/main.h.old
-+++ src/main.h
+--- a/src/main.h.old
++++ b/src/main.h
 @@ -459,7 +459,6 @@
  #endif
  extern struct HiScore		highscore[];
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
index 9b538a688816..a7effd4b6984 100644
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
@@ -1,5 +1,5 @@
---- src/Makefile.old
-+++ src/Makefile
+--- a/src/Makefile.old
++++ b/src/Makefile
 @@ -146,7 +146,7 @@
  endif
  
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild
index 88a24e7a64e5..812835fd25d0 100644
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild
@@ -1,10 +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
-inherit eutils toolchain-funcs games
+EAPI=6
+inherit desktop toolchain-funcs
 
-DESCRIPTION="a game like Deflektor (C 64) or Mindbender (Amiga)"
+DESCRIPTION="A game like Deflektor (C 64) or Mindbender (Amiga)"
 HOMEPAGE="http://www.artsoft.org/mirrormagic/"
 SRC_URI="http://www.artsoft.org/RELEASES/unix/${PN}/${P}.tar.gz"
 
@@ -13,17 +13,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sdl"
 
-RDEPEND="!sdl? ( x11-libs/libX11 )
+RDEPEND="
+	!sdl? ( x11-libs/libX11 )
 	sdl? (
 		media-libs/libsdl[video]
 		media-libs/sdl-mixer
 		media-libs/sdl-image
-	)"
+	)
+"
 DEPEND="${RDEPEND}
-	!sdl? ( x11-libs/libXt )"
+	!sdl? ( x11-libs/libXt )
+"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-gcc41.patch \
 		"${FILESDIR}"/${P}-parallel.patch \
 		"${FILESDIR}"/${P}-64bit.patch \
@@ -40,17 +44,16 @@ src_compile() {
 		RANLIB="$(tc-getRANLIB)" \
 		OPTIONS="${CFLAGS}" \
 		EXTRA_LDFLAGS="${LDFLAGS}" \
-		RO_GAME_DIR="${GAMES_DATADIR}"/${PN} \
-		RW_GAME_DIR="${GAMES_STATEDIR}"/${PN} \
+		RO_GAME_DIR=/usr/share/${PN} \
+		RW_GAME_DIR=/var/${PN} \
 		TARGET=$(usex sdl sdl x11)
 }
 
 src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin ${PN}
+	insinto /usr/share/${PN}
 	doins -r graphics levels music sounds
 	doicon "${FILESDIR}"/${PN}.xpm
 	make_desktop_entry ${PN} "Mirror Magic II"
-	dodoc CHANGES CREDITS README TODO
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
index 4ffe2b7f2468..7f42c1695386 100644
--- a/games-puzzle/monsterz/Manifest
+++ b/games-puzzle/monsterz/Manifest
@@ -1,6 +1,6 @@
 AUX monsterz-0.7.1-64bit.patch 1093 BLAKE2B a27d602e4087926e053abd4f1cefb22a88fa37f8a3a773e13ea2f5db0914d6589db5fb09c78551da2f6f5b78d5cfd6c46bf08b9d77e6cfed99a451ffb9311c24 SHA512 3098e5a287c2b3e5e415a06e9e671fb4e56ebd4405a4580c5bb3529c1708ada9efdb40b1369040c7dba50ee1e0c33b6f088da898a8eec7f2997e4d376b67dea4
-AUX monsterz-0.7.1-blit.patch 1294 BLAKE2B b15375963839fc1732be67512d65eb9fd06954040769e26e4ad42076d54facd22b6635ddb35bd89eb976790a74fa2075c9c934f55e081e7a8b1bf108d20d3ebb SHA512 aa7e63d7a67afea475f1c26976da46828232075231f939d4e478f1975bd192de8ee7b848a914567f915ef3c1394a11acb183a84b548732ed55389d3cd764614f
-AUX monsterz-0.7.1-gentoo.patch 966 BLAKE2B 414401bdcda06d33155d178bff220392ee89ba61a6e3dc63bc14826fa770af072707afae020281f1a11bf18b8ae82af11c832f22335cd972f23ed3d8ecf4ec96 SHA512 69cea5fef337a6a2f8105dfc1cf6e308569852ead7701b6898582c51b5a740ff80f9900956e3fa0325a37fd963e62acc62a4c385b7669b4cf634a90136a484a7
+AUX monsterz-0.7.1-blit.patch 1298 BLAKE2B ef1c5961a0a1c48ab01a289f7504355b445beae6f7387f68a901b75d403c2422b53fd1c7a4923d954320de73555fd649ff913ddd68336fc1233f94655fb34b8b SHA512 682542801240d7b32497105774ed240b08eefd9a92dfd20caf66d00fb1d77ec563c97262ed323c96a71fa19e5c2f9a13cffd7a8698aae92b2dfd858d35d8ed98
+AUX monsterz-0.7.1-gentoo.patch 970 BLAKE2B 658224adbc150cf01dfe72a3f1ea5fd14d0122eb1ac3b55f1d52c1f89ecbefeafa88e3aff08d4d832f8b2b6b2922890514609652e0c8f3cee26889f66b0ca5bc SHA512 1dc1994cb03f794b9f015d8d812b8519c826b0a0d02ecb3a9f4bb0e25d69aeb8f3784dcf1fbc1624ca18f645b55e0889f0d2ce8f1339639e8ed55d305af0f3e1
 DIST monsterz-0.7.1.tar.gz 1879537 BLAKE2B e1ad9f17a64bcbb07005eb61d951dbf756997a6e6bd76c48d88bb634c9b3167c9fd41ef32032925b219153eb607dc238af76b44c3ef6c47aab753d59c61958e1 SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
-EBUILD monsterz-0.7.1-r3.ebuild 1147 BLAKE2B 56466d6d2ebb451b092ae224787cb0162cda6c0f3e832316b72131433e729f2a4e6f8551d119633227db6814b156478cbec709e9e5abfbec13954451e976395b SHA512 1f576538e17b39eb9bb35cf026bf2534bce1f1cdcd66e1b83fb2b2d4b9cec2fa0ab49521ba1a3a97c2e1d07bbd5fd02aaaaea0a3135c2e19e7160146c4d8a0d0
+EBUILD monsterz-0.7.1-r4.ebuild 1100 BLAKE2B 9eee9e6e0cb08ac23cc78abea1981877d017046ea3dbe3136bc3ac2ff1c6ce53752729a5b53ee2ca12bd6853dc930154954596621e2f6ce9f147f34a8a44a8ab SHA512 6d83c1ad052d362b6e364fec40eb321696e68a70fdeb2138018f1a316dd9c2d4b528bea8e54777022d50ab6ed82274af4d2106bba0ae634bce30b3995ad96808
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
index 8e55b23a327c..d0847d6c2c10 100644
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
@@ -1,5 +1,5 @@
---- monsterz.py
-+++ monsterz.py
+--- a/monsterz.py
++++ b/monsterz.py
 @@ -829,10 +829,10 @@
              pass
          else:
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
index 652450bf190b..6920e0e36971 100644
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
@@ -1,5 +1,5 @@
---- monsterz.py.orig	2006-05-12 18:55:51.000000000 -0400
-+++ monsterz.py	2006-05-12 18:57:44.000000000 -0400
+--- a/monsterz.py.orig	2006-05-12 18:55:51.000000000 -0400
++++ b/monsterz.py	2006-05-12 18:57:44.000000000 -0400
 @@ -1907,7 +1906,7 @@
      print '          (C) Mike Kershaw <dragorn@kismetwireless.net>'
  
diff --git a/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild b/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild
index e8e78eba8638..4cff31b75f8c 100644
--- a/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild
+++ b/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild
@@ -1,44 +1,47 @@
-# 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 python-r1 games
 
-DESCRIPTION="a little puzzle game, similar to the famous Bejeweled or Zookeeper"
+inherit desktop python-r1
+
+DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper"
 HOMEPAGE="http://sam.zoy.org/projects/monsterz/"
 SRC_URI="http://sam.zoy.org/projects/monsterz/${P}.tar.gz"
 
 LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
+
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/pygame[${PYTHON_USEDEP}]
 	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]"
+	media-libs/sdl-mixer[mod]
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-gentoo.patch \
 		"${FILESDIR}"/${P}-64bit.patch \
 		"${FILESDIR}"/${P}-blit.patch
 	sed -i \
-		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
+		-e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
 		monsterz.py || die "sed failed"
 	rm Makefile || die
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r graphics sound
-	newgamesbin monsterz.py ${PN}
+	newbin monsterz.py ${PN}
 	newicon graphics/icon.png ${PN}.png
 	make_desktop_entry ${PN} Monsterz
-	dodoc README AUTHORS TODO
-	python_replicate_script "${ED%/}${GAMES_BINDIR}"/monsterz
-	prepgamesdirs
+	einstalldocs
+	python_replicate_script "${ED%/}"/usr/bin/monsterz
 }
diff --git a/games-puzzle/mures/Manifest b/games-puzzle/mures/Manifest
index 9abc0981914a..99ec18b21954 100644
--- a/games-puzzle/mures/Manifest
+++ b/games-puzzle/mures/Manifest
@@ -1,5 +1,5 @@
-AUX mures-0.5-save.patch 646 BLAKE2B 32279c5cae1eb5dddfa1bfe2e3456564bd14e1abd63c26dd358f1704aa76115a6ac0876694549349a824d1814b65c970176a6e7521f89ea9b592a3570bc5827d SHA512 2b3717c107fc82010ca9a894d68895d438bbd3e36c6d192a49a2f802f7b42abc717b07d278167176813965bcfbaf1ecab99e7edc30abaf1536f9c6e52e18c0b0
-AUX mures-0.5-underlink.patch 296 BLAKE2B e9e9e194d9e1fbbe531f8f01cc1380bedb1a870e5b5f8546cc543019c58016281be91404762ef64bd5f28fdb90928ca9f225ca35a1ea214775ad68e0d9beceb4 SHA512 51e32719135883847b326b6c5f3f0954e1df0c3f4d84cfc1e28a6e82974d25c7d44ba552796ee01cf99db7291c2d6c849a777cd03099802618ed56142eea57ab
+AUX mures-0.5-save.patch 654 BLAKE2B 57992955c9bb850ec7f13c50039eaa02d81540abbe94dba7cc0d034d5dab3c0f63d82fcdeb666efc664494e39f47c152f84efebaa1b3c2a108b55ff5c960dacc SHA512 b1762660ecd5cd373d39957003a0e455c3f981886191955eca2ccdd54d6ce2a302f6eaed3d022ac5acd64cabed364a6c1dc6cbdf53e0fd32208ce3d12db0a187
+AUX mures-0.5-underlink.patch 300 BLAKE2B f20a6a2e2e82e0f16a9ed8f49d2cf4071d4f19c2149f12b98572e0e4a8e42e04556d02bd93675f5805dae96a496ea4586ce064ea2f33c33586a24afecab889ce SHA512 ffbd6e23fab8fff7ccb191c1fcc4f405b2c5cc6cffaa388eca11185244a5328d16b8f3301ce1dd29ba036637e281e55b08ac39c039ff187cac35f01f078ced21
 DIST mures-0.5.tar.gz 638528 BLAKE2B 35861cbc0497091c716664a6a1d38884a64981f6228637cbeb93b4be64c42bf84b8033c2f5d95f197c26436fbf621ff8322ffb5aa3dc241b50372e94a395599b SHA512 907b22adffcc0457d866da27bd11d61663c6a1eed1c0aa4b437f8e341065df86f2ab06851619e2fa4088aa0b2becaf9376bad693c83345f8d1ee862c31740eff
-EBUILD mures-0.5.ebuild 2014 BLAKE2B 6abdf8f7d8a12f150544cc5f6b334e33954d770a7c2fda3a2fb299235eab51e4cf899c7c4dc52d56df4474067f313d9cf26a874435760f141e08c98d9fb56342 SHA512 ec4fc3db2d6cb97eeb4917beb7af25725961c0c01f2fc27e3a2360de9ab854b415c30f285aa4fdd9be93c30120409c405deaa42997131c0db3f94eb7e5625ab3
+EBUILD mures-0.5-r1.ebuild 2079 BLAKE2B 9fded27b1529d579f3dd27673472396507f14061ea14f43c2d1997cc059241e432fd63bbdfc4bf9aefd597499f50f5069fd46072eb48b3879f48a193129414d7 SHA512 7bcaf4b664fe92b1ec3b4f5da68875daf5f6c0c64705ace569b082a6a8b6a6ed4c5609a2b3c9c7993d7b5efbcd4e56ba6b48b1b6843fec94f48466075cdac049
 MISC metadata.xml 328 BLAKE2B 10dbb393d6e09fe667ad28913d38f785c0d8d51da581bbc2fe2d19c18faea716bc901097829cc4927b6d3d0265ecd53e62635461f6bb3619cba1540b7b033c66 SHA512 f6818639d9ff510efe1dc98505eb03086d46024def2a1b5fef5273181e6eef91135ef4e7902613776da51a951c50373b5cc80848a9887d3919f7adfd9ef40f18
diff --git a/games-puzzle/mures/files/mures-0.5-save.patch b/games-puzzle/mures/files/mures-0.5-save.patch
index 704dcf1f53bc..697db8ef7a28 100644
--- a/games-puzzle/mures/files/mures-0.5-save.patch
+++ b/games-puzzle/mures/files/mures-0.5-save.patch
@@ -1,5 +1,5 @@
---- gi_sdl.c
-+++ gi_sdl.c
+--- a/gi_sdl.c
++++ b/gi_sdl.c
 @@ -606,6 +606,7 @@
  {
    int i,found;
@@ -19,8 +19,8 @@
        case SDLK_F1:
  	game_restart(g);
 
---- output.c
-+++ output.c
+--- a/output.c
++++ b/output.c
 @@ -215,7 +215,8 @@
  
  void output_screenshot()
diff --git a/games-puzzle/mures/files/mures-0.5-underlink.patch b/games-puzzle/mures/files/mures-0.5-underlink.patch
index 805cd0c7b35d..3acf0b0f7233 100644
--- a/games-puzzle/mures/files/mures-0.5-underlink.patch
+++ b/games-puzzle/mures/files/mures-0.5-underlink.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am.old	2011-06-21 14:39:14.404333493 +0200
-+++ src/Makefile.am	2011-06-21 14:39:30.538340283 +0200
+--- a/src/Makefile.am.old	2011-06-21 14:39:14.404333493 +0200
++++ b/src/Makefile.am	2011-06-21 14:39:30.538340283 +0200
 @@ -1,8 +1,8 @@
  bin_PROGRAMS = mures
  
diff --git a/games-puzzle/mures/mures-0.5.ebuild b/games-puzzle/mures/mures-0.5-r1.ebuild
index 10bd791881fe..36b51630c7e7 100644
--- a/games-puzzle/mures/mures-0.5.ebuild
+++ b/games-puzzle/mures/mures-0.5-r1.ebuild
@@ -1,9 +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="A clone of Sega's Chu Chu Rocket"
 HOMEPAGE="http://mures.sourceforge.net/"
@@ -18,12 +17,15 @@ DEPEND="media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-net
 	media-libs/sdl-ttf
-	opengl? ( virtual/opengl )"
+	opengl? ( virtual/opengl )
+"
 RDEPEND="${DEPEND}"
 
-dir=${GAMES_DATADIR}/${PN}
+dir="/usr/share/${PN}"
 
 src_prepare() {
+	default
+
 	# Disable OpenGL support if USE flag is not set
 	if ! use opengl ; then
 		sed -i \
@@ -37,14 +39,15 @@ src_prepare() {
 		src/maps/battle/Makefile.am \
 		|| die "sed failed"
 
-	epatch "${FILESDIR}"/${P}-underlink.patch
+	eapply "${FILESDIR}"/${P}-underlink.patch
 
+	mv configure.in configure.ac
 	eautoreconf
 
 	cd src
 
 	# Save to HOME
-	epatch "${FILESDIR}"/${P}-save.patch
+	eapply "${FILESDIR}"/${P}-save.patch
 
 	# Modify game data & scrips path
 	sed -i \
@@ -80,8 +83,8 @@ src_install() {
 	rm -f src/*/Makefile* src/*/*/Makefile* || die "removing makefiles"
 	insinto "${dir}"
 	doins -r src/{gui,images,sounds,textures,maps,*.lua}
-	dodoc README TODO ChangeLog AUTHORS
-	dogamesbin src/mures
-
-	prepgamesdirs
+	einstalldocs
+	dobin src/mures
+	newicon src/images/cat_right.png ${PN}.png
+	make_desktop_entry ${PN} "Mures"
 }
diff --git a/games-puzzle/neverball/Manifest b/games-puzzle/neverball/Manifest
index 49da1a68b249..94ed4b4480e9 100644
--- a/games-puzzle/neverball/Manifest
+++ b/games-puzzle/neverball/Manifest
@@ -1,3 +1,3 @@
 DIST neverball-1.6.0.tar.gz 37772911 BLAKE2B c9ebf9b5e87665055d3c09b93ffa71d8bf9b953b8a4b9ab7a0e7667c5521c94c80fa66c8df496066434b25319f7d22498ad19fa52e5ffee71ff4ee25188e3c41 SHA512 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787
-EBUILD neverball-1.6.0.ebuild 2200 BLAKE2B 7436f7f9bc24921a6f6d88ef8305fc161977f17ce923498f53120e21f20ed4c91250d528b40c073a2d7f8b9b3589d9681ef4b0812dff3b82638850b14eb0599d SHA512 cac7383500db0a1957f15453abd1adb7c5ea8c7dea153096d75bcbe99ca90aad1fde088054cce22a2e9f523800f4788a1fb927b0c810e91421236b436d78e251
+EBUILD neverball-1.6.0-r1.ebuild 1993 BLAKE2B dd9ab9e06fb74d8633dd07d1e3811ea6e2356daf45b3eca2ceb5497cb93cabf7f85a2d2682eef279919d47d246a526bc58adb2215fbb668dc5486921dfe0cd9d SHA512 9a2ee3c326d765dd0f29b31cfc534a8842d0bb69755eac9aa3deac32937ee568450c65c390e78ef4b542f32e6997f6bd088c39759d02fb034a5543a59dc17b6e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/neverball/neverball-1.6.0.ebuild b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
index 28d7120de14b..86b5c7b5e35b 100644
--- a/games-puzzle/neverball/neverball-1.6.0.ebuild
+++ b/games-puzzle/neverball/neverball-1.6.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 gnome2-utils games
+EAPI=6
+inherit desktop gnome2-utils
 
 DESCRIPTION="Clone of Super Monkey Ball using SDL/OpenGL"
 HOMEPAGE="http://neverball.org/"
@@ -14,20 +14,24 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 RESTRICT="test"
 
-RDEPEND="media-libs/libsdl2[sound,joystick,opengl,video]
+RDEPEND="
+	media-libs/libsdl2[sound,joystick,opengl,video]
 	media-libs/sdl2-ttf
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	virtual/jpeg:0
 	media-libs/libvorbis
 	virtual/opengl
 	dev-games/physfs
 	media-fonts/dejavu
 	media-fonts/wqy-microhei
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's:mapc:neverball-mapc:g' \
 		-e 's:MAPC:NEVERBALL-MAPC:g' \
@@ -46,20 +50,19 @@ src_compile() {
 		E_CFLAGS="${CFLAGS}" \
 		E_CXXFLAGS="${CXXFLAGS}" \
 		LOCALEDIR=/usr/share/locale \
-		DATADIR="${GAMES_DATADIR}/${PN}"
+		DATADIR="/usr/share/${PN}"
 }
 
 src_install() {
 	local font
 
-	dogamesbin ${PN}-mapc neverball neverputt
-	insinto "${GAMES_DATADIR}/${PN}"
+	dobin ${PN}-mapc neverball neverputt
+	insinto "/usr/share/${PN}"
 	doins -r data/*
-	for font in DejaVuSans-Bold.ttf wqy-microhei.ttc
-	do
-		rm -f "${D}${GAMES_DATADIR}/${PN}"/ttf/${font}
+	for font in DejaVuSans-Bold.ttf wqy-microhei.ttc; do
+		rm -f "${ED}/usr/share/${PN}"/ttf/${font}
 		dosym /usr/share/fonts/*/${font} \
-			"${GAMES_DATADIR}/${PN}"/ttf/${font}
+			"/usr/share/${PN}"/ttf/${font}
 	done
 	if [[ -d locale ]] ; then
 		insinto /usr/share
@@ -78,19 +81,13 @@ src_install() {
 	newman dist/mapc.1 neverball-mapc.6
 	make_desktop_entry neverball Neverball
 	make_desktop_entry neverputt Neverputt neverputt
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	games_pkg_postinst
-	elog "${P} will overwrite existing high-score files, so back them up if"
-	elog "you want to preserve your old scores and progress."
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
diff --git a/games-puzzle/pauker/Manifest b/games-puzzle/pauker/Manifest
index b437b9d758e2..9edccff11199 100644
--- a/games-puzzle/pauker/Manifest
+++ b/games-puzzle/pauker/Manifest
@@ -1,4 +1,4 @@
-AUX pauker_bundledjars.patch 899 BLAKE2B 78836ee00e58e24b6404ae5340c542c9ac6947e17bad55f5d983906133f03f1aa9b372288fe372d6ffdee4361f518125953a0dcd1816ab6aaff808eaec4243e5 SHA512 ed7d47165871488233bcf032bf7e93f7988a231251fa93dbf173774dcaecee1adb735930fbface4009a72912db3f811a09cb9e49a038e7c01fda9a44e8515a22
+AUX pauker_bundledjars.patch 903 BLAKE2B 944e338bf1f0b4501ae68accaf44dcb6cd0c286722ac5077ce7748e93c524ff262a4e21fcfd2a576d2dc5c5d7d5ef9e04354e11d6e0b2a4fc9a0f018daf61708 SHA512 fd6d525fb49b956bfcecaf44e8f8044251d91341844418e1980db96bcfc6e91e86ec60aa08d112a84b1fe1c40b87e0429edfdbfaa1ea100993e89eded230bf6e
 DIST pauker-1.8.src.jar 33886665 BLAKE2B 9dddd9f7e5d5dbc9e7bc18b69e708ba3a4ea67e17b513b218eb14a77094fe40ef3d404e8dc85311ee2cd4d69587625828084cfbbf1d05534c90f40948e8ef8f4 SHA512 2d329571e857a05116ba499c4bd82669f0c99a748ca375ab06e701492a814b97fcc09bbf0ae4f48c52b05c67768a14d70a4217fee9680762424c96ab7f4341ae
-EBUILD pauker-1.8.ebuild 1797 BLAKE2B d08ad0eaad6098db13bff12dd29dfdd74319006dfb4ae819117179aec543af1715193f7f84b3cdc1485cb311bb780da4581c15ae683c6632e3e9494ccd91ff14 SHA512 0717fe0cafc2f525d313be07a44ad046ad19806a1b60b6af9c7a9d1ba9852e5f835149732fbc5d224c06c00ad0cfe6b00b870dba4dfcae228c370bc20d747ce1
+EBUILD pauker-1.8-r1.ebuild 1704 BLAKE2B 51df59fb8de90a8cb03f93fbbae9e60ecc68b076eae4bab2b1a3695b716296fb1ac2828382d2ea7d8a6c553e19a588c30d240a7b373499bf9d8451f1f2dc3203 SHA512 056bfe6a4fdf2490f02a5b1681a5173b34933b29aeb8abc24e89ba4d972933e549486c10aab32f929b9058ee4f9716a7840e309de953c09a6f99a4100a6f7da2
 MISC metadata.xml 329 BLAKE2B ac3b4fc371bc34aec1c68eccb0be370cc51c1dffb14fa0b13c5e50aa3476a5e557686a10922379026eccc8d61e60133bc199c9746484cd6a5ff588dcdfe61f67 SHA512 392a3af58bf88c1cfa5ad5f3a240b7c16d2cf4a469700d3e7628917923606b69d3aa65c01d258e17d1ad362fa4f64c424e75a73f849f4fd438f97ba951df8203
diff --git a/games-puzzle/pauker/files/pauker_bundledjars.patch b/games-puzzle/pauker/files/pauker_bundledjars.patch
index 1ed79dbe4d86..bebcbd088b12 100644
--- a/games-puzzle/pauker/files/pauker_bundledjars.patch
+++ b/games-puzzle/pauker/files/pauker_bundledjars.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2008-11-24 20:24:55.000000000 +1300
-+++ build.xml	2008-11-24 20:25:33.000000000 +1300
+--- a/build.xml.orig	2008-11-24 20:24:55.000000000 +1300
++++ b/build.xml	2008-11-24 20:25:33.000000000 +1300
 @@ -88,11 +88,6 @@
               basedir="build/classes/"
               includes="pauker/**,tools/**"
diff --git a/games-puzzle/pauker/pauker-1.8.ebuild b/games-puzzle/pauker/pauker-1.8-r1.ebuild
index af0161d502ee..62c31d7abb45 100644
--- a/games-puzzle/pauker/pauker-1.8.ebuild
+++ b/games-puzzle/pauker/pauker-1.8-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2 games
+
+inherit desktop java-pkg-2 java-ant-2
 
 DESCRIPTION="A java based flashcard program"
 HOMEPAGE="http://pauker.sourceforge.net/"
@@ -14,27 +15,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEP="dev-java/browserlauncher2:1.0
-			dev-java/javahelp
-			dev-java/lucene:2.4
-			dev-java/swing-layout:1"
-RDEPEND=">=virtual/jre-1.5
-		${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-		app-arch/unzip
-		${COMMON_DEP}"
-
-S=${WORKDIR}
+COMMON_DEP="
+	dev-java/browserlauncher2:1.0
+	dev-java/javahelp
+	dev-java/lucene:2.4
+	dev-java/swing-layout:1
+"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5
+"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/unzip
+"
 
-pkg_setup() {
-	games_pkg_setup
-	java-pkg-2_pkg_setup
-}
+S="${WORKDIR}"
 
 src_prepare() {
+	default
 	find . -iname '*.jar' -delete
 
-	epatch "${FILESDIR}/${PN}_bundledjars.patch"
+	eapply "${FILESDIR}/${PN}_bundledjars.patch"
 
 	java-pkg_jar-from --into libs browserlauncher2-1.0 browserlauncher2.jar BrowserLauncher2-1_3.jar
 	java-pkg_jar-from --into libs javahelp jhall.jar
@@ -52,12 +53,12 @@ src_compile() {
 #tests cannot be build.
 
 src_install() {
-	java-pkg_jarinto "${GAMES_DATADIR}/${PN}"
+	java-pkg_jarinto "/usr/share/${PN}"
 	java-pkg_newjar "dist/${P}.jar"
 
 	java-pkg_dolauncher ${PN} \
-		-into "${GAMES_PREFIX}" \
-		--pwd "${GAMES_DATADIR}"/${PN} \
+		-into "/usr" \
+		--pwd /usr/share/${PN} \
 		--main pauker.program.gui.swing.PaukerFrame
 
 	use doc && java-pkg_dojavadoc dist/javadoc
@@ -65,5 +66,4 @@ src_install() {
 
 	newicon src/pauker/icons/repeat.png ${PN}.png
 	make_desktop_entry pauker Pauker
-	prepgamesdirs
 }
diff --git a/games-puzzle/penguzzle/Manifest b/games-puzzle/penguzzle/Manifest
index a60cea9dbefd..801accda21f6 100644
--- a/games-puzzle/penguzzle/Manifest
+++ b/games-puzzle/penguzzle/Manifest
@@ -1,4 +1,4 @@
-AUX penguzzle-1.0-tclx.patch 157 BLAKE2B df3115141109b31ce34c792a725f91ae93f606811f6ac17c5d397d10fbdf9ede6df22ae4bf5d321e44b2495bebc8091894cd30762a040c107dc95810233dbfe3 SHA512 137e0707ef1e285433b78586af18a34133d29f3b202046e1843910562d9d9d68eb7ec2019c8c1e973ed52c091da05902ef48ab3864da0e513034465941605874
+AUX penguzzle-1.0-tclx.patch 161 BLAKE2B 2b7ffa6419d44f45f17d23166bd22729e07002f85408f34036e2f9e9e197cff302c70562f39f1d1d7576a2c33a9dfc164d596078de5fd15fd132b16f9c92546c SHA512 41292cdd6da21611de72eb363e277670bb6d641a4e9651e8ebdb4d73400a389cdc51191e0c551daab575888cbe88ff6f257c080c36c71b5000f7eb7b0d59e2c8
 DIST penguzzle.zip 21542 BLAKE2B d8f7de3c4ddac7c05aef1fafd04da81a00a22f246adaa0165dd491bf818081b3f384421f7786b4353e1d889e651568d2d10e64531573bce0636824dafbb4ace8 SHA512 fc6c57ac851df7fac7d91f90ec53fa543470e9721589966023028743951090994c372ff4538092c29aee12afc28809ad6e20a6b78ae9759bad2b41fed330b743
-EBUILD penguzzle-1.0-r1.ebuild 910 BLAKE2B 3aa67ca5760f27842a9feb8c5f7d7019e552fd3bed026bfb0b362e427708fdfeeaa97d4d1107bd9fbff394b4f6ba6ff64680b999a99dbafa8deb7008f69a4fcf SHA512 1d768289b7a87919234c0993701366a2e8ba8a3277f3b377d998b3661703713d76cd99c0a93ae2acb8f63cdbf26c2b5a503f6a2a605e3e1d1a535e6fc1b7a176
+EBUILD penguzzle-1.0-r2.ebuild 989 BLAKE2B 887999e3af25af6b4a1df6557340e05379556aea0d73c596459dab65135345b19e056394060fd5d132b9d7695b63b755e0752a8f1e5a8e140c8e1fd77170b463 SHA512 42d07ab7525b902c0e67080b5a95d7fb2bc5e8720c33f476467b3c32b3c4bc18d65172915413a9ee460b66f4921b586018173fab51c7ccad66cdbd47017d9fba
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch b/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch
index d8c078de6a91..0f2ca8b8b23d 100644
--- a/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch
+++ b/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch
@@ -1,5 +1,5 @@
---- bin/penguzzle
-+++ bin/penguzzle
+--- a/bin/penguzzle
++++ b/bin/penguzzle
 @@ -1,4 +1,6 @@
 -#!/usr/bin/wishx
 +#!/usr/bin/wish
diff --git a/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild b/games-puzzle/penguzzle/penguzzle-1.0-r2.ebuild
index ed926fa4a95e..54cc98723ec2 100644
--- a/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild
+++ b/games-puzzle/penguzzle/penguzzle-1.0-r2.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="Tcl/Tk variant of the well-known 15-puzzle game"
 HOMEPAGE="http://www.naskita.com/linux/penguzzle/penguzzle.shtml"
@@ -13,34 +13,39 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-lang/tk
-	dev-tcltk/tclx"
+RDEPEND="
+	dev-lang/tk:0=
+	dev-tcltk/tclx
+"
 DEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${PN}${PV}
+S="${WORKDIR}/${PN}${PV}"
 
 src_prepare() {
+	default
 	sed -i \
-		-e "s:~/puzz/images:${GAMES_DATADIR}/${PN}:" \
+		-e "s:~/puzz/images:/usr/share/${PN}:" \
 		lib/init \
 		|| die "sed init failed"
 	sed -i \
-		-e "s:~/puzz/lib:$(games_get_libdir)/${PN}:" \
+		-e "s:~/puzz/lib:/usr/$(get_libdir)/${PN}:" \
 		bin/${PN} \
 		|| die "sed ${PN} failed"
 
-	epatch "${FILESDIR}"/${P}-tclx.patch
+	eapply "${FILESDIR}"/${P}-tclx.patch
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins images/img0.gif
 
-	insinto "$(games_get_libdir)"/${PN}
+	insinto /usr/"$(get_libdir)"/${PN}
 	doins lib/init
 
-	dogamesbin bin/${PN}
+	dobin bin/${PN}
 
-	dodoc README
-	prepgamesdirs
+	newicon images/img0.gif ${PN}.gif
+	make_desktop_entry ${PN} "Penguzzle" /usr/share/pixmaps/${PN}.gif
+
+	einstalldocs
 }
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
index 573c65874b35..5d66c15f6100 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -1,5 +1,5 @@
 AUX picpuz-2.5-build.patch 5499 BLAKE2B cb568f817502eef15695e5f1cdaad837127e6004616b63596125b3538421c51e11edafc9421b173809cc22fb166d636eb47467d23ad12b5a7446a21638e5d9ea SHA512 49486aa996419da06fa7a14ac61c89930c1ca79f97615253bc1c4a96c7bc0af405d52661e1dd4b5186cf00877cde5b698070bbb9229d50e27a1a981de03d2f11
 AUX picpuz-2.5-pthread-underlinking.patch 842 BLAKE2B c347703e5b8d069872c34b7af776ea5e5e27967683db9fa7834c876482e22dd41e36d3c16b7da31235bd0e5f5228dccf1e279be80969757a69acc8bc1b215532 SHA512 12c5d7e46d9db2312b24524c33877d9fcf2c6f94bf822d03bd24f021d91496b1759af078582311663e28c98405d274ee30179140b92e44b9ddaca4b40a05e658
 DIST picpuz-2.5.tar.gz 267452 BLAKE2B c99126cb38611ad2e7013f0108631d6d5c7a51add0927be3fe45c6225a03db655770b05cc47626d5fe80680530527dcd5acc39495be7666fe9ec6959a2e5f0ca SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386
-EBUILD picpuz-2.5.ebuild 1133 BLAKE2B 2356b372a03f93d9032c16bbc25887a09d055674af85f97297d630b3110a7f776c2f96a879917a22e1dac8d92486300b453b29283c2dce898a8eb1437b5925ed SHA512 ec7e3694901170877d62b12d451263ecbbbb4a5c045cb4c4ff8f2e57505aaf349875eba2be1b5125365bf0a1f24989a372866eb976cd82026e3279dd54b3fc0c
+EBUILD picpuz-2.5-r1.ebuild 1044 BLAKE2B eb75be02e73ea8f0c4d0faa9f062a3b8591ce1c6a388f7a92b661dd1d0274c59accc2d3c3183139554ec7e83e9538e98d18b1e7dcb0b079aa9945dd53ac0b654 SHA512 32bd76f61cd94c14bdb3f6c831896249f4b657522eff6d8a7cc7e42c05bc28584bd772d080f50c5555293dcd448068b17eef3f59d130393873a29ce9c5e1cf17
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/picpuz/picpuz-2.5.ebuild b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
index 5d20e42bd953..5da7fe0df616 100644
--- a/games-puzzle/picpuz/picpuz-2.5.ebuild
+++ b/games-puzzle/picpuz/picpuz-2.5-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 gnome2-utils games
+EAPI=6
+inherit desktop gnome2-utils
 
 DESCRIPTION="A jigsaw puzzle program"
 HOMEPAGE="http://kornelix.squarespace.com/picpuz/"
@@ -15,40 +15,37 @@ IUSE=""
 
 RDEPEND="x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-pthread-underlinking.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-pthread-underlinking.patch
+)
 
 src_compile() {
 	emake \
-		BINDIR="${GAMES_BINDIR}" \
-		DATADIR="${GAMES_DATADIR}"/${PN} \
+		BINDIR="/usr/bin" \
+		DATADIR=/usr/share/${PN} \
 		DOCDIR=/usr/share/doc/${PF}/html
 }
 
 src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin ${PN}
+	insinto /usr/share/${PN}
 	doins -r icons locales
 	doicon -s 48 icons/${PN}.png
 	make_desktop_entry ${PN} Picpuz
-	dohtml -r doc/{userguide-en.html,images}
+	HTML_DOCS="doc/userguide-en.html doc/images" einstalldocs
 	dodoc doc/{changelog,README,translations}
 	newman doc/${PN}.man ${PN}.1
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-puzzle/pipepanic/Manifest b/games-puzzle/pipepanic/Manifest
index 62da5cec01db..422d4981cf64 100644
--- a/games-puzzle/pipepanic/Manifest
+++ b/games-puzzle/pipepanic/Manifest
@@ -1,4 +1,4 @@
 AUX pipepanic-0.1.3-gentoo.patch 584 BLAKE2B 7a785fc5494f71c14d2298caa87168a52d695e3b5c450c6f1395b9dee8f911fd35e28d23db4c14b252e337b203727647a48c4113b0b6349289a7044ed3c4145f SHA512 0fef3b79063bcae38412679ce5644d8d119ba3a86b8a752234d97b7009044373f6cda8e983b53864f266e5c00203fb278c61fa44af432014b1aba5a402d41bab
 DIST pipepanic-0.1.3-source.tar.gz 232200 BLAKE2B 25a344d0a78196d8416d7da663e4400acfe010b6020c3b64764c1dcf6f07d7a434add6d5c2c607a17ca356eb67fb0c8572d72410ea8ca5df915f9802792400d9 SHA512 468f3194976c7030c2fa3d8f30eaa13cc25e0b04feeb48a5d1267d119eb991618bad14ddba0a8268e6b92f38f2a17bc5b119728b222b0ee50494807832ad2ab7
-EBUILD pipepanic-0.1.3.ebuild 915 BLAKE2B b838e0e101dc92e3679fcd8b136dc3dbc8687e3e3990f6c0f7bdfaff99932a4c79e5f52f46f4f16bce7546f34b0e1fdb2f8538fd9276823e55562dcb9a3115a2 SHA512 2a0c227ed5cf835fecc4ac3fd88e166c0a9c854f386be6263882c3b27fc5680c0f2a9337b8fdc7466b9c9286645f18ed50e91a886071e89c1065240f9e1138e4
+EBUILD pipepanic-0.1.3-r1.ebuild 869 BLAKE2B 8b4700bf2865b09dcf6f865e8cafdb5c5af4143bc986743c995042ed4b7d8f6e2e19eeb947911ef2aa557f3541656421e00aa7b8b303e7959c4c77b1eec2f5a5 SHA512 f1e1fb22f5c701a5e0a488c3610ec44f5ff540eb4e5f75d83b8b227add221b1986bcf15f2754ac430cd6045690edb958974ab12bbc94121965bab04c924543ce
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild b/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild
index 0ccc9171bcdf..bc849e724279 100644
--- a/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild
+++ b/games-puzzle/pipepanic/pipepanic-0.1.3-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 simple pipe connecting game"
 HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/"
@@ -16,26 +16,24 @@ IUSE=""
 DEPEND="media-libs/libsdl[video]"
 RDEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${P}-source
+S="${WORKDIR}/${P}-source"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	default
+	eapply "${FILESDIR}"/${P}-gentoo.patch
 	# change harcoded data paths to match the install directory
 	sed -i \
-		-e "s:/opt/QtPalmtop/share/pipepanic/:${GAMES_DATADIR}/${PN}/:" \
+		-e "s:/opt/QtPalmtop/share/pipepanic/:/usr/share/${PN}/:" \
 		main.h \
 		|| die "sed failed"
 }
 
 src_install() {
-	dogamesbin "${PN}"
+	dobin "${PN}"
 
-	insinto "${GAMES_DATADIR}/${PN}"
+	insinto "/usr/share/${PN}"
 	doins *.bmp
 	newicon PipepanicIcon64.png ${PN}.png
 	make_desktop_entry ${PN} "Pipepanic"
-
-	dodoc AUTHORS ChangeLog README
-
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-puzzle/pipewalker/Manifest b/games-puzzle/pipewalker/Manifest
index 6344de5ed5e0..50787c98da6c 100644
--- a/games-puzzle/pipewalker/Manifest
+++ b/games-puzzle/pipewalker/Manifest
@@ -1,3 +1,3 @@
 DIST pipewalker-0.9.4.tar.gz 948399 BLAKE2B 262cb373fca5aa5fd895a48d29d91e4efed5550b4798adf26bfdc869ec9153610cd04a0a0358d02909c885a41fb96f15a15ecc901b6ba95047d240d07d449685 SHA512 f4930739732164153663d11036eb2ac09447766779bc80bff4d355fe1bb764d617510ecf8d804f1ce0d81f58204b4e4049fb76246bc4e599c06c492b9c771951
-EBUILD pipewalker-0.9.4.ebuild 735 BLAKE2B 6c337547852f1e90462076643fffe7ec363566347853acc669686d25836dd4fa281c345b2fd4266e3f30c3d4ada03c99857d09af24272df43c7c72f153c8615e SHA512 b063b396d050f75719d28355b560d1b0592d133dbbe98c78fc0b10abba98228df91a025ffe5c0e77b97316a71cdecf75f6e1382984162712828e83141e7956d1
+EBUILD pipewalker-0.9.4-r1.ebuild 672 BLAKE2B f5a17e6a68d15d2290161a6abf11f319ea7ecfb43480a4fa5e02ed68e16f20453abe73b1568cc0df7a20d62ba2b17173f2cfe994be935e6fa507700c1b4f1ea3 SHA512 cf7d64489227b6c4aafd4b4b42bd3e3f1e104a55ef97b808620ec513b6c4120334019d9b3af8c370724a6aa4b1a88dd31faf6b23ef509ad3642762704a3ec94f
 MISC metadata.xml 333 BLAKE2B 79283adcb9b624e2ce653dbc467cd87eeec420841e088a45bcb4726876bb796fd370a3d6feee64bc643e940ec18b8e83cca1cf3eaced4cc8127b3548ae610678 SHA512 51d60e626855010c46bc4d9022cb7b84965eac827ec82fe2cf02db6e9f7706f9f81cb2af66fe4e4bab64963cc64b7d5d6009aa38a850ec87322fb07ac1c7f0dd
diff --git a/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild b/games-puzzle/pipewalker/pipewalker-0.9.4-r1.ebuild
index f0b06ab7c7b5..bab059bfdd7e 100644
--- a/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild
+++ b/games-puzzle/pipewalker/pipewalker-0.9.4-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="Rotating pieces puzzle game"
 HOMEPAGE="http://pipewalker.sourceforge.net/"
@@ -20,15 +20,13 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	append-flags $(sdl-config --cflags)
-	egamesconf \
-		--datadir="${GAMES_DATADIR_BASE}"
+	econf --datadir="/usr/share"
 }
 
 src_install() {
 	emake -C data DESTDIR="${D}" install
-	dogamesbin src/${PN}
+	dobin src/${PN}
 	doicon extra/${PN}.xpm
 	make_desktop_entry ${PN} PipeWalker
-	dodoc AUTHORS ChangeLog README
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
index 42f11a935d93..7b2ce8b0c062 100644
--- a/games-puzzle/quadra/Manifest
+++ b/games-puzzle/quadra/Manifest
@@ -1,4 +1,4 @@
-AUX quadra-1.2.0-format.patch 487 BLAKE2B 0b73769949523c5791e348854f16a0f4fcbe6792bdf03cc627e7957effae2bdace3b2c1f977663a21e581f1da2058a2d4e1017e95fcff96131ca8dc4a869e3bd SHA512 5445fa32a10a8cd96da756727087c7f6dcdca3a92f662764ffe790caaf498a055c02e4858c3bdcd56f1ebd57b958eec0e347f7919ca7724f2f6f12c37249c2df
+AUX quadra-1.2.0-format.patch 491 BLAKE2B 21341a7d0a6fa1556d9d79d3fa55f2cb1fc4cf6244dc8fbdc937acb9250bec258818ffd6644d1f40a5fc0db07e64555121f2d0ce5c9ef9ffeadf2da6ebe78412 SHA512 a0a05c3ced44a88d7766a0ef2053dce378df4e6cec74acc7d074a27bffc48d6c43977289e779bc526d730b9d5c8acc18c1cc46c865f3ea7de0a6226937a08ffe
 DIST quadra-1.2.0.tar.gz 5103875 BLAKE2B 7b0bce4e8be77de2e357cd14f60ebdbf3ef72f2262013954bca9a8d1a9a2833e00a0fe59f818b78603628999e7e1204c6974a5d9f74f4ea9bb288325d518744c SHA512 1c3e1020a584fa83595b7b183d5346f8e357ddef6b29c0b4a3797e2ace50c6e9ff14f132b8299ca582db739f4d699fa8ab94be93ef86e5a01389f958ce91e837
-EBUILD quadra-1.2.0.ebuild 946 BLAKE2B 87fac5ce533e59c574979ed3fd6be0dbd87d6ec7dd574b05f0b1f05ce94f369bd5b40de4899cd4cb3b0149ada9405a537997dbfe0c6da684a8e1b6fd6e4ce5cf SHA512 d8f3fe808979290a4ce891c705efced62c0c552cfaca4abe633fa6487323f3076db73811a5f7687da04d94d282e458cf332707bda422c55c100e706e2221a244
+EBUILD quadra-1.2.0-r1.ebuild 916 BLAKE2B bddd8e3f29869a7aee2994e8d78114ecfa5d07c7204cd32a38f5862476f5366dbbdbd305249f59b640b224b58f93adc8c716e1640f9a9748a7a66827a42fe658 SHA512 5242baa35a7da6dcdb6f7e6d6f4937624cb93cb08ca8ddbafc67b724ff80aa913a0af55f50a540c5d839e47ea94d760f656532ef821ed88337d097c83a2216bc
 MISC metadata.xml 329 BLAKE2B b57a9d305d40db5c2682878b7c26c6150bbcc7825c17169c9380a288b69aec71d51793dbf0071f157a8e03be1d90632d26227cffc6855982562d37b606982a1e SHA512 81750413c002a39166c0802840aac367a3b07f61a1c711bb68fdea6f8dff71f4689c24ccf75c61336f03ddea9993c45c5b869d2f3467540f4695a35da9a6438f
diff --git a/games-puzzle/quadra/files/quadra-1.2.0-format.patch b/games-puzzle/quadra/files/quadra-1.2.0-format.patch
index d9db4978290f..ca56f5b4cc00 100644
--- a/games-puzzle/quadra/files/quadra-1.2.0-format.patch
+++ b/games-puzzle/quadra/files/quadra-1.2.0-format.patch
@@ -1,5 +1,5 @@
---- source/net_list.cpp.old	2015-12-08 21:41:16.782404098 +0100
-+++ source/net_list.cpp	2015-12-08 21:41:33.153114600 +0100
+--- a/source/net_list.cpp.old	2015-12-08 21:41:16.782404098 +0100
++++ b/source/net_list.cpp	2015-12-08 21:41:33.153114600 +0100
 @@ -693,7 +693,7 @@
  				//Drawn at a total higher or equal to end_value: suspense!
  				//  or maybe timer just elapsed and the game is drawn
diff --git a/games-puzzle/quadra/quadra-1.2.0.ebuild b/games-puzzle/quadra/quadra-1.2.0-r1.ebuild
index a315a077f55d..4f77d48dc9ca 100644
--- a/games-puzzle/quadra/quadra-1.2.0.ebuild
+++ b/games-puzzle/quadra/quadra-1.2.0-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 desktop
 
 DESCRIPTION="A tetris clone with multiplayer support"
 HOMEPAGE="https://github.com/quadra-game/quadra"
@@ -13,32 +13,34 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXxf86vm
 	x11-libs/libXext
-	media-libs/libpng:0
-	sys-libs/zlib"
+	media-libs/libpng:0=
+	sys-libs/zlib
+"
 DEPEND="${RDEPEND}
 	sys-devel/bc
-	x11-proto/xextproto"
+	x11-proto/xextproto
+"
 
 src_prepare() {
+	default
 	sed -i \
 		-e "/^libgamesdir:=/s:/games:/${PN}:" \
 		-e "/^datagamesdir:=/s:/games:/${PN}:" \
 		config/config.mk.in || die
-	epatch "${FILESDIR}"/${P}-format.patch
+	eapply "${FILESDIR}"/${P}-format.patch
 }
 
 src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin ${PN}
+	insinto /usr/share/${PN}
 	doins ${PN}.res
 	doicon images/${PN}.xpm
 	make_desktop_entry ${PN} Quadra
 
-	dodoc ChangeLog NEWS README
-	dohtml help/*
-	prepgamesdirs
+	HTML_DOCS="help/*" einstalldocs
 }
diff --git a/games-puzzle/rezerwar/Manifest b/games-puzzle/rezerwar/Manifest
index a46eb1b41560..3a57c79814b9 100644
--- a/games-puzzle/rezerwar/Manifest
+++ b/games-puzzle/rezerwar/Manifest
@@ -1,3 +1,3 @@
 DIST rezerwar-0.4.2.tar.gz 4332498 BLAKE2B d1eab4137fe56ba39c81c04ab75b9b0b9dac7baaf01e861d84801aee255074c4dc0c24662aa61993af7b80f0dbe831dfef1574fd1b2686ecb8500aaa68b6c279 SHA512 0ab1b00d982a96f2fd1346ff822efc68ae0e6c14a4d190ba0e8720fb119d7750851803c1387e83b93eee9cd43e332631360a67534495c20969366c885e2297ee
-EBUILD rezerwar-0.4.2.ebuild 1098 BLAKE2B 34d37388d69ab00ac66214e1c01c6ca8ea066b23a7a540c9d206159fee35aa842f93c5bd331978a75e8f277767844a8cba0770c43a3179ba0a1a927f7180da61 SHA512 fac9f93ae7474cee8dac73ae943cf3260334c3f0f49403c170a7b201c55693551a9d4a013ad6cb95ddfd1f3898b183f239b8851c888d97177da69607a67f7aa3
+EBUILD rezerwar-0.4.2-r1.ebuild 1063 BLAKE2B 9ede59c7616f3f397e476e10fe8a9589ae38512d0f613300ec7bd35f973652b1fcc00d94c6baeeb7120033273b58bd8568179b2ac520823652349a745fbe320f SHA512 ff9bcd00ab7dde9ac9f740eafcd21921ffb3df533c4c6cb755038f40a03ac725646da5dbfb7fa301008f28c71ec2bc088a7d5b18a31b703c1672c71ea06ce0cf
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild b/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild
index ec7c6c3447a8..042921d7df86 100644
--- a/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild
+++ b/games-puzzle/rezerwar/rezerwar-0.4.2-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="Puzzle game like the known tetromino and the average pipe games"
 HOMEPAGE="http://tamentis.com/projects/rezerwar/"
@@ -18,6 +18,7 @@ DEPEND="media-libs/libsdl[sound,joystick,video]
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/check_sdl$/d' \
 		-e 's/-O2 //' \
@@ -31,11 +32,10 @@ src_prepare() {
 
 src_configure() {
 	SDLCONFIG=sdl-config \
-	TARGET_BIN="${GAMES_BINDIR}" \
+	TARGET_BIN="/usr/bin" \
 	TARGET_DOC=/usr/share/doc/${PF} \
-	TARGET_DATA="${GAMES_DATADIR}/${PN}" \
-	./configure \
-	|| die "configure failed"
+	TARGET_DATA="/usr/share/${PN}" \
+		./configure || die "configure failed"
 	sed -i \
 		-e '/TARGET_DOC/d' \
 		Makefile \
@@ -43,9 +43,8 @@ src_configure() {
 }
 
 src_install() {
-	dodir "${GAMES_BINDIR}"
+	dodir /usr/bin
 	default
 	dodoc doc/{CHANGES,README,TODO}
 	make_desktop_entry rezerwar Rezerwar
-	prepgamesdirs
 }
diff --git a/games-puzzle/scramble/Manifest b/games-puzzle/scramble/Manifest
index ea4eb6cc098a..92809aa388ea 100644
--- a/games-puzzle/scramble/Manifest
+++ b/games-puzzle/scramble/Manifest
@@ -1,3 +1,3 @@
 DIST scramble-0.9.5.tar.gz 552301 BLAKE2B 9bbdbe1551ba03dc66342eaab9b7e85356ca6fa78f2bbf7423b79a65cfe46711f0818ff41cba81a98b3888c9558692ec9879095e6353216675a869ab4544753f SHA512 ff361cefe842d6b2019a78571182fe35fc77a1332d6365211af7cf292da8532023bd565b7eed8b44545716474d441b0793253e856a1cad937f62396a5a29bd2b
-EBUILD scramble-0.9.5.ebuild 766 BLAKE2B a131c8114edbf6ee2a2299d89444e7e1460728cf43613ebb2370395ee996743169e3e642272011156fe0b508bbcb99a5816102f998c0e3834e79173e750db462 SHA512 06243a3b7d5bcb249d44b51c4752a18f56b73b9887cf7f1d63c776c7b6e45d51340c4b03ad7e4f4c2a8b8a3944f7ab66c25f8e60a66415239751946dc5b059b9
+EBUILD scramble-0.9.5-r1.ebuild 977 BLAKE2B 6bb090026f26a0c4c90ebfb542bb21d9f187fb5fe7d07a2290fefdf9725efd49d6c086c7b2a20f0737623f51aa16fd52bbe16ea5ecd5ea91b5bb9654acc6ba3c SHA512 938d635fe8e1eacbf36d1183e939278bd1cd1f16325b9c6dfc3e2b464436fb969bbb58acd7a6320362eafa1b367db1fe0d45091055227f15d375b6377f5d26db
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/scramble/scramble-0.9.5.ebuild b/games-puzzle/scramble/scramble-0.9.5-r1.ebuild
index 04c3496512b2..9158e8985e9a 100644
--- a/games-puzzle/scramble/scramble-0.9.5.ebuild
+++ b/games-puzzle/scramble/scramble-0.9.5-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 autotools flag-o-matic games
+EAPI=6
+inherit autotools desktop flag-o-matic
 
 DESCRIPTION="Create as many words as you can before the time runs out"
 HOMEPAGE="http://www.shiftygames.com/scramble/scramble.html"
@@ -13,14 +13,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.2[sound,video]
+RDEPEND="
+	>=media-libs/libsdl-1.2[sound,video]
 	>=media-libs/sdl-mixer-1.2[vorbis]
 	>=media-libs/sdl-image-1.2[png]
-	media-libs/sdl-ttf"
-RDEPEND="${DEPEND}
-	sys-apps/miscfiles"
+	media-libs/sdl-ttf
+"
+DEPEND="${RDEPEND}
+	media-libs/libpng:0
+	sys-apps/miscfiles
+"
 
 src_prepare() {
+	default
+	pngfix -q --out=pics/background-fixed.png pics/background.png
+	mv -f pics/background-fixed.png pics/background.png
 	append-cflags $(sdl-config --cflags)
 	sed -i -e 's/inline //' src/scramble.c || die
 	mv configure.{in,ac} || die
@@ -29,5 +36,6 @@ src_prepare() {
 
 src_install() {
 	default
-	prepgamesdirs
+	newicon pics/sg_icon.png ${PN}.png
+	make_desktop_entry ${PN} "Scramble"
 }
diff --git a/games-puzzle/sdl-jewels/Manifest b/games-puzzle/sdl-jewels/Manifest
index fb7924c6c453..a37e58f09e40 100644
--- a/games-puzzle/sdl-jewels/Manifest
+++ b/games-puzzle/sdl-jewels/Manifest
@@ -1,4 +1,4 @@
 AUX sdl-jewels-1.1.1-Makefile.patch 488 BLAKE2B 95eceefb92d28c8968790c7b2b3954d957bc2f59a0764efb66aea618b6db0f01272a2bf7a56a6789b601e2e76a6f96497074a8c4689e924c5f08a7bd7ebb2317 SHA512 9d83dea588f699ef09f89ed320bece1bb001ee0a1bfa4d3e4d4b8c679af9b2028d535469c078f387564b37a16ee0e76f3e9cf20a4248784bf322ac902aa03f26
 DIST SDL_jewels-1.1.1.tgz 195366 BLAKE2B 4f8e3c85b8d6cc6388846fe3783cc3fed3cf1901a57788c8ebd62473ac3f0635eaf0f3f1017a06961706ec3143f8807b8170dc0a715b570e44c66a578eb7dae3 SHA512 720f1d89384bf267e8f5441efd70fcf94bfc89ddbd0ff90b1dafc6381e83e005281fcde256ee4cd0645f2832cf9c22aed487c105d7d9cf39711c5752e12763c4
-EBUILD sdl-jewels-1.1.1.ebuild 997 BLAKE2B f2b811d1cc8e240b2f9ba4dff44cd264088114bfba1d513717806b2ecf80e2bead9dbf735fcc528245a155c2043ac45d59bd477533a19620127fe320cf819368 SHA512 4433153a1565f29ddbb9400772961960c44dc622bba03eaea69fb48c1b7d790a6c31f404b7e854441e568c2f804bcedc1635169709128827f5eaf10635f96c2f
+EBUILD sdl-jewels-1.1.1-r1.ebuild 968 BLAKE2B b2377f0968329902e5397f91d65978a933d6c8df57498165f6aca1c535907b1bb7d5faef0952232c6d71ef2c4dd099330a4fdb856a138e5dd0a7a6832d1c240e SHA512 50381f1020f1b8037ecfc9ac099e44c8850ecde13ce9aae6f5f45fe758d23b4399865dd7ea8a9470b5262d5f6b786c79463e8a6bdebfc8b5a27d52b9494545ae
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild
index 98377fdd0a72..e9f6f0422ae1 100644
--- a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild
+++ b/games-puzzle/sdl-jewels/sdl-jewels-1.1.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 vcs-clean
 
 DESCRIPTION="Swap and match 3 or more jewels in a line in order to score points"
 HOMEPAGE="http://www.linuxmotors.com/gljewel/"
@@ -14,29 +14,30 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
-DEPEND="media-libs/libsdl[opengl,video]
-	virtual/opengl"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	media-libs/libsdl[opengl,video]
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/SDL_jewels-${PV}
+S="${WORKDIR}/SDL_jewels-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-Makefile.patch"
+	default
+	eapply "${FILESDIR}/${P}-Makefile.patch"
 
 	# fix the data dir locations as it looks to be intended to run from src dir
-	sed -i -e "s|\"data\"|\"${GAMES_DATADIR}/${PN}\"|" sound.c || die
-	sed -i -e "s|data/bigfont.ppm|${GAMES_DATADIR}/${PN}/bigfont.ppm|" gljewel.c || die
+	sed -i -e "s|\"data\"|\"/usr/share/${PN}\"|" sound.c || die
+	sed -i -e "s|data/bigfont.ppm|/usr/share/${PN}/bigfont.ppm|" gljewel.c || die
 	ecvs_clean
 }
 
 src_install() {
-	dogamesbin gljewel
+	dobin gljewel
 
-	insinto "${GAMES_DATADIR}/${PN}"
+	insinto "/usr/share/${PN}"
 	doins -r data/*
 
-	dodoc ChangeLog README
-
+	einstalldocs
 	make_desktop_entry gljewel SDL_jewels
-	prepgamesdirs
 }
diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
index 0d8e652ab352..83dfaba47e5c 100644
--- a/games-puzzle/tanglet/Manifest
+++ b/games-puzzle/tanglet/Manifest
@@ -1,4 +1,4 @@
-AUX tanglet-1.3.1-datadir.patch 732 BLAKE2B 503f991ff27057e3f90e385cdb5339b0231bdfbd8c09b44714f466b16e1f35346b4a1cc04907f2befc903b7fa295ad6f079cdfb2bca0fc31b31c49d6d434c6cc SHA512 35442f4b9bfe344c7168048ccd7d0742319b6ab3078d9df13fe66455d45b31a5bb01f7e4ad05b4ba25c83046bfe1428f6a2271231130c433ceac1b18fd405414
+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.ebuild 1355 BLAKE2B b44d5450e63144394aaa48cba81a9f78c169a7a75da0d152fa864842cfd4b4e1b847608abe5abaee4982eef1006edbb406582734a6faf0d4c7109979a78a46b1 SHA512 37ec6c8bcbf789f32a62eef3db041fde244fa9a8075271b70c74700e97a969416b0e69f6d9fae285df39687e09caa0db928e25417c5e80a47efa59e96b9361d4
+EBUILD tanglet-1.3.1-r1.ebuild 1270 BLAKE2B b5015194fbe34b4c91d30f306746d0cb83a755cb2afb27258c4bf6d97ef256a4720ba7608d64f5707efa9b646010db0bb4efa0ce6d0f40851632cec231c9ba66 SHA512 02147ab848c47fda50cc81b0ecbdf32d7ca4b59322feecc13d8b937b35cfcdffe7a9819b9f3e7347e32bb4e394839c49c435048c29012ce17ac050c7423b3964
 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.3.1-datadir.patch
index 6e5b46d7c7e0..18b56ca6c1a3 100644
--- a/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch
+++ b/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch
@@ -1,5 +1,5 @@
---- src/locale_dialog.cpp.old
-+++ src/locale_dialog.cpp
+--- a/src/locale_dialog.cpp.old
++++ b/src/locale_dialog.cpp
 @@ -85,7 +85,7 @@
  	if (paths.isEmpty()) {
  		QString appdir = QCoreApplication::applicationDirPath();
@@ -9,8 +9,8 @@
  		paths.append(appdir + "/../Resources");
  	}
  	foreach (const QString& path, paths) {
---- src/main.cpp.old
-+++ src/main.cpp
+--- a/src/main.cpp.old
++++ b/src/main.cpp
 @@ -46,7 +46,7 @@
  	QString path = app.applicationDirPath();
  	QStringList paths;
diff --git a/games-puzzle/tanglet/tanglet-1.3.1.ebuild b/games-puzzle/tanglet/tanglet-1.3.1-r1.ebuild
index b640740df693..f599addb09f1 100644
--- a/games-puzzle/tanglet/tanglet-1.3.1.ebuild
+++ b/games-puzzle/tanglet/tanglet-1.3.1-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 LANGS="cs de es en fr he hu it nl ro tr uk"
 LANGSLONG="es_CL"
-inherit eutils gnome2-utils qmake-utils games
+
+inherit desktop gnome2-utils qmake-utils
 
 DESCRIPTION="A single player word finding game based on Boggle"
 HOMEPAGE="https://gottcode.org/tanglet/"
@@ -15,16 +16,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="sys-libs/zlib
+RDEPEND="
+	sys-libs/zlib
 	dev-qt/qtcore:5
 	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5"
-RDEPEND=${DEPEND}
+	dev-qt/qtgui:5
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-datadir.patch
+	default
+	eapply "${FILESDIR}"/${P}-datadir.patch
 	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
 		src/locale_dialog.cpp \
 		src/main.cpp || die
 }
@@ -34,11 +38,12 @@ src_configure() {
 }
 
 src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin ${PN}
+	insinto /usr/share/${PN}
 	doins -r data
-	#translations
-	insinto "${GAMES_DATADIR}"/${PN}/translations/
+
+	# Translations
+	insinto /usr/share/${PN}/translations/
 	for lang in ${LINGUAS};do
 		for x in ${LANGS};do
 			if [[ ${lang} == ${x} ]];then
@@ -50,21 +55,17 @@ src_install() {
 	insinto /usr/share/icons
 	doins -r icons/hicolor
 
-	dodoc ChangeLog CREDITS NEWS
-
+	einstalldocs
 	doicon icons/${PN}.xpm
 	domenu icons/${PN}.desktop
-	prepgamesdirs
 }
 
 pkg_preinst() {
 	gnome2_icon_savelist
-	games_pkg_preinst
 }
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	games_pkg_postinst
 }
 
 pkg_postrm() {
diff --git a/games-puzzle/tetrinet/Manifest b/games-puzzle/tetrinet/Manifest
index b2ac576a4e5d..b9f3f7c6f804 100644
--- a/games-puzzle/tetrinet/Manifest
+++ b/games-puzzle/tetrinet/Manifest
@@ -1,5 +1,5 @@
 AUX tetrinet-0.11-build.patch 2331 BLAKE2B a23200aff602acaf0dd6c1341a8c63b3b4d16b417478034dc46db4d90081c2910a8026d5b419e18432309ded69de64e16bcdaf4d2301767dcb1a857367eb8207 SHA512 e56a43ef53d9df84c4ba49b39ba2d77f99de1b616f9e81e105d4c49553b909f418f74cb13d431dbd658c41c99388321e0806dbeb63294817ec85f7148f2d2ae0
 AUX tetrinet-0.11-no-ipv6.patch 185 BLAKE2B 47b66d15eaf30d233a60f0c877fd03b66ad6007630c4a45c1c208cb21582add109ccfc3ca77d741214dbb5d00a4719a55556ab404420d5383e098e748f6c055b SHA512 1851623b20e2685548650d54f290a49f9572b65a2293848c0d83a6fdc1c1256ebcdd0f737b2f32f7fb4bd921aa69c17e7120cfc8acb1d8c5a97342741964890f
 DIST tetrinet-0.11.tar.bz2 38607 BLAKE2B f794660b037d2605990b775a00381279eea64a361e4b66dcb9314a3f784ce77a0cfc87cea52d183fb5553f05f95b466318b6a1e98dbd735f34618964d2d901d2 SHA512 8123a8c50a3c1b6326d3209272a60c8050afd2a9eb455814fd676d8c4de922f8b81a88df9e4825d1ff5e0c8b8a7ac46ebe9ce68994587f829e047a3d889880fa
-EBUILD tetrinet-0.11.ebuild 720 BLAKE2B 36972541417874c2dd63732f78d80ca1347995ff70fcba8f459cf86c8de4b16a315c3cf13c4faa52467558e410dea0971de6429077634d4a6d2976e30be9dcc3 SHA512 2bacb1d79759bbb46252b9b2383f7c6f301c14b6d2740749fb33a2a1dc25155957ab48a88487332530a50853fbce750ad782863251a9b177e4e4377181c2d53c
+EBUILD tetrinet-0.11-r1.ebuild 698 BLAKE2B bb5f84fad0c3940b313221d36e2079c53037ae1f57ee48eb34629fe785b9329fecb32f548cf9f097b67f4b7ee5cccc7f0dba9770740c8007652a59d6adb63a95 SHA512 c61e799893a744e1a5c14ecb2d2e8445681f632c2ee618878ed929416fb0254e8c735b26203740ed26e9ae26d8c3e76256b2187aa09ca641ebe63ecd2e626963
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tetrinet/tetrinet-0.11.ebuild b/games-puzzle/tetrinet/tetrinet-0.11-r1.ebuild
index 684b07a7833d..013dcef24a21 100644
--- a/games-puzzle/tetrinet/tetrinet-0.11.ebuild
+++ b/games-puzzle/tetrinet/tetrinet-0.11-r1.ebuild
@@ -1,10 +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
-inherit eutils flag-o-matic toolchain-funcs games
+EAPI=6
+inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="console based tetrinet inc. standalone server"
+DESCRIPTION="Console based tetrinet inc. standalone server"
 HOMEPAGE="http://tetrinet.or.cz/"
 SRC_URI="http://tetrinet.or.cz/download/${P}.tar.bz2"
 
@@ -13,12 +13,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ipv6"
 
-RDEPEND=">=sys-libs/ncurses-5:0"
+RDEPEND=">=sys-libs/ncurses-5:0="
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-no-ipv6.patch \
 		"${FILESDIR}"/${P}-build.patch
 
@@ -27,7 +29,6 @@ src_prepare() {
 }
 
 src_install() {
-	dogamesbin tetrinet tetrinet-server
+	dobin tetrinet tetrinet-server
 	dodoc README TODO tetrinet.txt
-	prepgamesdirs
 }
diff --git a/games-puzzle/textmaze/Manifest b/games-puzzle/textmaze/Manifest
index 06c39537ea42..a66fe6f1237a 100644
--- a/games-puzzle/textmaze/Manifest
+++ b/games-puzzle/textmaze/Manifest
@@ -1,3 +1,3 @@
 DIST textmaze_v1.2.tar.gz 15827 BLAKE2B df66068bef5b39f18b03d4ce9243ebaa2ddc52f58f3d5b2d8a46ff81efd188467e1a9f13ab818fc592f25dd1acaecaba80aca153b7d3900d527cb9cc1d45c034 SHA512 f6a2733049ea461f15b40eec4a414356dbfe252d859d132278d9ea8a4efcdc6753a28817529b429bad662a2042f2f7cd5cb1f2383d9ddbf773c76b80ea2af7d9
-EBUILD textmaze-1.2.ebuild 611 BLAKE2B d0447f62a6f9736b7ad4159a66fef106120af8cec793fd2322595a63af827b90ee858c570fa0f952b9d0215197d720d3392cf89f17a3f93e119cdddcd9516b24 SHA512 bd68d5089f2de2908082b58f0959d63e7a957e30f70c91248e93d8e9dc7ec791244336455ea9e1b840af3881532ce805c3f1aa97e300e3dd225cfffceafa8ab8
+EBUILD textmaze-1.2-r1.ebuild 590 BLAKE2B 987c83c64716a66b65c6f8090325fcfebba2af2b2efba21954599fd372a671516742aaa72e88b9899f59b336d40bc1062012079270e656c90ea6367f1dbffd43 SHA512 baca7e929bc639bb20ea91a7e4cd854fbd23c39847992bd3e2c4533775ec3d4d97934cc26679403bf72bc17c45071bd480c3395f0bd31237b66eeb7e355116ca
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/textmaze/textmaze-1.2.ebuild b/games-puzzle/textmaze/textmaze-1.2-r1.ebuild
index 27d3c275cccc..959e94bd77ec 100644
--- a/games-puzzle/textmaze/textmaze-1.2.ebuild
+++ b/games-puzzle/textmaze/textmaze-1.2-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=6
 
 MY_P=${PN}_v${PV}
 DESCRIPTION="An ncurses-based maze solving game written in Perl"
@@ -15,17 +14,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/Curses"
+DEPEND=""
 
-S=${WORKDIR}/TextMaze
+S="${WORKDIR}/TextMaze"
 
 src_prepare() {
+	default
 	sed -i \
 		-e "s#/usr/local/bin/perl#/usr/bin/perl#" \
 		textmaze || die
 }
 
 src_install() {
-	dogamesbin textmaze
-	dodoc CHANGES README
-	prepgamesdirs
+	dobin textmaze
+	einstalldocs
 }
diff --git a/games-puzzle/tint/Manifest b/games-puzzle/tint/Manifest
index b98e25203e15..28edb3d62d99 100644
--- a/games-puzzle/tint/Manifest
+++ b/games-puzzle/tint/Manifest
@@ -1,4 +1,4 @@
 AUX tint-0.03b-ovflfix.patch 1021 BLAKE2B e6188aff5847d05e6fa3909317d2dc054433ccd5a9dcd89a76f8e990efa182405b93ac8b06b81e58f9b12ae56a0981fedbd4c28659c6a87418b40392fcd636bc SHA512 da4d5871b46c57ee5e37f0a4b6e779c33bf7b5c45dcba281b84ccad308195d9b2498489ee22f105e6eef00274cf60757855ab9aa91a146f19159713971b828bf
 DIST tint_0.03b.tar.gz 16909 BLAKE2B 4d619b0def118f76f5d07b12f1fe6ccbe2688f3275d49c3514af9448cd74e6b199a55976fd4340dd8122f101f84a5a7be1c5e9fce6727850ed3ee4c684ec8118 SHA512 f442122248987a4f2843e0abe3ed4b3fcecbb6024aad2b486087468c84d80f94310dcf4a37a3d93a647d0abe9aaf10e7d957c88ec6314c25a9fd90d4dfc16ec1
-EBUILD tint-0.03b.ebuild 829 BLAKE2B 15e6d27648c73115e190e928a5bbe9c784cc0757dddc8104229b89c40c35d70dbb506414fdfb21e740b2f29ad663929864f5fc81ddf657455d2a720170d0c45e SHA512 e1f6d4c5131d30bbf85f50ecd5e4bd65dc7ae299150bb28c65d432129f7a8fe70b5ecc35242888df6aec4943f3f2ad86fdfa8ae5cb582bd13b57c3d8abcb9e89
+EBUILD tint-0.03b-r1.ebuild 759 BLAKE2B 71eb5ae49e191cdeba17d06f2a80f18496d1fd2c4fe7ab0e2861d2f1edf4658d0e195fb082d2344ee0b24a96b495ec4e882ddde6ff87978c3c3a5686b9e4134b SHA512 b78af49089beab3aba6cd2aeaea5fa178fb24db73c53188961eabb3e9cb1ef264f8aa0ce8927109ada319699f59e0ab89c92e92dc63b104295737dfd469cb7cf
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tint/tint-0.03b.ebuild b/games-puzzle/tint/tint-0.03b-r1.ebuild
index da85ff697b2b..4b2d9dc72843 100644
--- a/games-puzzle/tint/tint-0.03b.ebuild
+++ b/games-puzzle/tint/tint-0.03b-r1.ebuild
@@ -1,10 +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
 
-MY_P=${P/-/_}
+MY_P="${P/-/_}"
 DESCRIPTION="Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game"
 HOMEPAGE="http://oasis.frogfoot.net/code/tint/"
 SRC_URI="http://oasis.frogfoot.net/code/tint/download/${PV}/${MY_P}.tar.gz"
@@ -14,27 +13,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=sys-libs/ncurses-5.4-r1:0"
-RDEPEND=${DEPEND}
+DEPEND=">=sys-libs/ncurses-5.4-r1:0="
+RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ovflfix.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-ovflfix.patch )
 
 src_compile() {
 	emake \
 		STRIP=true \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		localstatedir="${GAMES_STATEDIR}"
+		localstatedir="/var/lib"
 }
 
 src_install() {
-	dogamesbin tint
+	dobin tint
 	doman tint.6
 	dodoc CREDITS NOTES
 	insopts -m 0664
-	insinto "${GAMES_STATEDIR}"
+	insinto /var/lib
 	doins tint.scores
-	prepgamesdirs
 }
diff --git a/games-puzzle/tod/Manifest b/games-puzzle/tod/Manifest
index a70b52a441e5..5d5da4e54316 100644
--- a/games-puzzle/tod/Manifest
+++ b/games-puzzle/tod/Manifest
@@ -1,4 +1,4 @@
-AUX tod-0-makefile.patch 332 BLAKE2B 362cce9d762fec5116fd97c10026a327e2b45650e456e8e23e4ec58a96c65ddc8451f8d9a2278fc9d37fc033f84d7f1ec481b8b963d40df82e3d118c31ffb88f SHA512 2490154631db2fc66bdd6ea9dfd8e584625b2b416395450b2e054d13d9ea5b327cbed4fcc66e6586f4746a21429ed709f05cfb8c7c6a5e171c1a001663a4d245
+AUX tod-0-makefile.patch 336 BLAKE2B 914b05d5bf298a3d60c6ac836ef45127c253859fa8b620adf5827abbc3dd3375c02eebd614ab79277bd3c52f7f383a4b4458e80d8fabd8549e4d49ca5702959f SHA512 efd342bfedacdb1dcd20d5a938a02c555c7d260bf9584a0d6d24c4aa0617df7ba8e37fdfacc5b0e0f600a2cae752e50347ba8b6992c5ba2dc22c1b62306e7438
 DIST wintod.zip 115653 BLAKE2B 9c54be567954892eabc353bf5985579ff11fcb9e00304bf92792ef787bbaccf29084c68a58faae46229856fae103c4b27c462b62c2da489bfe635d474fd564ef SHA512 8cc203d9745cc4855c58c2f9119d06a1f02e1ecb9c1cc2c1dc1f1c77e5aa0553925bdcba3d744db462bbc77f3637a42e35a579a8807c8098aa2fde7452cc30cc
-EBUILD tod-0.ebuild 730 BLAKE2B 567c5df329a6f4ba4dc89a661f23d569d0e9e7edd59f1163864e0b7f30b3e7b05de95bc89dc190d5531826a50107153631898085c5dc28a1fed515a306397e1c SHA512 722f623ec308366f1df18309245c89f24bf2afdcd2e6ef13640dc33c9d0a6428c4a3e29ecb114bd3abe35aae39195505a08da8849078c25e708ff24d3961592c
+EBUILD tod-0-r1.ebuild 748 BLAKE2B a78c2a73d87c13263a8400df1312e2c9d02972d92a2882080a6801e1a7dac7c8bd6545ce8546bcbc31d8927888b4c09a673985316d4b637fa4cbca2f33f74071 SHA512 e3b4566e211a670b1fce84958e79d95dee9af188ce73ce415976fc835f44f77639b989e3c3c8ceaf8d6e1a768bd239364a1e14ca08d19171fd57ffe01e429612
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tod/files/tod-0-makefile.patch b/games-puzzle/tod/files/tod-0-makefile.patch
index cd17d1cce42b..9783fab0c4bc 100644
--- a/games-puzzle/tod/files/tod-0-makefile.patch
+++ b/games-puzzle/tod/files/tod-0-makefile.patch
@@ -1,5 +1,5 @@
---- makefile
-+++ makefile
+--- a/makefile
++++ b/makefile
 @@ -1,8 +1,7 @@
  OBJ = hiscore rec scrctl tetanus crc allegdlg hgrcos
  HEADS = tod.h allegdlg.h crc.h hgrcos.h hiscore.h
diff --git a/games-puzzle/tod/tod-0.ebuild b/games-puzzle/tod/tod-0-r1.ebuild
index 98278d52a037..0ed9a29063f0 100644
--- a/games-puzzle/tod/tod-0.ebuild
+++ b/games-puzzle/tod/tod-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="Tetanus On Drugs simulates playing Tetris under the influence of drugs"
 HOMEPAGE="http://www.pineight.com/tod/"
@@ -15,21 +15,23 @@ IUSE=""
 
 RDEPEND="media-libs/allegro:0[X]"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
+	default
+	eapply "${FILESDIR}"/${P}-makefile.patch
 	sed -i \
-		-e "s:idltd\.dat:${GAMES_DATADIR}/${PN}/idltd.dat:" \
+		-e "s:idltd\.dat:/usr/share/${PN}/idltd.dat:" \
 		rec.c || die
 }
 
 src_install() {
-	newgamesbin tod-debug.exe tod
-	insinto "${GAMES_DATADIR}"/${PN}
+	newbin tod-debug.exe tod
+	insinto /usr/share/${PN}
 	doins idltd.dat
 	dodoc readme.txt
-	prepgamesdirs
+	make_desktop_entry ${PN} "Tetanus On Drugs"
 }
diff --git a/games-puzzle/tong/Manifest b/games-puzzle/tong/Manifest
index 8867de3739f6..d9fb526a8084 100644
--- a/games-puzzle/tong/Manifest
+++ b/games-puzzle/tong/Manifest
@@ -1,6 +1,6 @@
-AUX tong-1.2-datadir.patch 1105 BLAKE2B 7f35e44fa4fdc6096f709f898b45b705984f7d199d58edf7bd4de645983e833ef95e4d6a5334d699417c9db30209eb7f1b227f00fb8ff734ef21061a606ec3ef SHA512 68b59062fb9c5c12eb2af7a1f4cdc47cff0ef1a656323b8fe28175931984c4336e5a763b5f6df32120311d4f84bc084341e455a29f19941d6a27b076e1213c6d
-AUX tong-1.2-fps.patch 553 BLAKE2B 00fa67fad7349ca16cf7146daa1f3c5f25aecc4f4756461dcbca92be97194c9ca2e2850ea2fc8acb0609546828805fbebdb54885b0bf4829ddc39110311423bd SHA512 789be3f3742d12166e58717dec9890f9051a86ae6aca072046c6874397f6cbb0d604fc4127228ac258dceab2425777207777167e6ec3c28baa0b39324f931692
-AUX tong-1.2-makefile.patch 897 BLAKE2B 2c4312fd9dcc7fd5fbd9e36e97dfa93f4d8b46aa29f531eb438c78447bea8b6ee03b1e9f4c7f048bbe86fdb0f242aae7814f3af498a0cb51a74071a70b43f4b3 SHA512 c342f686a57def0f07dd51aa7c180108624463db5ef1defc4ac4636df74a9b754dccf5c39615f0cf2a30caf77fd20b07a8d89d337a8e19cf148ae47d44fb0731
+AUX tong-1.2-datadir.patch 1109 BLAKE2B dfc55c8bf75942e047440ec25fb6c9d51bbaa13f3a62329a6aac4ae82283cc14fe9f3f80ad11a13f563952bb0566a4f4d8aa47d72b3bdbd031b54d584ba89642 SHA512 8f35bc65273a77ed9190bdff9acaa932ae96030092023e5282bb3edd651e51fa29f52eedfbcdaf504540b5fbc67b76364b839be20e4a93dde01fee852a8dd80e
+AUX tong-1.2-fps.patch 557 BLAKE2B 5123aab67c2552c5e0b2ba4a2ad9082b24fa6276056c22c9fe97de6f1aa725c119a85cea79ea6d9e7ebb6c13e18610dd804c776000ddf3396d22e4a07af7c902 SHA512 a29b875ad777dc912c4080d339e5e00f8087322f4e0995631eb30180d2c409b9ede0d7ac6e6aab5a194fca0ca6e405685310e5b898fefd75d74e469129242c8b
+AUX tong-1.2-makefile.patch 901 BLAKE2B 7619c3b3155c1c56f239a2c529affbd3f1e1a8a5cf738a5235f1b928a065cc1aaacc5a09000a48b55f299e6130aad707e3399d2fe22937dd44de71efea1f9bab SHA512 1e15918cbb9fa98e174e2853be5c99ff369667035371cda95756b30ea246a640be22d308f86052a355f58596b676843dbb546caf8dd1aac9a66aad4cb1f7b34a
 DIST tong-1.2.tar.gz 88028070 BLAKE2B b82b5c012f5d12953a6e84dfe38921cff2f0e244c2a9ad9ef606b5ee41c2f455dbb288ddb477f4eb96471ed3dd4cb4de2a8cea9155942c51f850d263fb22ee71 SHA512 0544f489141bba37985f1ef3c316208e3e6dacdea8f8b79f37997a9489ff5c1710fd1426e02489f8adb33bf9a1511bb9a0250122fa2054ef4a6ef203c8881261
-EBUILD tong-1.2.ebuild 1043 BLAKE2B b99fab835c89f9acd5bd33c1d3be0d7baac0c6523d7397ca372bc463df703679be3f5abb161b6307a100eab4c2de03302f398c5848aadcba3644d923cc05557e SHA512 1498fd416fb64ebae386cfab8b558328009d34369e8728b5f2f27cfbadfbaab082eaff061c9c07bc7d74c9e72ce6f2e521298e36304de021b2dfcb5418b7d6a1
+EBUILD tong-1.2-r1.ebuild 1011 BLAKE2B e65ec73abd842e978831156ee44cd89fc74944f2ea2dbcc2aa0894856fbcbee2f0191544c8076fb02abb7b2daa5e7cd2f2da8e5674b6b301eb98e0a4db4e0e9b SHA512 002557b55e0e4e46feedba17eee0746300d7c0ce28b7de0c13a78f292cbf662ea7517df08e0418689d9ccf2339f1cb2d940719d1c65c123fbe6dcdea07c81c0f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tong/files/tong-1.2-datadir.patch b/games-puzzle/tong/files/tong-1.2-datadir.patch
index d0279ac3b874..92a8bb4c18a1 100644
--- a/games-puzzle/tong/files/tong-1.2-datadir.patch
+++ b/games-puzzle/tong/files/tong-1.2-datadir.patch
@@ -1,5 +1,5 @@
---- tong.cpp.orig
-+++ tong.cpp
+--- a/tong.cpp.orig
++++ b/tong.cpp
 @@ -202,7 +202,6 @@
  	Tetrad *tetrad, *nexttetrad;
  	Paddle *paddle;
diff --git a/games-puzzle/tong/files/tong-1.2-fps.patch b/games-puzzle/tong/files/tong-1.2-fps.patch
index 8ce66ebf1d31..86566646b8d6 100644
--- a/games-puzzle/tong/files/tong-1.2-fps.patch
+++ b/games-puzzle/tong/files/tong-1.2-fps.patch
@@ -1,5 +1,5 @@
---- tong.cpp.orig
-+++ tong.cpp
+--- a/tong.cpp.orig
++++ b/tong.cpp
 @@ -64,6 +64,8 @@
  
  #define DEMO_TIME           8000
diff --git a/games-puzzle/tong/files/tong-1.2-makefile.patch b/games-puzzle/tong/files/tong-1.2-makefile.patch
index 68b4547d9427..ad9b283f4785 100644
--- a/games-puzzle/tong/files/tong-1.2-makefile.patch
+++ b/games-puzzle/tong/files/tong-1.2-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig
-+++ Makefile
+--- a/Makefile.orig
++++ b/Makefile
 @@ -1,11 +1,10 @@
  # TONG! makefile, tweak as you see fit
  
diff --git a/games-puzzle/tong/tong-1.2.ebuild b/games-puzzle/tong/tong-1.2-r1.ebuild
index 9ca7ebcb55be..a16067fc57ba 100644
--- a/games-puzzle/tong/tong-1.2.ebuild
+++ b/games-puzzle/tong/tong-1.2-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="Tetris and Pong in the same place at the same time"
 HOMEPAGE="http://www.nongnu.org/tong/"
@@ -18,27 +18,27 @@ DEPEND="media-libs/libsdl[sound,joystick,video]
 	media-libs/sdl-mixer[vorbis]"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}/${P}-makefile.patch" \
 		"${FILESDIR}/${P}-fps.patch" \
 		"${FILESDIR}/${P}-datadir.patch"
 	sed -i \
-		-e "s:\"media/:\"${GAMES_DATADIR}/${PN}/media/:" \
+		-e "s:\"media/:\"/usr/share/${PN}/media/:" \
 		media.cpp option.cpp option.h pong.cpp tetris.cpp text.cpp \
 		|| die
 	cp media/icon.png "${T}/${PN}.png" || die
 }
 
 src_install() {
-	dogamesbin tong
-	dodir "${GAMES_DATADIR}/${PN}"
-	cp -r media/ "${D}/${GAMES_DATADIR}/${PN}" || die
+	dobin tong
+	dodir "/usr/share/${PN}"
+	cp -r media/ "${ED}/usr/share/${PN}" || die
 	dodoc CHANGELOG README making-of.txt CREDITS
 
 	make_desktop_entry tong TONG
 	doicon "${T}/${PN}.png"
-	prepgamesdirs
 }
diff --git a/games-puzzle/toppler/Manifest b/games-puzzle/toppler/Manifest
index bf3360d1f416..280337638895 100644
--- a/games-puzzle/toppler/Manifest
+++ b/games-puzzle/toppler/Manifest
@@ -1,4 +1,4 @@
 AUX toppler-1.1.6-gentoo.patch 2004 BLAKE2B cc1221d33b4cf30bda597c4b95e669aa6c4ba7698669e5a762a89a4d8a5f8c637c81d07c47c22e7f0f85f96e9bd40f7da7e8c0be937ed28ec11c863e6604863f SHA512 0fc2d8eb7200c0c4e4986e0f53298d8a7b49f8be0d46bf2dc370e145a4ff39f7342874b5d80a18f703f7d134fd59274a72679afa7317f94609469042942dbfb4
 DIST toppler-1.1.6.tar.gz 2117137 BLAKE2B 1cff164e71924786d109a0c3f36ade3df8251872d454cb86d25b6f95553473dd10d5bc0f90fa0a3c43bcebfb6f3ef105ddf0d77f974282d65d0c510176b04ac9 SHA512 e0f6b7b72e38ba3402ba3608116fb51bf36cad129fb5591db62489829f4ed1ec49a4a3b7b1db4aaa34cd1561ee5228d91577f550aad2d55520ccefdff9bda9e9
-EBUILD toppler-1.1.6.ebuild 637 BLAKE2B 0d8fef33aa9bc5eadcaa289ab1cac44b059d3eb6934fd4ff62792a8bec5faa0a19596d93af38c467f543970f94f81973605db00b6801ca558d105d6906c251dc SHA512 432ae9a7bf3238a8369fb9e8d4f34bd2218634a8baee4b2bf01d72f1e2a58146aa2336116f8885ed2b2f37578705e1ef943b1cd4fe60300d051cc75b9baec2fa
+EBUILD toppler-1.1.6-r1.ebuild 558 BLAKE2B af00a1ff59f976c81fcb7c27be2cc1b9a2c1111fa569a5a2243a760572c6743fef0cf169755cda011a1b6c7ee0d941a82a391a699245310d3fca89e1fd2c2308 SHA512 199e0ce86bbdaf9689dd519b68de170e372dc9d8b38d6e1880fd6fbb11f94a615698f8cda31dcc6ec9806fd7a5fa3aee9a0812ffd9811415e8d77baf2e8c6dad
 MISC metadata.xml 330 BLAKE2B 924a2ff052635a1a394488cd20e1f1db9660abe63852e044d6da76f514475f472ad4221b750fdf12a8bfdfa1fbb219d957a0a0201bf4c53d262521e351595404 SHA512 68e3d67a21f67e1c0ede15141c8002156029bed457e521cdb532ae6524dff1e2bfe00b205a515ff816d61b953aca3c0ed5c9400a9a69cb44a859bd59c2394a62
diff --git a/games-puzzle/toppler/toppler-1.1.6.ebuild b/games-puzzle/toppler/toppler-1.1.6-r1.ebuild
index 311b799d69ce..98307d76c751 100644
--- a/games-puzzle/toppler/toppler-1.1.6.ebuild
+++ b/games-puzzle/toppler/toppler-1.1.6-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 eutils games
+EAPI=6
 
 DESCRIPTION="Reimplementation of Nebulous using SDL"
 HOMEPAGE="http://toppler.sourceforge.net/"
@@ -13,21 +12,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND="media-libs/libsdl[video]
+RDEPEND="
+	media-libs/libsdl[video]
 	media-libs/sdl-mixer[vorbis]
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
-	egamesconf $(use_enable nls)
-}
-
-src_install() {
-	default
-	prepgamesdirs
+	econf $(use_enable nls)
 }
diff --git a/games-puzzle/torrent/Manifest b/games-puzzle/torrent/Manifest
index c101e9ab6ae6..3f062ba19334 100644
--- a/games-puzzle/torrent/Manifest
+++ b/games-puzzle/torrent/Manifest
@@ -1,3 +1,3 @@
 DIST torrent-0.8.2.tar.gz 555686 BLAKE2B 17834483730fc9e4771899fed12b687568502e857e1f00355174944c2bf21a10065a762af801df556eead7248c74883c98e7732a2c5a6f377c88605024764ba8 SHA512 da7fbb21252a76fcd41c0b22ae4c0835e2fcabc4da5ce60ad04880c3fb633b6aaa951532ac0ce69d93f03b7608e4b110a23ed6f9f8839d053cd4a0d9500d1692
-EBUILD torrent-0.8.2.ebuild 699 BLAKE2B 04e5ba0dd10038f85d8406b3fafed1587dd331a0968478df5a4012dd2ab96a636c8010f58e9179f8cd79934a8091cf38383488402f6e199d2ca0090a131db33d SHA512 6bddc2ffa49d08d21aa8941705625cbdf2403405bbf4347fec5202546f4595c36efbeb1014ed4dd17f149583d102498dbbe7556857bbc6806e4db1adc5df8573
+EBUILD torrent-0.8.2-r1.ebuild 775 BLAKE2B 8619a1abb32de986396aede59561a6ab48c3aea9f519eace238d4adbd4994452d390c74569cefeb95ee08ce618a01917a77c7689869af593df926f9ad066cadb SHA512 87028937ce1e635c1999861052bf2ec465df90583e5f20444f978c5cb583d57c265e1618598ed3c801b5fd2479b8b1ca40c28abdfda9d6e6ff0274fdf74a3bdc
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/torrent/torrent-0.8.2.ebuild b/games-puzzle/torrent/torrent-0.8.2-r1.ebuild
index 44b959583284..76d28a5eee3a 100644
--- a/games-puzzle/torrent/torrent-0.8.2.ebuild
+++ b/games-puzzle/torrent/torrent-0.8.2-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 games
+EAPI=6
+inherit desktop
 
 DESCRIPTION="Match rising tiles before reaching the top to score as many points as possible"
 HOMEPAGE="http://www.shiftygames.com/torrent/torrent.html"
@@ -13,13 +13,16 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.2.4
+RDEPEND="
+	>=media-libs/libsdl-1.2.4
 	>=media-libs/sdl-mixer-1.2
 	>=media-libs/sdl-image-1.2
-	media-libs/sdl-ttf"
-RDEPEND="${DEPEND}"
+	media-libs/sdl-ttf
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's/inline void SE_CheckEvents/void SE_CheckEvents/' \
 		src/torrent.c \
@@ -28,5 +31,6 @@ src_prepare() {
 
 src_install() {
 	default
-	prepgamesdirs
+	newicon pics/sg_icon.png ${PN}.png
+	make_desktop_entry ${PN} Torrent ${PN}
 }
diff --git a/games-puzzle/wakkabox/Manifest b/games-puzzle/wakkabox/Manifest
index af1c853dba0f..83dc8213be69 100644
--- a/games-puzzle/wakkabox/Manifest
+++ b/games-puzzle/wakkabox/Manifest
@@ -1,4 +1,4 @@
-AUX wakkabox-1.1.0-gentoo.patch 1756 BLAKE2B 657d28a91c6863edbefcbcd4716e052a52f0032f2f0c90c62b5f571e39c17880a30957f7d0b9c92d3572c94e61545a96c7f7f7e4f3bf693b427624679de52371 SHA512 63bc980bc88fcaefbea76e93ccd6e8c4628a005a0b3166c78f90a905892c64de52b75b99bd05d715f86d5b2db0f3500aa95b2a5003e59549957115d1832c9ff9
+AUX wakkabox-1.1.0-gentoo.patch 1768 BLAKE2B 57fc63581b1fecaf579fc70cee8a693c4c55a27c19afe85442e3a36b5d7fcf693dba91ff4cf52ab5f21813f15250abc3352930c333636780f0ff9c478b255c32 SHA512 28c261d77372ffad9815dc6d40118595d7896bafb352237ce708f028ac50ae0530d5a61f75ece36c35ec7f041da9979c9cfa37c19dae1e83ef9ddb34ffa4bf94
 DIST wakkabox-1.1.0.tar.gz 158231 BLAKE2B f756cf98135591dbae60f00a4e85f4286204f0206196b032c2ac547ae5f1259a4b228f673aed047a8848a6500abaccc0ea69f8eb47e1950309fadc9738e684da SHA512 a97fcf382c3703fa59d6c2159397cb795b698d2a28253a7e60690b24b3d72b4950b9a7c569600bac0dc637b9d9a52577a45944036518cf5e79c601b377a092be
-EBUILD wakkabox-1.1.0.ebuild 519 BLAKE2B 95cba201296a06da83b48bf9f13cc6f31d7a89aa7bdf2696bc5b09d0b877b9078054c405da68ae6461e970abdd9929686212ae42d57f2842db0941050794e3bd SHA512 b81c994e305e6b39eb0a7c66713f250d4873e927130f0d6021f5ce2c5d2afa4cf838f94169ec4e604ecf790ef5548b8b30af7eaf5c2723c820db49778f3e90a2
+EBUILD wakkabox-1.1.0-r1.ebuild 613 BLAKE2B ac2beb4615cbb105771f47ad5a719acb72dab76cf9a440422fb2aa86392c1c745f7e3476050055b3234e283feef0daa5a718b4c9235adffbf8a78bfbc8307c21 SHA512 98d132cf9f39b470f20accdaa35fefb3b558776bc362e923b350cfa78c82b7914876b877e64f9b72bfccd4f35be507d3f01ab944a3274dd5557ab6e6c49bd800
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch b/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch
index 0be83307fa91..ad82efaeab94 100644
--- a/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch
+++ b/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch
@@ -1,5 +1,5 @@
---- configure.ac.old	2015-02-26 23:25:34.146334845 +0100
-+++ configure.ac	2015-02-26 23:25:47.978312858 +0100
+--- a/configure.ac.old	2015-02-26 23:25:34.146334845 +0100
++++ b/configure.ac	2015-02-26 23:25:47.978312858 +0100
 @@ -17,6 +17,7 @@
  CFLAGS="$CFLAGS $SDL_CFLAGS"
 -LIBS="$LIBS $SDL_LIBS"
@@ -10,16 +10,16 @@
 +AC_SUBST(LIBS)
  
  AC_OUTPUT(	Makefile  )
---- configure.ac.old	2015-02-26 23:33:25.801552821 +0100
-+++ configure.ac	2015-02-26 23:33:47.509542361 +0100
+--- a/configure.ac.old	2015-02-26 23:33:25.801552821 +0100
++++ b/configure.ac	2015-02-26 23:33:47.509542361 +0100
 @@ -1,4 +1,4 @@
 -AC_INIT( wakkabox.c )
 +AC_INIT([[wakkabox.c]])
  AC_CANONICAL_HOST
  AC_CANONICAL_TARGET
  
---- wakkabox.c.old	2015-02-26 23:43:26.146386413 +0100
-+++ wakkabox.c	2015-02-26 23:44:39.647389816 +0100
+--- a/wakkabox.c.old	2015-02-26 23:43:26.146386413 +0100
++++ b/wakkabox.c	2015-02-26 23:44:39.647389816 +0100
 @@ -249,22 +249,22 @@
  	printf("Loading bmp files from %s...", DATADIR);
  	
diff --git a/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild b/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild
index 44b16ff42ace..a04dd8404b70 100644
--- a/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild
+++ b/games-puzzle/wakkabox/wakkabox-1.1.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 autotools games
+EAPI=6
+inherit autotools desktop
 
 DESCRIPTION="A simple block-pushing game"
 HOMEPAGE="http://kenn.frap.net/wakkabox/"
@@ -10,19 +10,21 @@ SRC_URI="http://kenn.frap.net/wakkabox/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.0.1"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	default
+	eapply "${FILESDIR}"/${P}-gentoo.patch
 	rm aclocal.m4
 	eautoreconf
 }
 
 src_install() {
 	default
-	prepgamesdirs
+	newicon bigblock.bmp ${PN}.bmp
+	make_desktop_entry ${PN} "Wakkabox" /usr/share/pixmaps/${PN}.bmp
 }
diff --git a/games-puzzle/wizznic/Manifest b/games-puzzle/wizznic/Manifest
index a3b685748799..2aa86cf8fdde 100644
--- a/games-puzzle/wizznic/Manifest
+++ b/games-puzzle/wizznic/Manifest
@@ -1,3 +1,3 @@
 DIST Wizznic_src_build_369.tar.bz2 38118227 BLAKE2B 2d48a53ab715a25b7f1b2c4e8c01935084cd44a99e1a6ded6c421f507f55961e8ebe5df6ea2b912c1be8ee8a82285376673114f3af0c1df9ec0ae1042e2f6145 SHA512 61c6ced873403bbd14e8c376321ae0c92a7333bb59409615de1e1305da3e4b3cb023af36e002d732877fd1371a322796df3e4050e5afe699e03f01039d7f7ead
-EBUILD wizznic-369.ebuild 1061 BLAKE2B 165f264625ba2a20193eeb4c203ee7868124df4e34a6107f7de182d4f649255c0bcff6c3420d24e397b466b07e8554d863b1271535e671a0b355d6098001eff1 SHA512 cfeffc87dd67ab7b241fc2f57e80d81ba9f06484ce22011ea702e67de21490cf4f3155de00c84097adeb17856e15f4c3f15b0a876986cfa1a0de9e1ca4713eba
+EBUILD wizznic-369-r1.ebuild 1028 BLAKE2B d8c5b4150ce087542cab468dcacf1e3788be43132a1c23427011b67128e77d27fc25a44ccc50610f941da6b18d1d4f9da90d8d3e4c4d4e11fdfb26eee9a451c6 SHA512 a5154526ffd4a6074c8274874f9168fbfa8c9fdf332badf4ef3652902d57ac829f10fb752a221f1805071abd3f45f99b01ba5275b22240ab99a50b458a986054
 MISC metadata.xml 330 BLAKE2B d5c884b078e412a6a8b74af3337c2e21226fca735a3c9400adf0335ab1f0251f911c0c2014ca6975e1bdb45683395056ab323d1f615decfcc3fb748797349cc3 SHA512 3cce7ff11dff9f3552a3e073a0ceb96d1032e9c87347554fb74b2a313a2f0a24774fe94debd1caef26cc0d57e051ff0fd616203f0e0bdae425bc1af834010580
diff --git a/games-puzzle/wizznic/wizznic-369.ebuild b/games-puzzle/wizznic/wizznic-369-r1.ebuild
index 1b4906e0f35c..ca391dbb54d0 100644
--- a/games-puzzle/wizznic/wizznic-369.ebuild
+++ b/games-puzzle/wizznic/wizznic-369-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 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="Block-clearing puzzle game"
 HOMEPAGE="http://wizznic.org/"
@@ -17,11 +17,12 @@ DEPEND="media-libs/libsdl[sound,joystick,opengl,video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
 	virtual/opengl"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/Wizznic_src_build_${PV}
+S="${WORKDIR}/Wizznic_src_build_${PV}"
 
 src_prepare() {
+	default
 	sed \
 		-e '/^\(CC\|LD\|STRIP\)/d' \
 		-e 's/(LD)/(CC)/g' \
@@ -31,19 +32,18 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		DATADIR="${GAMES_DATADIR}/${PN}/" \
-		BINDIR="${GAMES_BINDIR}" \
+		DATADIR="/usr/share/${PN}/" \
+		BINDIR="/usr/bin" \
 		STRIP=true
 }
 
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		DATADIR="${GAMES_DATADIR}/${PN}/" \
-		BINDIR="${GAMES_BINDIR}" \
+		DATADIR="/usr/share/${PN}/" \
+		BINDIR="/usr/bin" \
 		install
 	dodoc doc/{changelog.txt,credits.txt,media-licenses.txt,ports.txt,readme.txt}
 	newicon data/wmicon.png ${PN}.png
 	make_desktop_entry wizznic "Wizznic!"
-	prepgamesdirs
 }
diff --git a/games-puzzle/world-of-goo-demo/Manifest b/games-puzzle/world-of-goo-demo/Manifest
index fc56ccd87d8c..881e359439be 100644
--- a/games-puzzle/world-of-goo-demo/Manifest
+++ b/games-puzzle/world-of-goo-demo/Manifest
@@ -1,3 +1,3 @@
 DIST WorldOfGooDemo.1.41.tar.gz 34729052 BLAKE2B 02700d337d3aa1daa436bd418131c7c01565244aab303eb239b59b0e437f1e40441b1879de48ade44e6b1c0842c043b4ef40e07809539db9fcacb37204c2092c SHA512 5dcaf7cdacedf0df92133284c4781e1d4ad14abbeddd623a35e59129fc5c1cbb3782d570ac83bc6201f3212c15195e5ca637400839e87fe95edddc5ca671077a
-EBUILD world-of-goo-demo-1.41-r1.ebuild 1402 BLAKE2B 53ece07cdf511a9aeab66e1a1ff15de232528bbef6591a65cd6a98ed9c6b308803eb390410c4eb90e800b71b60dc93fd0c5b39aba992040bb2a8785dbf3c9c44 SHA512 da8df2898b27c6a7575270da59c28cec6b35f807d61984f53a9879c4c1dca47dfb3b4ff5507f42571610bf61cd2b026f95173b89982b8d3bc82bfc9b46bb4231
+EBUILD world-of-goo-demo-1.41-r2.ebuild 1387 BLAKE2B 19d73315026e60bf1f64a926d3c27cc11e588f9f351ce0e5660e6f4790ca32ddf33bb4abbcdbb86cd808343172be204e8f34ca60d4319175699c92c48ed97b50 SHA512 1a46f38c0ca78ccb05df9468c75bb9bab3b81ec51de3b72efda63da1220e4d4b17de069ed13065a0822d3891ab2da13c9d91788be3ad759c3ffc085f1d8392b6
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild
index 1d4185bd9b4e..6e16ab61c1cd 100644
--- a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild
+++ b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.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 eutils
 
 DESCRIPTION="A puzzle game with a strong emphasis on physics"
 HOMEPAGE="http://2dboy.com/"
@@ -21,19 +21,23 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch strip"
 
-RDEPEND="media-libs/libsdl[sound,opengl,video]
+RDEPEND="
+	media-libs/libsdl[sound,opengl,video]
 	media-libs/sdl-mixer[vorbis]
 	sys-libs/glibc
 	virtual/opengl
 	virtual/glu
-	>=sys-devel/gcc-3.4"
+	>=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"
+QA_PREBUILT="
+	${dir:1}/${MY_PN%Demo}.bin32
+	${dir:1}/${MY_PN%Demo}.bin64
+"
 
 pkg_nofetch() {
 	if [[ ${PN} == *-demo ]] ; then
@@ -48,7 +52,7 @@ src_install() {
 	exeinto "${dir}"
 	doexe ${MY_PN%Demo}*
 
-	games_make_wrapper ${PN} "${dir}"/${MY_PN%Demo}
+	make_wrapper ${PN} "${dir}"/${MY_PN%Demo}
 
 	insinto "${dir}"
 	doins -r icons properties res
@@ -61,7 +65,5 @@ src_install() {
 	fi
 
 	dodoc linux-issues.txt
-	dohtml readme.html
-
-	prepgamesdirs
+	HTML_DOCS="readme.html" einstalldocs
 }
diff --git a/games-puzzle/xblockout/Manifest b/games-puzzle/xblockout/Manifest
index 466404f69a93..668a714270f9 100644
--- a/games-puzzle/xblockout/Manifest
+++ b/games-puzzle/xblockout/Manifest
@@ -1,4 +1,4 @@
-AUX xblockout-1.1.6-font.patch 1531 BLAKE2B 6ce245f406ddbbf1b1354fd185e34cce0d307ec42db7c19297e0bebd9bc955236b783343e04bbe5d4834161d47cb37989a335c6ddb520ec6f4846a1c85e42d29 SHA512 adfc6ad87048c4c021e8989886011c8dfa8736778ac12fefacbbffc114272f4a5ee60a997f35d817d22bbd9eb348c7e40701bd25bc1cf0d5924add71fc77e450
+AUX xblockout-1.1.6-font.patch 1535 BLAKE2B 5ae0fffb0d04c69123bb0c1098bcbaf2053551530d9f7f6f001ae693d4826148d16f4793009c83b286a7c9df8669e507145e39f2c7aa6bf4638ddc1e97bab15b SHA512 f74245e8d97859fa692c82f69657a77d31e84f249b5d29e23b16f072d596e85a51800f4af4578ba194151a6d0c5b577bad7a40a95d0477f31d2ae8147bec585d
 DIST xbl-1.1.6.tar.gz 136504 BLAKE2B 253c4a950def66abaef3547596b569542ea0dcd180fa5e81a7cb581d9dc23b2038b39c1059ddd36cfc89275ef3fb2a25d174ada71ab1818e408818613559a33e SHA512 96bf0460863698136a61b43260feed0e90e7ca5b6613d54c8ca98f51557a3d235597eeab46141cd6771aa0bf4fe019c5e4291dd826338e186cc905e3837531e0
-EBUILD xblockout-1.1.6.ebuild 1129 BLAKE2B 02366ea6ec6430a7d2072529a3b2d0d415d0e9f7d4bb846a5422573de7ae90a20ab93030c89a9e967eaeabbeefb2e037831129f523331696afad9c0f21dccae3 SHA512 e808fb73d89f1aa8be9e132211bb227db372952c982b63331f65faaf32632fd3a6f792292fb957cd2951b2e4104ea5e8cc1c7eb88fbac743331727ae2ae80ab9
+EBUILD xblockout-1.1.6-r1.ebuild 1216 BLAKE2B 1fbed71ba49c6a5851d9934faec162692cd77250d9bf61e42cb663685b56df055ced6c7f3d0fdc776c7e8ce4595ee396a435b063f6488f1c2c848906bbab36b2 SHA512 ddc6e41fbe580d99d48dbe69407720b5dd50fdaca6ad9fe149b5d8c141373b880654f2a7dac98e1e143adaa15845eddfde52349b87128613b647253048dc7134
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
index bb0302963bdc..1e007494e93e 100644
--- a/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
+++ b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
@@ -1,5 +1,5 @@
---- initmenu.c.old	2008-10-27 23:23:43.000000000 +0100
-+++ initmenu.c	2008-10-27 23:22:52.000000000 +0100
+--- a/initmenu.c.old	2008-10-27 23:23:43.000000000 +0100
++++ b/initmenu.c	2008-10-27 23:22:52.000000000 +0100
 @@ -408,19 +408,17 @@
    XCharStruct overall_return ;
  
diff --git a/games-puzzle/xblockout/xblockout-1.1.6.ebuild b/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild
index bbb076fd9603..71a44a6d8c39 100644
--- a/games-puzzle/xblockout/xblockout-1.1.6.ebuild
+++ b/games-puzzle/xblockout/xblockout-1.1.6-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 autotools flag-o-matic eutils games
+EAPI=6
+inherit autotools desktop flag-o-matic
 
 DESCRIPTION="X Window block dropping game in 3 Dimension"
 HOMEPAGE="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/"
@@ -13,14 +13,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/xbl-${PV}
+S="${WORKDIR}/xbl-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-font.patch
+	default
+	eapply "${FILESDIR}"/${P}-font.patch
 	sed -i \
 		-e '/^CC/d' \
 		-e 's:-lm:-lm -lX11:' \
@@ -29,26 +32,29 @@ src_prepare() {
 		Makefile.in || die
 	# Don't know about other archs. --slarti
 	use amd64 && filter-flags "-fweb"
+
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
 src_compile() {
 	emake \
 		USE_SETGID= \
-		SCOREDIR="${GAMES_DATADIR}/${PN}" \
-		RESOURCEDIR="${GAMES_DATADIR}/${PN}" \
+		SCOREDIR="/usr/share/${PN}" \
+		RESOURCEDIR="/usr/share/${PN}" \
 		LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
-	newgamesbin bl xbl
+	newbin bl xbl
 
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	newins Xbl.ad Xbl
 
 	newman xbl.man xbl.6
 	dodoc README xbl-README
-	dohtml *.html *.gif
-	make_desktop_entry xbl XBlockOut
-	prepgamesdirs
+	HTML_DOCS="*.html *.gif" einstalldocs
+
+	newicon xbl-game.gif ${PN}.gif
+	make_desktop_entry xbl XBlockOut /usr/share/pixmaps/${PN}.gif
 }
diff --git a/games-puzzle/xpired/Manifest b/games-puzzle/xpired/Manifest
index 8d08ca670f4e..613f64a1d90e 100644
--- a/games-puzzle/xpired/Manifest
+++ b/games-puzzle/xpired/Manifest
@@ -1,4 +1,4 @@
 AUX xpired-1.22-ldflags.patch 868 BLAKE2B 8230de4bfae81985ed37abb2c3810df680c64957411c0fa77c83d60581a373f2c85674bcbb5d4fd6070108981d76f6f2802fc5b191cdd8aa606f3f21df48d791 SHA512 81987d60466c459a98ac03b8f4bdf8da7c6004a716a83051b58ec35657ab3a93672305ff9a8edcf9e056784919c9ea235f81c71176bf6d4b75d5dabc72b1b7f9
 DIST xpired-1.22-linux_source.tar.gz 478593 BLAKE2B 54ee871017e39bd599a1e5e13df282d309d4ef9c91c7bf1e6eab31cd83d5f2bb4d31d9c08df091796d9f61f55eb0d54e9745b8162f9e9116eeac98d7c49b0f9d SHA512 08e506e6206be9346bde083a9cdd25a890c0100826a7fb2b515b60180cfd0b885712261db2e7a5d589078c0b74f2b9ad659b39d9378cb3dc92af111ab499ee10
-EBUILD xpired-1.22.ebuild 905 BLAKE2B cfefe5e00fce0c14aae9d310bb85f165e4efaa42ae05b1d87783ae495304bdcd6b1ed426e5877f6d776e1a5b7914baaad66c8b56249f1c4d51a2c2e92a27f382 SHA512 cf66cd05421aaaf834c84027b1a71688a3e306e6db828a707bec280bd26b19ffe45f70c759ba5336b7db4a9c2b63180136365966c128b5802c9832f908a00d34
+EBUILD xpired-1.22-r1.ebuild 867 BLAKE2B 7b8889364640262e543f705428f4032bd8e0906f7e59bc0027b9de59cfaa2fd55584159e659bb5a5f6be24ed5e800e764ef15118eb0fdafffed14dd0f09a2225 SHA512 f656f9466e29e94ea267c5f7e996d6732d7076fe7fb1779a2be0551eac0f49b57950bcdf13240872ee871cf9b9655542002c6b3742058abc3f3f70adb28bb719
 MISC metadata.xml 329 BLAKE2B 7c524c47d197b0205ef4fb908c0546932d08eedaf250445b796b7da70d100dd72bdbd82b6ef1cc551622046af5c0ee6d7b53db64bd6cfc14389a7d739f44d9d8 SHA512 457c612953cc30db620e0315c75ecb20619ee537692e0a871d0c60e8cedaa547bc9e50eb922bf995eb68bde526c641e901d3bfc9d88a097263f5bd90c68f257e
diff --git a/games-puzzle/xpired/xpired-1.22.ebuild b/games-puzzle/xpired/xpired-1.22-r1.ebuild
index 8c27e559e753..8ea6b7243bf8 100644
--- a/games-puzzle/xpired/xpired-1.22.ebuild
+++ b/games-puzzle/xpired/xpired-1.22-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 Sokoban-styled puzzle game with lots more action"
 HOMEPAGE="http://xpired.sourceforge.net"
@@ -16,27 +16,27 @@ IUSE=""
 DEPEND="media-libs/sdl-gfx
 	media-libs/sdl-image[jpeg]
 	media-libs/sdl-mixer[mod]"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/src
+S="${WORKDIR}/src"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
 
 src_compile() {
 	emake \
-		PREFIX=/usr/games \
-		SHARE_PREFIX=/usr/share/games/xpired
+		PREFIX=/usr \
+		SHARE_PREFIX=/usr/share/xpired
 }
 
 src_install() {
 	emake \
-		PREFIX="${D}/usr/games" \
-		SHARE_PREFIX="${D}/usr/share/games/${PN}" \
+		PREFIX="${D}/usr" \
+		SHARE_PREFIX="${D}/usr/share/${PN}" \
 		install
+
 	newicon img/icon.bmp ${PN}.bmp
 	make_desktop_entry xpired Xpired /usr/share/pixmaps/${PN}.bmp
 	make_desktop_entry xpiredit "Xpired Level Editor"
-	prepgamesdirs
+
+	einstalldocs
 }
diff --git a/games-puzzle/xtris/Manifest b/games-puzzle/xtris/Manifest
index 9774ce215910..38c01d834c8a 100644
--- a/games-puzzle/xtris/Manifest
+++ b/games-puzzle/xtris/Manifest
@@ -1,4 +1,4 @@
 AUX xtris.xpm 1403 BLAKE2B dc765e15dfc0cc49837cfbadfa3fe0ad33aef0e88921e906e89f9af8f778c700508b5a451d835d77bca64094d5a0b6e7f1bce941f6a42b6bf00e089fea7167b7 SHA512 1956a02d844b517df41a5cc82e236a04ec9609849c4d7b097af5bbb4b03c1e16bc8d6f0491c6cb1c8920bec578beab07381b15cee468079c5e474c80c07d30a3
 DIST xtris-1.15.tar.gz 52130 BLAKE2B 3f39f4208b678be85064fd08cbaabc7a170f559e115d59a8ba50524520b106b6fba5b7a4af7424154032d6b83365bfbb932a3424b6ac03ab32aac49c7afbdb67 SHA512 a5d5c32a7e1650561464f0fda08c7040ca0061e59b374359894e7f181a2e9dfece7f6bee6ed82295779f3e4ac8e7a607c668c31eeb017d6b641c1fe09dea4791
-EBUILD xtris-1.15.ebuild 783 BLAKE2B 593828a6e0693e1682d326327c9da012675047d9a3865367bf524260aea5d58f5a7fdbf6b8d355b64acc7fe3b916dd3a069f1d692e57ef547cf1697d2d89c10d SHA512 0c452297111a2096e38b22f1c07205da81d26e3419c2ab6448f4d1d62bc0fc6cb5cfab2b1a57c87a2c90b7eb987da13fe3640a09951e83f5d820350c25244537
+EBUILD xtris-1.15-r1.ebuild 751 BLAKE2B be3f924189ee3375f3e5939821f1274369cfe64cbab77a83d212e201c7a4a7967ec0c024b3016b77d551419d86d6a4514ec33a3352693e03cd5ca9e30fbcefd3 SHA512 891464e2e0e152eaf7461452be8591a68ec3daa6b5b68da3778fdf534bccb183f75d3c048127dadc3cf318ee960e68fb2c6d44b770e132e6a7861aab275f3fd2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xtris/xtris-1.15.ebuild b/games-puzzle/xtris/xtris-1.15-r1.ebuild
index cec22aef2e45..1c863a9b1d17 100644
--- a/games-puzzle/xtris/xtris-1.15.ebuild
+++ b/games-puzzle/xtris/xtris-1.15-r1.ebuild
@@ -1,10 +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
-inherit eutils toolchain-funcs games
+inherit desktop toolchain-funcs
 
-DESCRIPTION="a networked Tetris-like game"
+DESCRIPTION="A networked Tetris-like game"
 HOMEPAGE="http://www.iagora.com/~espel/xtris/xtris.html"
 SRC_URI="http://www.iagora.com/~espel/xtris/${P}.tar.gz"
 
@@ -16,22 +16,21 @@ IUSE=""
 DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_compile() {
 	emake \
 		CC=$(tc-getCC) \
-		BINDIR="${GAMES_BINDIR}" \
+		BINDIR=/usr/bin \
 		MANDIR=/usr/share/man \
 		CFLAGS="${CFLAGS}" \
 		EXTRALIBS="${LDFLAGS}"
 }
 
 src_install() {
-	dogamesbin xtris xtserv xtbot
+	dobin xtris xtserv xtbot
 	doicon "${FILESDIR}"/${PN}.xpm
 	make_desktop_entry ${PN} xtris ${PN}
 	doman xtris.6 xtserv.6 xtbot.6
 	dodoc ChangeLog PROTOCOL README
-	prepgamesdirs
 }
diff --git a/games-puzzle/zaz/Manifest b/games-puzzle/zaz/Manifest
index c3345e1fe58f..a1d94c298b34 100644
--- a/games-puzzle/zaz/Manifest
+++ b/games-puzzle/zaz/Manifest
@@ -1,4 +1,4 @@
 AUX zaz-1.0.0-build.patch 402 BLAKE2B 1f34e5961fee645ba6c55239d0795f7988bc2b3e0ee1da2ca3033f68d145d94ecc3894072bb8ac38802b6fd5cc3d8011ae5bde545dafd3b4133d73381b95a1f1 SHA512 4c7b8659407295b1a2003ecfe74f57dad73964666920a1f25fab87518fc6fb4f74285f051bf5df81c205faea5054908fb6da8e427d79ed4cd91f82212be2daa6
 DIST zaz-1.0.0.tar.bz2 25170073 BLAKE2B 6502b880a024dec356e7a1f8dfd29f7353d5de07e08a2de7480db32fec5af17adb9210e4f0b3c17f2b27a6977ae3647d7458d5d21dacff66c2085801fda45985 SHA512 8383732aefb1f83623af35c85fc90e0468ca15e2ffb5577d22a5a1b1c60154d3829c58c04bba675c49a7e4b4d14b6fec920c67c6a820a927d2ab5f80b5d694cb
-EBUILD zaz-1.0.0.ebuild 1186 BLAKE2B d7d08274316c14714ceff8761d947f493a9ff6b492b2d306b4974d85946baed8429735ff2de8264f79338a995a0845e121b2aa2e37befc9822d4da793c1a2ca7 SHA512 2ed3e2667b7783a41db0582665aa78ad237bcc8a2e04badddac13c8591608f839c045aeee44299291bdab4685c4cb98dd401a98e59465453859010154d57c1e0
+EBUILD zaz-1.0.0-r1.ebuild 1104 BLAKE2B b3a625b95df5abc7de588d49b78da79da8fa5df4272026e115fa79f6c611c458cf8887afe0d40073bdde16c5e20ececde1ea819e9b5ca3b86cac9ec82965f3f6 SHA512 6cd2843a7fda0ec2ff34c6618ba924ab30fd3ad0bf84bd6c095f50857a7e7a2805e1a648f2c0add6fb77d96905bdfc6b2fecd6ef0334f031efde3757feb898ec
 MISC metadata.xml 326 BLAKE2B 962f166dc4d93ffdf146a76d3e45bb96284a47bb845755e1f7450d2de5ad662abb1a2d63c21ad4e23e5e8cc16a8a2d9fa36503049262205666168c5486d86ff6 SHA512 c96c9c7a3ff21d49bcaf2418c5c21e2f83070d2d148d8a8faaeb790ca3dbc522ecab9d28a1df884e5e47543fb8067ce538e6ba62c04da8f43e6f6241cb0134ba
diff --git a/games-puzzle/zaz/zaz-1.0.0.ebuild b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
index 002808730c0e..1ea20bafcd65 100644
--- a/games-puzzle/zaz/zaz-1.0.0.ebuild
+++ b/games-puzzle/zaz/zaz-1.0.0-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 autotools flag-o-matic eutils games
+EAPI=6
+inherit autotools flag-o-matic
 
 DESCRIPTION="A puzzle game where the player has to arrange balls in triplets"
 HOMEPAGE="https://sourceforge.net/projects/zaz/"
@@ -13,23 +13,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	virtual/glu
 	media-libs/libsdl[X,sound,video]
 	media-libs/sdl-image[jpeg,png]
 	media-libs/libvorbis
 	media-libs/libtheora
 	media-libs/ftgl
-	virtual/libintl"
+	virtual/libintl
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 src_prepare() {
+	default
 	local x=/usr/share/gettext/po/Makefile.in.in
 	[[ -e $x ]] && cp -f $x po/ #336119
 
-	epatch "${FILESDIR}"/${P}-build.patch
+	eapply "${FILESDIR}"/${P}-build.patch
 	eautoreconf
 }
 
@@ -37,15 +41,9 @@ src_configure() {
 	append-libs -lvorbis
 	append-cflags $(pkg-config sdl --cflags)
 	append-cxxflags $(pkg-config sdl --cflags)
-	egamesconf \
-		--disable-dependency-tracking \
+	econf \
 		--with-applicationdir=/usr/share/applications \
 		--with-icondir=/usr/share/pixmaps \
 		--localedir=/usr/share/locale \
 		$(use_enable nls)
 }
-
-src_install() {
-	default
-	prepgamesdirs
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-02 14:13:35 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-02 14:13:35 +0100
commit	7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (patch)
tree	bac2a67fb24ac0836147fe370d30e1610ae1845d /games-puzzle
parent	2f8db31405fac68eea6f7257d58529243815033b (diff)