gentoo resync : 02.05.2018

19 files changed, 109 insertions, 129 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 6f7a9e0e6a88..528cbb0afbbd 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/bass/Manifest b/games-rpg/bass/Manifest
index eb5f1fdf0696..41e1a22e01a4 100644
--- a/games-rpg/bass/Manifest
+++ b/games-rpg/bass/Manifest
@@ -1,5 +1,5 @@
 AUX scummvmGetLang.sh 358 BLAKE2B 9d3490611c16757979cc57901d178e616e9739cfc80bad26a9b2150610c3555159854e8b42446f570e33accd26f215b1b5be9b05f7eca1d37b64fb6703a2bfb5 SHA512 9fc219a8096f0aa0182d752fb362796bacd3837b7368e1132c570d28757f316393163088b790b386211cf9a17cf21302cba0812940afd927e0123b10ad2cd23d
-DIST bass-cd-1.2.zip 69377781 BLAKE2B 7eb59b78eda2ab1385f742189f420706aac3364dabb9263729341d1973e93b27c0509e7d22b5eb3a228400a398a82cc074adb9a601e93cfa7d7dca1f51e9d68e SHA512 ff896e723b4dbf2cc52851ee1260c1006aa285b768a727974719d63509bdac1c65be9ea565eb037d5e9e1c8fd8fd76a8c04776bcde46616ca9ccce18ea498d64
+DIST BASS-Floppy-1.3.zip 7675813 BLAKE2B dbe6e110c4901ba6f1b055208b796b71ef1ab879a0266273765c8f9544065715e0535f41ecaa1cde7e02499ac5e90624eb5a42d1b82dbeee52ddba90bd1dcdd9 SHA512 d220f84448b50e1464329e204f876acc4a9eda24b319577ed74aec8e1a0316e2df268f8768ac9267b90a29a857b010bdae71e2f3c77428987f299bec3dc1ce15
 DIST bass.png 27613 BLAKE2B 1bc440055d4cfd3115e3b2768f5b88fa49eaed3f3d957b436e1e0df236fb0bc968ced18962ff9833962a1ab8a8b544e57ea10c679eb6d434c633f27956fdc489 SHA512 c0f62257f025970f51f32a7f3284cf117a091d40bbcd6c7503e8f0e8e98954cf96e35a04a4e633a04a721ff01beb7a6e0f4c883e286e477c3e065d411db4c87e
-EBUILD bass-1.2-r1.ebuild 913 BLAKE2B 0f4d2ba0477ade9bb51efe8a501f4265e9dd200a8d1a5cb7cb06d15a2bbf70f0e6cb1d0e8bfa2f42e9f2dd7939f306a4724e4f2b585d9a36a801afaa32f0daf7 SHA512 92cd863a4fa5fe11ddd4ea1a5e6b6ee2677f73a926774ee4f7eb6aeb1fa927abf2a5cc16f5d2ced8c109dff7d15aa2bc906f3093843d67f5a3e5bea9242dfa78
+EBUILD bass-1.3.ebuild 881 BLAKE2B 3c2d8e1087f23b318561942517baf20c741af2a0967ebf6c8077a80f463f7967a7563dab361a0e7463a14e118f163ff3b06934e8630b077137fb1f5e23071bcf SHA512 ef3ec8e97db581584c41ee1289afbfec81bc1be6931d51b4d2d98ef0d3afafb2ad2afc4f14ce4ac1220ae30274b771f9d8bbf8ad2fd82a8f2f37be17c96c78b2
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/bass/bass-1.2-r1.ebuild b/games-rpg/bass/bass-1.3.ebuild
index 1e217f1dd025..4ca16f0ae141 100644
--- a/games-rpg/bass/bass-1.2-r1.ebuild
+++ b/games-rpg/bass/bass-1.3.ebuild
@@ -1,13 +1,13 @@
-# 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 eutils
 
 DESCRIPTION="Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future"
 #HOMEPAGE="http://www.revgames.com/_display.php?id=16"
 HOMEPAGE="https://en.wikipedia.org/wiki/Beneath_a_Steel_Sky"
-SRC_URI="mirror://sourceforge/scummvm/bass-cd-${PV}.zip
+SRC_URI="http://downloads.sourceforge.net/scummvm/BASS-Floppy-${PV}.zip
 	mirror://gentoo/${PN}.png"
 
 LICENSE="bass"
@@ -17,17 +17,17 @@ IUSE=""
 
 RDEPEND=">=games-engines/scummvm-0.5.0"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+"
 
-S=${WORKDIR}/bass-cd-${PV}
+S="${WORKDIR}/"
 
 src_install() {
-	games_make_wrapper bass "scummvm -f -p \"${GAMES_DATADIR}/${PN}\" -q\$(scummvmGetLang.sh) sky" .
-	dogamesbin "${FILESDIR}"/scummvmGetLang.sh
-	insinto "${GAMES_DATADIR}"/${PN}
+	make_wrapper bass "scummvm -f -p \"/usr/share/${PN}\" -q\$(scummvmGetLang.sh) sky" .
+	dobin "${FILESDIR}"/scummvmGetLang.sh
+	insinto /usr/share/${PN}
 	doins sky.*
 	dodoc readme.txt
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} "Beneath a Steel Sky"
-	prepgamesdirs
 }
diff --git a/games-rpg/draci-historie/Manifest b/games-rpg/draci-historie/Manifest
index 81072f95ac87..3297aa114340 100644
--- a/games-rpg/draci-historie/Manifest
+++ b/games-rpg/draci-historie/Manifest
@@ -2,5 +2,5 @@ DIST dh-cz-2012.zip 29293879 BLAKE2B 5f8d4199de6f418d041c409bbc25b383021721b062b
 DIST dh-de-2012.zip 3316443 BLAKE2B 99a495be5d2add5e6f375904d249bda06f556e5e8ede4b33348d6ee46778de15b704016f9b498ca5b68ad678b3f2bd572034c37bc7dde2dfcd9d46ef2f4b242a SHA512 088f372e8de59cb52555a70cb7918ec14bb4abbb712a3867b40ce9eef80dc3f03b6c28402b9e0c9ee7e02f1938ee5f140abc02aef801716e38af84d66dafd5aa
 DIST dh-en-2012.zip 3310860 BLAKE2B 22c8dc8102f5f1d984a760d51fd8f7f028cca6a28b1a4e0f459c44eec68255e3ecd526ef80426b57f2137c33f6a5ba0d16b2c760b42a67413c2ffa3cec9ec648 SHA512 a9b5ff15305c961f288fdf915f56ca204a2ebe5370dcf56c20a0057cf721c45445a20479a39fe1f5443e79e7c95bd5771abef2115396c418442d2e5e400ce10a
 DIST dh-pl-2012.zip 36041498 BLAKE2B 29f6daeac610aa83f4df4a7698d19540f7c97d3a019a66078e784492010891860fa6af9b3151457c0aefeeb5eb3f90b8336693a1367b64e97592e017a7e9f247 SHA512 627f85a14362e032e00ed36275df696b6a468965734db7c8bb459d689b548c05033fe387ffee9855a83fe634f14b98a5c5ea51aefdf169c7243e9282fa1c19a5
-EBUILD draci-historie-2012.ebuild 2444 BLAKE2B f81975789015da2d5d5ab330f1e67754d6d79f2330d026045c48168b1df835c812d2107954a2423d469eea638a5788fe8d21944cb11ccf347942cdaf510c6f2d SHA512 e0d28703f6ed02bf243385427d994b6268a669349c985ffcb0f5d0dac3961fde7d98678d058805b03979d34626a584af826f3ed339a9dd309a7d752f9ec515b2
+EBUILD draci-historie-2012-r1.ebuild 2395 BLAKE2B 322d37e2d3d677b42414b795d2b5beffad501e53e48c340bfbb1e096a3d60c09e85e673849681a318f09b222bf94094463d5d2063e5fdf14865e0ed57ab619d0 SHA512 26666cb7445d33fb241bca6d2e82fbc1407aab7664ce37ae5fb86910e8ed6a7ffff32cec0ba899fff4d40ca3ecfbf2f8513c750ec37bd6112c8b86b685c74ef3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/draci-historie/draci-historie-2012.ebuild b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
index 4b04995622b4..8998b3837a2a 100644
--- a/games-rpg/draci-historie/draci-historie-2012.ebuild
+++ b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit unpacker eutils games
+EAPI=6
+inherit eutils unpacker
 
 DESCRIPTION="Bert the little dragon searches for his father"
 HOMEPAGE="http://www.ucw.cz/draci-historie/index-en.html"
 BASE_URL="http://www.ucw.cz/draci-historie/binary/dh"
-SRC_URI="l10n_cs? ( ${BASE_URL}-cz-${PV}.zip )
+SRC_URI="
+	l10n_cs? ( ${BASE_URL}-cz-${PV}.zip )
 	l10n_de? ( ${BASE_URL}-de-${PV}.zip )
 	l10n_en? ( ${BASE_URL}-en-${PV}.zip )
 	l10n_pl? ( ${BASE_URL}-pl-${PV}.zip )
-	!l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( ${BASE_URL}-en-${PV}.zip ) ) ) )"
+	!l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( ${BASE_URL}-en-${PV}.zip ) ) ) )
+"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,7 +23,7 @@ IUSE="l10n_cs l10n_de l10n_en l10n_pl"
 RDEPEND=">=games-engines/scummvm-1.1"
 DEPEND="$(unpacker_src_uri_depends)"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_unpack() {
 	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
@@ -47,30 +49,31 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
 	rm -f *.{bat,exe,ins} readme.* || die
 }
 
 src_install() {
 	newicon bert.ico draci-historie.ico
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	for lingua in $(find * -type d); do
 		doins -r ${lingua}
 	done
 	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
-		games_make_wrapper draci-historie-en "scummvm -f -p \"${GAMES_DATADIR}/${PN}/en\" draci" .
+		make_wrapper draci-historie-en "scummvm -f -p \"/usr/share/${PN}/en\" draci" .
 		make_desktop_entry ${PN}-en "Dračí Historie (English)" /usr/share/pixmaps/draci-historie.ico
 	fi
 	if use l10n_cs ; then
-		games_make_wrapper draci-historie-cs "scummvm -f -p \"${GAMES_DATADIR}/${PN}/cs\" draci" .
+		make_wrapper draci-historie-cs "scummvm -f -p \"/usr/share/${PN}/cs\" draci" .
 		make_desktop_entry ${PN}-cs "Dračí Historie (Čeština)" /usr/share/pixmaps/draci-historie.ico
 	fi
 	if use l10n_de ; then
-		games_make_wrapper draci-historie-de "scummvm -f -p \"${GAMES_DATADIR}/${PN}/de\" draci" .
+		make_wrapper draci-historie-de "scummvm -f -p \"/usr/share/${PN}/de\" draci" .
 		make_desktop_entry ${PN}-de "Dračí Historie (Deutsch)"  /usr/share/pixmaps/draci-historie.ico
 	fi
 	if use l10n_pl ; then
-		games_make_wrapper draci-historie-pl "scummvm -f -p \"${GAMES_DATADIR}/${PN}/pl\" draci" .
+		make_wrapper draci-historie-pl "scummvm -f -p \"/usr/share/${PN}/pl\" draci" .
 		make_desktop_entry ${PN}-pl "Dračí Historie (Polski)"  /usr/share/pixmaps/draci-historie.ico
 	fi
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-rpg/drascula/Manifest b/games-rpg/drascula/Manifest
index ab1fab396c66..d66ed6751284 100644
--- a/games-rpg/drascula/Manifest
+++ b/games-rpg/drascula/Manifest
@@ -1,6 +1,7 @@
 DIST drascula-1.0.zip 32842993 BLAKE2B 5033e8e5f66f74c2b049a1246c62dd33b7b32c3d088575a8d031bc505cd3356c0b364efa9308c99e26e524dc58913cad7cc09424ac6ad30fff38175f952a0151 SHA512 74ca773264e1ed611456b230d6265dade8d745a3adb736f3d6583d43ed6820a25f481ec65612b31d4b3076418f6bc696c82fa0f5085ec43edc91761e95361d11
-DIST drascula-1.5.0.dat 219267 BLAKE2B 1216bef8ef51e559a6d2a67c2a79c1f60613cf0f01d084864dbff10711d86512f01f69175ade2872fae8e0191ce45d3e0132259d84aac8598c6ff1490152c05b SHA512 0d788887f0cbe95f7008920d7929831d928497040ae0a2e2869c677363b693aafcf839df20ae192ec4a902f98a95771c9c45d3ec63c5a4bb1961e5f56d20fc53
+DIST drascula-2.0.0.dat 219527 BLAKE2B 362cb71aa5c7ec7a391a9e371f7adbfeef7c3d015db562e613ebc5513d0d8661af6880549424c9fff0dde25e8fe3a82bc4658e0bd47eb6b65c071fff0dce9983 SHA512 b57cdde7f686d54b3dd669dc5737e0046c3f38a31c4f78cde1b51dc7dc3a28193a95d5364629716998f958b7c43ed45bdcd0bc32f94ca718e7882d16fea2c015
 DIST drascula-audio-2.0.zip 36531704 BLAKE2B c3426f9c10e1ab5931b6474c1ba5b13a38267db5c8a8b8663e6a9bbea95751d50f4829dc427d962110ec4b0b093f2c5b59a73ca15aedd73c9ceaf1b3b158ec82 SHA512 09018bcfa062e720db6af7b38fa582f1b3674a25e7bb323d894ad767f8bcd449739fc592a10d848f6cac90a8bb51b5148c5c39558f70d29e2a5116b0b196274e
 DIST drascula-int-1.1.zip 34855203 BLAKE2B b37f6ed68d3ef6cc70915d68178a0359ae39e9d2a020f84573e8e905ec4fa946ad9328479590d5510f0b03ec5a422a4204ffd3fb6294711ea7b68f0f19899151 SHA512 f8127d09e19dec9abf75b9129792c67f3d36ea80fa69c70eeaa536f7a76f8f29072c21f041a0f9467d595f214392541c09c7a75caca0318e8d1b587db9d099cf
-EBUILD drascula-1.0-r2.ebuild 1736 BLAKE2B 8b12b51e3f292c156ade6dfd292d16f160be846864f540192599e0ae4e085e70f93a537a9ed57ed7c1ef719e7339d6da581ad7b7a4786c8be73375a6897279c3 SHA512 440e955b69a70676ce24f002e0420cc1c2256121c12aed04ac347dd7d82524091b3a5a364df5545a0a8fa1dd311e4276d9accdddb99cd4b468ae58b729234003
+DIST drascula.png 34525 BLAKE2B 1d529b02f08079921ab1021a3012fbef89fd4e9e4933727cdf96c5ce52bc3837d3f636e7b32f33cb92d027cbc330d4fc9280202a6b970821741eb8a44a905346 SHA512 e49fc17cad986b8fa42bd5ede30a1b1ef264182a476168d5c197a31d484555552e824f103b9456898940c68c2f0d751f4c2782a7a95ea92c62e3daec1dd1f52a
+EBUILD drascula-1.0-r3.ebuild 1811 BLAKE2B 44b0bf84c4b5dfc0f525ed56e74b3f07ad8348a3317d4b3dcc3c4d880b94f31e907146042c40a1c3ab02447b0cc130b2e9ee613cd1a914327259f1737ebea165 SHA512 1a75811d70d6df3635eb40f138dd5d3ad9acd66fbc183e82b2193262953df84403669b8e4f1f5275234e956a68df1571a6ed4361d605291948cf487634311a47
 MISC metadata.xml 473 BLAKE2B 5c14edc9041dd442f8cdde7cb168b024495d7b5e1ac12438bfb47d4dd533ca7280fe51c6d6dba950e14aa96bca40973faa7a4580f067985afef04202ed4c9374 SHA512 4e247fb0a866b080da09b521cdfa1d8eaf3463e4cc62199dc58f22eec49f41c3843f71981b0f41a0ebbda98f9fd6e02f3a15e63a8b445266630324dbfecbda91
diff --git a/games-rpg/drascula/drascula-1.0-r2.ebuild b/games-rpg/drascula/drascula-1.0-r3.ebuild
index e8fcaed673bc..f058ca3b8da3 100644
--- a/games-rpg/drascula/drascula-1.0-r2.ebuild
+++ b/games-rpg/drascula/drascula-1.0-r3.ebuild
@@ -1,18 +1,20 @@
-# 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 eutils
 
-INT_PV=1.1
+INT_PV="1.1"
 INT_URI="mirror://sourceforge/scummvm/drascula-int-${INT_PV}.zip"
-DAT_PV=1.5.0
-AUD_PV=2.0
+DAT_PV="2.0.0"
+AUD_PV="2.0"
+
 DESCRIPTION="Drascula: The Vampire Strikes Back"
 HOMEPAGE="http://www.alcachofasoft.com/"
 SRC_URI="mirror://sourceforge/scummvm/drascula-${PV}.zip
-	https://github.com/scummvm/scummvm/raw/v1.5.0/dists/engine-data/drascula.dat -> drascula-${DAT_PV}.dat
+	https://github.com/scummvm/scummvm/raw/v${DAT_PV}/dists/engine-data/drascula.dat -> drascula-${DAT_PV}.dat
 	sound? ( mirror://sourceforge/scummvm/drascula-audio-${AUD_PV}.zip )
+	https://salsa.debian.org/games-team/drascula/raw/master/debian/icons/drascula.png
 	l10n_es? ( ${INT_URI} )
 	l10n_de? ( ${INT_URI} )
 	l10n_fr? ( ${INT_URI} )
@@ -26,9 +28,10 @@ RESTRICT="mirror"
 
 RDEPEND=">=games-engines/scummvm-0.13.1"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_unpack() {
 	if use l10n_es || use l10n_de || use l10n_fr || use l10n_it; then
@@ -43,21 +46,20 @@ src_unpack() {
 src_install() {
 	local lang
 
-	games_make_wrapper ${PN} "scummvm -f -p \"${GAMES_DATADIR}/${PN}\" drascula" .
-	for lang in es de fr it
-	do
+	make_wrapper ${PN} "scummvm -f -p \"/usr/share/${PN}\" drascula" .
+	for lang in es de fr it; do
 		if use l10n_${lang} ; then
-			games_make_wrapper ${PN}-${lang} "scummvm -q ${lang} -f -p \"${GAMES_DATADIR}/${PN}\" drascula" .
+			make_wrapper ${PN}-${lang} "scummvm -q ${lang} -f -p \"/usr/share/${PN}\" drascula" .
 			make_desktop_entry ${PN}-${lang} "Drascula: The Vampire Strikes Back (${lang})" ${PN}
 		fi
 	done
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	find . -name "P*.*" -execdir doins '{}' +
 	newins "${DISTDIR}"/drascula-${DAT_PV}.dat drascula.dat
 	if use sound; then
 		doins audio/*
 	fi
 	dodoc readme.txt drascula.doc
+	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} "Drascula: The Vampire Strikes Back"
-	prepgamesdirs
 }
diff --git a/games-rpg/dreamweb/Manifest b/games-rpg/dreamweb/Manifest
index aa845f0ccb34..7e3925a11c7a 100644
--- a/games-rpg/dreamweb/Manifest
+++ b/games-rpg/dreamweb/Manifest
@@ -6,5 +6,5 @@ DIST dreamweb-cd-it-1.1.zip 225726238 BLAKE2B 9f796895b3cf34db4086726044b1688bac
 DIST dreamweb-cd-uk-1.1.zip 226067188 BLAKE2B b0309fb48158256d676198e46d2b7c689ec816baccf4140c0da4bb103c043e0864a1df7f58b2b3a7b754127fe6b1297e971d7e5a0a51ff0c2a88355ec6664208 SHA512 5e3c11f06ab0518a18cf1feffbc7b016363bc258e6e4d282bbdb5aa88f9540d5fdc10e4d59571d626aeab61a4ab6c4266620c73b2944b9c6963c1e5b66eecd9d
 DIST dreamweb-cd-us-1.1.zip 226360597 BLAKE2B 68825cf5683a321aec70e498e2b611d93384e38952468d1c006136ceb4bebd74156baa006c291da29513da5e71b4f4a25e9fc28a29b1057830357e2ecd0a0359 SHA512 cca33b2f4fd373eb0bc6d12df9ad3ba8417e0fd27cc09e1e0a3201ab4567ddeea127529aa1d1742060225888870c892f8dc983078017c5ae9253b6e028171cb8
 DIST dreamweb-manuals-en-highres.zip 186406397 BLAKE2B c394c32e0caaa1251461cd688348d8be9b57c792190cd84991a9a47915ea313456659d72a9db7fdb9f09b4f71e0d9ea932f702eb5cd4f67390992a64328d0c2e SHA512 a67d3eadeb2ea7579d23315cd9c9fbb31d9e7aa88fdd3c4bc8656801e4b064ad94356167cfbf0ee6e18ad02316297dad0d07616b34080aae68467868de421305
-EBUILD dreamweb-1.1.ebuild 3573 BLAKE2B 839324d51949b4e2531093587da8fa5af38871a7a0fb9037bcab912566727b9f18ad94218e18a72714a6b492c676f5f68cffb7a1196dd16a5ea2c47f06562d71 SHA512 446dff8a8821b9c2bba76fb15a0551eea7eb668bca5e28767aa512d67bede3f01236da9f3b101c1c35fce3d15b907b3cd14b33192c5a08055db3d90c4e48e966
+EBUILD dreamweb-1.1-r1.ebuild 3483 BLAKE2B e2a4dd527ee2cc93b46c963d495c58a9c6d03537fd982d9fdcc998c2e533607fea16d65d7c59b3723dfb8c18361db6259c904318ac597205f721242c2b3a65ae SHA512 955fea59c2099d8b7fb69ace195b62d3e97af542c12b0134f0d29ac4075462e1c0f6566f3ae30faa7d79badb824b3dca133970b3c99cacd8381bae1e6ea94863
 MISC metadata.xml 459 BLAKE2B f764c68b92e4614c49c37cee671b5b69ed25eb3938f4d6efdc1061ff34f2a12d1dd896f2dd9ac9ba91e7cbfa5c77aab9c6437b0ec1d685a930dbe7ca6b96823c SHA512 06373bf69e200ed3a6b86bb7f914147c26ea4d4b00f3592b3235917d878e45ed2b86f33136057a64471bdc711cdc5740a35f80b39a92e7fbe55304d8c98c1474
diff --git a/games-rpg/dreamweb/dreamweb-1.1.ebuild b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
index 60c9c8118bf0..c685cb39ad41 100644
--- a/games-rpg/dreamweb/dreamweb-1.1.ebuild
+++ b/games-rpg/dreamweb/dreamweb-1.1-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 unpacker eutils games
+EAPI=6
+inherit unpacker eutils
 
 DESCRIPTION="Top-down adventure game set in a gritty futuristic/dystopian city"
 HOMEPAGE="http://wiki.scummvm.org/index.php/Dreamweb"
@@ -25,7 +25,7 @@ IUSE="doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it"
 RDEPEND=">=games-engines/scummvm-1.7[flac]"
 DEPEND="$(unpacker_src_uri_depends)"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_unpack() {
 	if use l10n_de ; then
@@ -67,43 +67,43 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
 	rm -rf */license.txt */*.EXE || die
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	newicon "${DISTDIR}"/cat-dreamweb.png dreamweb.png
 	if use l10n_de ; then
 		doins -r de
-		games_make_wrapper dreamweb-de "scummvm -f -p \"${GAMES_DATADIR}/${PN}/de\" dreamweb" .
+		make_wrapper dreamweb-de "scummvm -f -p \"/usr/share/${PN}/de\" dreamweb" .
 		make_desktop_entry ${PN}-de "Dreamweb (Deutsch)" dreamweb
 	fi
 	if use l10n_en || ( ! use l10n_de && ! use l10n_en && ! use l10n_en-GB && \
 			! use l10n_es && ! use l10n_fr && ! use l10n_it ) ; then
 		doins -r en_US
-		games_make_wrapper dreamweb-en_US "scummvm -f -p \"${GAMES_DATADIR}/${PN}/en_US\" dreamweb" .
+		make_wrapper dreamweb-en_US "scummvm -f -p \"/usr/share/${PN}/en_US\" dreamweb" .
 		make_desktop_entry ${PN}-en_US "Dreamweb (US English)" dreamweb
 	fi
 	if use l10n_en-GB ; then
 		doins -r en_GB
-		games_make_wrapper dreamweb-en_GB "scummvm -f -p \"${GAMES_DATADIR}/${PN}/en_GB\" dreamweb" .
+		make_wrapper dreamweb-en_GB "scummvm -f -p \"/usr/share/${PN}/en_GB\" dreamweb" .
 		make_desktop_entry ${PN}-en_GB "Dreamweb (UK English)" dreamweb
 	fi
 	if use l10n_es ; then
 		doins -r es
-		games_make_wrapper dreamweb-es "scummvm -f -p \"${GAMES_DATADIR}/${PN}/es\" dreamweb" .
+		make_wrapper dreamweb-es "scummvm -f -p \"/usr/share/${PN}/es\" dreamweb" .
 		make_desktop_entry ${PN}-es "Dreamweb (Español)" dreamweb
 	fi
 	if use l10n_fr ; then
 		doins -r fr
-		games_make_wrapper dreamweb-fr "scummvm -f -p \"${GAMES_DATADIR}/${PN}/fr\" dreamweb" .
+		make_wrapper dreamweb-fr "scummvm -f -p \"/usr/share/${PN}/fr\" dreamweb" .
 		make_desktop_entry ${PN}-fr "Dreamweb (Français)" dreamweb
 	fi
 	if use l10n_it ; then
 		doins -r it
-		games_make_wrapper dreamweb-it "scummvm -f -p \"${GAMES_DATADIR}/${PN}/it\" dreamweb" .
+		make_wrapper dreamweb-it "scummvm -f -p \"/usr/share/${PN}/it\" dreamweb" .
 		make_desktop_entry ${PN}-it "Dreamweb (Italiano)" dreamweb
 	fi
 	use doc && dodoc -r doc/*
-	prepgamesdirs
 }
diff --git a/games-rpg/freedink-data/Manifest b/games-rpg/freedink-data/Manifest
index 6c6597f5fd0b..a279ea8c6424 100644
--- a/games-rpg/freedink-data/Manifest
+++ b/games-rpg/freedink-data/Manifest
@@ -1,3 +1,3 @@
 DIST freedink-data-1.08.20140901.tar.gz 51303165 BLAKE2B 28c225cf12b2bdcf0cf4cccb773e39055c756f0d031d851e697b2a47b8d82781b43ac31ae88245e67582be74fed8a67b20498d8e61231bb4106cc1a679b9ac18 SHA512 cdaa50610ed7e365967f6a84f6d540295ccc85bf4d11b882b49c6b97abe2b375be9880afc1e8ea31cdf22a24365d09861b9f4d1d522cc1ae685f7a8b6b4cad82
-EBUILD freedink-data-1.08.20140901.ebuild 516 BLAKE2B 48c3405164b6cd7bcb10b090ec5e5570db0d4ba506ae1127d812feccb323aac962128be7d67cf5dcaf3971241ba07e560be11d31c2433c06d61e02e0e9d26e55 SHA512 386e9e52acd4768574fceadd9ac49ce431d36872aab0d1a64fdb2c9d7c9d3df5bfc3fc232f2cc8b413ab6e79e78a255e5325b9cd2168209e5afaebda1048cba2
+EBUILD freedink-data-1.08.20140901-r1.ebuild 480 BLAKE2B af2dd511e91fc3befa1e7ca9d5af8906e751610c7f7418dbc1f5e579a928c16e53b20728289e76ed0dd9c352e279e3018310bb20d1576ff9585c8eaec361089e SHA512 0d1b688d5c8cab12bd4c3123583f8d20686a65f275b510b97664935b452ba5b76604639e51d9307edf2f5101e4dbdba4c049793936ff1a154a3dbcdbe0f869c9
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild b/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
index 4ba62c136c21..3a8d887e4ddb 100644
--- a/games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild
+++ b/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
@@ -1,9 +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
 
 DESCRIPTION="Freedink game data"
 HOMEPAGE="http://www.freedink.org/"
@@ -23,7 +21,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${GAMES_DATADIR}" install
+	emake DESTDIR="${D}" DATADIR="/usr/share" install
 	dodoc README.txt README-REPLACEMENTS.txt
-	prepgamesdirs
 }
diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest
index aea66b02746f..5834dc97f384 100644
--- a/games-rpg/freedink/Manifest
+++ b/games-rpg/freedink/Manifest
@@ -1,3 +1,3 @@
 DIST freedink-108.4.tar.gz 1897701 BLAKE2B b26129f3e5d17895a08cac9564973e31d6e8e2458ac9a2ed4b00f53cd1b8004073022a8e3f4cf8ded2e44cc4bb73909f021a7c960d219e78aec47b4c4ce7c18e SHA512 1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61
-EBUILD freedink-108.4.ebuild 1230 BLAKE2B 55385ee8951b0476aa8ba3a923c99222b7d09ae5a3592381a394259ea28b21a189dd0d2aae3078dbdd83817ebc240402e4b169da33ca2c212262675cb4c9b550 SHA512 b09ad8ab66a0cc6e45273b4111298fd3fcba96fea58dc89a189789444850e41b400247469ef92d994072050470640f48b62c64141186c9c2813770a03822c441
+EBUILD freedink-108.4-r1.ebuild 1023 BLAKE2B 9cee4fec543e4d3c406fc076ee6a00f660592f40443f56ff78fe1ba926213b7db486c540d10ff06cf7b75a6744f3af9832810defd0b915eed956e780706dbac6 SHA512 d23fbb32c63d88e023200449c3cacdfcaee5c9872d83d111b668573eb4f5d4ff547460187ed58e911e7064a67c0cac4777a791ede4f7a255575a4fb81d7d597f
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/freedink/freedink-108.4.ebuild b/games-rpg/freedink/freedink-108.4-r1.ebuild
index f9fb99c364f5..a40e9cd65da7 100644
--- a/games-rpg/freedink/freedink-108.4.ebuild
+++ b/games-rpg/freedink/freedink-108.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 flag-o-matic games
+EAPI=6
+inherit flag-o-matic
 
 DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)"
 HOMEPAGE="http://www.freedink.org/"
@@ -19,15 +19,19 @@ DEPEND="
 	>=media-libs/sdl-gfx-2.0
 	>=media-libs/sdl-image-1.2
 	>=media-libs/sdl-mixer-1.2[midi,vorbis,wav]
-	>=media-libs/sdl-ttf-2.0.9"
+	>=media-libs/sdl-ttf-2.0.9
+"
 RDEPEND="${DEPEND}
-	~games-rpg/freedink-data-1.08.20140901"
+	~games-rpg/freedink-data-1.08.20140901
+"
 DEPEND="${DEPEND}
 	dev-libs/check
 	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's#^datarootdir =.*$#datarootdir = /usr/share#' \
 		share/Makefile.in || die
@@ -37,21 +41,7 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		--disable-embedded-resources \
 		--localedir="/usr/share/locale"
 }
-
-src_install() {
-	default
-	dodoc TROUBLESHOOTING
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	einfo
-	elog "optional dependencies:"
-	elog "  games-util/dfarc (dmod installer and frontend)"
-	einfo
-}
diff --git a/games-rpg/queen/Manifest b/games-rpg/queen/Manifest
index e36388a15ea4..8ddf6b94c23e 100644
--- a/games-rpg/queen/Manifest
+++ b/games-rpg/queen/Manifest
@@ -6,5 +6,5 @@ DIST FOTAQ_Talkie-1.1.zip 33744817 BLAKE2B bd6edb28de6c4bede38b3d41365a27ba75373
 DIST cat-queen.png 1099 BLAKE2B 4035d73ccecc0bf91c4411d6018682d11f3fb8a246718d3762b216d44e299e9c0f3c9325206e4ab2f454f3005af0197b027dbb85c6f772631c823ed032c6f040 SHA512 009f30e2f9abbc803cd47314d8ff53009898640c12a26cb155b7e0b29c0a2bdaa06cf97fca6ca6f8b428300d63ca8200f627695a3f0b71585374a4a2b63ed2df
 DIST queen-readme.txt 5351 BLAKE2B 8b1859540668102a1ac25019f824084393440dee080528aa98a92b205bc8bdba45649c062d7ad88f3c82645e186ed98c4628719295d0d8efb8147c095166999a SHA512 ed2b5bc18896f9eeadea7526a70ad0a115bda229d1074d8c3a5a64228a7089cc20c6e296d82dc482634ab9bde06a07635d10ee68f47420f00625e0f5c29ef6ad
 DIST queen.1.bz2 90404210 BLAKE2B d854e0d7b82cf06551ebef5dd8b44f99e4a924cdd5721894e1b09698e2bc790f591906bcaa5208e37f8f05773152c1da4edf3186080b5a1f279276b8dd112b45 SHA512 f931584c141403019dcd91c43c8610c23cf39b37272440517c75cd4946da005d7fabcdd76fce2ec7504f35ec02727bede7d6a98381bd4f0c6a8d65b3c4363278
-EBUILD queen-1.ebuild 3431 BLAKE2B 9c7a7e082976d42406b3b54a8113b25bab3095afb16e6b78f22bb324be3fd9f2a0ed66567a95e0c2fa7703239ba947b338019bcc0f4183501be9f9bf92717f43 SHA512 22694eb9ab12d88a509596b679d77094b204db010882306b21f77aacc9f690f9f0503429f73757df0234bd2cfa82f042e0a5cb58fc713c8bacc4f52748b40386
+EBUILD queen-1-r1.ebuild 3342 BLAKE2B f75eb1f99e88f69de8616166d2f505c57cf782d2cbe7ff91a2b9294bc6f0d4ed1f563fae03bb94710a52d17dd57c52dca20b70c6119926cf3905f40c493e9806 SHA512 d12b85b68198bf5523e527b08ed8a9fbc7af92f07c8cbb020ace978bdcf48040ce20139c8b8ece65e0455b4631c24aad51d142fe4f96abded31b68941c0e2e0a
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/queen/queen-1.ebuild b/games-rpg/queen/queen-1-r1.ebuild
index 19c0b02dd67c..e9e011cf3398 100644
--- a/games-rpg/queen/queen-1.ebuild
+++ b/games-rpg/queen/queen-1-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 eutils
 
 DESCRIPTION="Flight of the Amazon Queen - 2D point-and-click adventure game set in the 1940s"
 HOMEPAGE="http://scummvm.sourceforge.net/"
@@ -99,28 +99,27 @@ src_unpack() {
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r *
 	newicon "${DISTDIR}"/cat-queen.png queen.png
 	if use l10n_de ; then
-		games_make_wrapper queen-de "scummvm -f -p \"${GAMES_DATADIR}/${PN}/de\" queen" .
+		make_wrapper queen-de "scummvm -f -p \"/usr/share/${PN}/de\" queen" .
 		make_desktop_entry ${PN}-de "Flight of the Amazon Queen (German)" queen
 	fi
 	if use l10n_en ; then
-		games_make_wrapper queen-en "scummvm -f -p \"${GAMES_DATADIR}/${PN}/en\" queen" .
+		make_wrapper queen-en "scummvm -f -p \"/usr/share/${PN}/en\" queen" .
 		make_desktop_entry ${PN}-en "Flight of the Amazon Queen (English)" queen
 	fi
 	if use l10n_fr ; then
-		games_make_wrapper queen-fr "scummvm -f -p \"${GAMES_DATADIR}/${PN}/fr\" queen" .
+		make_wrapper queen-fr "scummvm -f -p \"/usr/share/${PN}/fr\" queen" .
 		make_desktop_entry ${PN}-fr "Flight of the Amazon Queen (French)" queen
 	fi
 	if use l10n_he ; then
-		games_make_wrapper queen-he "scummvm -f -p \"${GAMES_DATADIR}/${PN}/he\" queen" .
+		make_wrapper queen-he "scummvm -f -p \"/usr/share/${PN}/he\" queen" .
 		make_desktop_entry ${PN}-he "Flight of the Amazon Queen (Hebrew)" queen
 	fi
 	if use l10n_it ; then
-		games_make_wrapper queen-it "scummvm -f -p \"${GAMES_DATADIR}/${PN}/it\" queen" .
+		make_wrapper queen-it "scummvm -f -p \"/usr/share/${PN}/it\" queen" .
 		make_desktop_entry ${PN}-it "Flight of the Amazon Queen (Italian)" queen
 	fi
-	prepgamesdirs
 }
diff --git a/games-rpg/soltys/Manifest b/games-rpg/soltys/Manifest
index e28143eb9b3c..2befca3dbe46 100644
--- a/games-rpg/soltys/Manifest
+++ b/games-rpg/soltys/Manifest
@@ -2,5 +2,5 @@ DIST cat-soltys.png 1917 BLAKE2B c33be51239b1df521b117c44ad2a6e427c26b64a37a1c72
 DIST soltys-en-v1.0.zip 3484518 BLAKE2B 04d49de79af0d18a5e35ee618de18c0c70b0d9670f9533ce29759aae34542038d31d9b096b25f7d7ee830bea6d0933df9d782b705b7dcaa46144023b9d88a037 SHA512 92637d760033c044b3979dfe21f617db0b2cf98c48587e058910f877b38e0887fed8102782f1dfac85bc8eefa68d3791d7ff2d6074396bea2728a128e37cee1d
 DIST soltys-es-v1.0.zip 3527349 BLAKE2B ac567c7727c8150b75d681e8f416aab859725a665c8e0b6ec628c7a0f101b0ffcf9fb2822d0dafbbd252c1a92f01bcb43f05c8f39447ef8dcf4a591afa441b8a SHA512 eac3aa60e274720f65504ffe5bc18f99401a24c5775c3bc6eb893aef2af7e02055eb52e3da162f124babe5b611f93ff5444aca6e2ea26e5baa98a2131dd49da0
 DIST soltys-pl-v1.0.zip 3483638 BLAKE2B 35269130a2d4699cd709deaeaf96cd95786dcb3b4ceb77b00682f865ab796245e7830805ff4989d4298e54bcc963c45ef8e58ef2200376b41722df33a82b41b5 SHA512 b8c04366d360eb4b7f296718ae46a2e417b676f9bddd6fb8555069d8972ae2ff1706c67fc473a52a5009cb433ff58db377e5f02ff6b27e68e35d2a89c8108f24
-EBUILD soltys-1.0-r1.ebuild 1901 BLAKE2B cf9616decd6bdd459675f1fedc885892736d1b3042d1bfe6465f38942cb5a2c57ee6ab3ada4e33b23d3e925fb9777a817f41db0232f875b76c6064695494ef13 SHA512 e909acaf350376740a10d92df8f63e1a33f489288a295b0ccc1b6e08d04864f887565ea56638ec534ed8d9c5fed62f8b3233b9dd7f697e5d1c15826c84c3bfb4
+EBUILD soltys-1.0-r2.ebuild 1847 BLAKE2B c64aa1f932ad08c97086074f104f6c2e42ad9271d7057e20da2cdacdfc1fa1f3af130bab2954e9c49f90116a6e74b5c09882a9162b2c75132f1bd35ff4318ad1 SHA512 be924a39d779d6ac1a9f62cbfcebaa9a7479887b27aec88736c9fe8e14ef2c5755be4b326aa087b086a5763d6f812be323ab98db0336c67851ae12d0ce6753d3
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/soltys/soltys-1.0-r1.ebuild b/games-rpg/soltys/soltys-1.0-r2.ebuild
index 1a8baca43ff0..e709836c31e9 100644
--- a/games-rpg/soltys/soltys-1.0-r1.ebuild
+++ b/games-rpg/soltys/soltys-1.0-r2.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 unpacker eutils games
+EAPI=6
+inherit unpacker eutils
 
 DESCRIPTION="Classic adventure game"
 HOMEPAGE="http://wiki.scummvm.org/index.php/Soltys"
@@ -20,7 +20,7 @@ IUSE="l10n_en l10n_es l10n_pl"
 RDEPEND=">=games-engines/scummvm-1.5"
 DEPEND="$(unpacker_src_uri_depends)"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_unpack() {
 	if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
@@ -41,24 +41,24 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
 	rm -rf license.txt soltys-es-v1-0
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r *
 	newicon "${DISTDIR}"/cat-soltys.png soltys.png
 	if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
-		games_make_wrapper soltys-en "scummvm -f -p \"${GAMES_DATADIR}/${PN}/en\" soltys" .
+		make_wrapper soltys-en "scummvm -f -p \"/usr/share/${PN}/en\" soltys" .
 		make_desktop_entry ${PN}-en "Soltys (English)" soltys
 	fi
 	if use l10n_es ; then
-		games_make_wrapper soltys-es "scummvm -f -p \"${GAMES_DATADIR}/${PN}/es\" soltys" .
+		make_wrapper soltys-es "scummvm -f -p \"/usr/share/${PN}/es\" soltys" .
 		make_desktop_entry ${PN}-es "Soltys (Español)" soltys
 	fi
 	if use l10n_pl ; then
-		games_make_wrapper soltys-pl "scummvm -f -p \"${GAMES_DATADIR}/${PN}/pl\" soltys" .
+		make_wrapper soltys-pl "scummvm -f -p \"/usr/share/${PN}/pl\" soltys" .
 		make_desktop_entry ${PN}-pl "Soltys (Polski)" soltys
 	fi
-	prepgamesdirs
 }
diff --git a/games-rpg/zsdx/Manifest b/games-rpg/zsdx/Manifest
index 9e1275e41c8f..e486a3865c69 100644
--- a/games-rpg/zsdx/Manifest
+++ b/games-rpg/zsdx/Manifest
@@ -1,3 +1,3 @@
 DIST zsdx-1.9.0.tar.gz 20757184 BLAKE2B 392aa36cfddaa82367cd3aa6769ffeb95f5e7235b5574d2793af629f289da107a67b70bfc2ad7d86651d2145a3f956bc000102919ca65ee18a1d83eac282d119 SHA512 2fc540d19856734050674945dd4903f254b325cab08ae0199722ae014447523ad9e979b54ddfd59d5cbc290b783481c79d5e155115c90f24feab5587d52804ee
-EBUILD zsdx-1.9.0.ebuild 1334 BLAKE2B 5b50175f88c40dfbdd4ae860fe11c1548a81fdd73561c7b0b69a235682d7fb65ca3850b1a2d8909182179faf6b739b5d41fb046dfc4c0977e6584763900ed2ee SHA512 bab8614ec327a380b3d7206bbe9448986010081a7e7cec8f8cca693a2f375e5c070c6bc49458abff0badfc7c2075c84ebf8870e17126e6ff9fc4964f81e2bf4f
+EBUILD zsdx-1.9.0-r1.ebuild 1130 BLAKE2B 24034d6b972196710ca4d9921c941bc661e0c05ece6dc5680e181ef884d225c1c1694843131c9c2cd2c0ebc792052d2e4dcb96d828fca5d6296ceff3427a5115 SHA512 29d003036632b3ac85d49db00ba01667ec31e20400d99bb49a67c6bb0743edf9ccac64972556b0b492ce064216d6e47d64b9f3b68948a39d3c1fcbb21ad62735
 MISC metadata.xml 333 BLAKE2B 34c8b3d3b3ef4c78241d40bd05613959e3d541561f6973c47c57489b0eea0e84ef21909fcb21102bdb4b5eaf0b8051c075a9649fe0975ead3c4cd1ff4c1471f7 SHA512 8135204b08f68188a8dc178b3083600e01a860b043cbc26415a111f6b23030cc067754dff74d77ac476e757caece3d44688f12126e81c17eaff74e4840f59ec9
diff --git a/games-rpg/zsdx/zsdx-1.9.0.ebuild b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
index f77a8c06fcca..dc00fda49542 100644
--- a/games-rpg/zsdx/zsdx-1.9.0.ebuild
+++ b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
@@ -1,9 +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 cmake-utils gnome2-utils games
+EAPI=6
+inherit cmake-utils eutils gnome2-utils
 
 DESCRIPTION="A free 2D Zelda fangame"
 HOMEPAGE="http://www.solarus-games.org/"
@@ -15,48 +14,37 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror"
 
-RDEPEND=">=games-engines/solarus-1.3.0
-	<games-engines/solarus-1.4.0"
+RDEPEND="
+	>=games-engines/solarus-1.3.0
+	<games-engines/solarus-1.4.0
+"
 DEPEND="app-arch/zip"
 
-DOCS=( ChangeLog readme.txt )
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
-		-DSOLARUS_INSTALL_DATAROOTDIR="${GAMES_DATADIR}"
-		-DSOLARUS_INSTALL_BINDIR="${GAMES_BINDIR}"
+		-DSOLARUS_INSTALL_DATAROOTDIR="/usr/share"
+		-DSOLARUS_INSTALL_BINDIR="/usr/bin"
 	)
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 	newicon -s 48 build/icons/${PN}_icon_48.png ${PN}.png
 	newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png
 
 	# install proper wrapper script
-	rm -f "${ED%/}${GAMES_BINDIR}"/${PN}
-	games_make_wrapper ${PN} "solarus \"${GAMES_DATADIR}/solarus/${PN}\""
+	rm -f "${ED}"/usr/bin/${PN}
+	make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\""
 
 	make_desktop_entry "${PN}" "Zelda: Mystery of Solarus DX"
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }