gentoo resync : 08.07.2021

11 files changed, 137 insertions, 216 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 5c98ae5bc092..d6a83bfa3b96 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/draci-historie/Manifest b/games-rpg/draci-historie/Manifest
index 09c53099bf86..47fcdd60cdda 100644
--- a/games-rpg/draci-historie/Manifest
+++ b/games-rpg/draci-historie/Manifest
@@ -2,5 +2,6 @@ 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-r1.ebuild 2365 BLAKE2B c908bcbfc5b1cb9aefc3eb73d55ff3b50045af923d57ef45857e173ca64ff4a7142897e4e645342aee5b163b8ff5dc6cec759d55dfdb1591cd3a755a9d9359b9 SHA512 a54f1a29806cd8a2f270a0dc232a6ac1b34fad9f76d0843919a0aac2e40fc043dfe0def47887be40d97c68224bb8bbf789a3bb2f74f0bb2d62cd7b2684d533db
+DIST draci-historie.png 5121 BLAKE2B f4f5ec74e00385e1cd13ba4002305960513d5be829a89f116e0ce7829347b934ab2317a5064c6bfeb89e70a6d0f3f6106eb497bf3558e6549f838b2548693512 SHA512 a0c204dcc94c0fe872dd46da7553aa148e08ac5a04941a24eee05823ae1e14ea6576b22e2bae87371d8af3c1559edf14abbd5998784a49338ccba1e217400f30
+EBUILD draci-historie-2012-r1.ebuild 1380 BLAKE2B a6237015ff6f65a18184e1b853878ece1ea756fc7eebd0becb8e2edad0960021ffd8e739395030c26c0ac92be0a985977a5259fd0dda8569552f8cd078bf96aa SHA512 0e98b80e58519cdc04b0084ba9a9d21b6735512c089d764841d55bfbd179631980dfb2aa2ab7d7185ae1c01a59fc01c0a73e9655956a616316a884d26d2ab171
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
index 3982a8538d15..262964dad79f 100644
--- a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
+++ b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
@@ -1,79 +1,51 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop wrapper
 
 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"
+HOMEPAGE="https://www.ucw.cz/draci-historie/index-en.html"
+BASE_URL="https://www.ucw.cz/draci-historie/binary/dh"
 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 ) ) ) )
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png
 "
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="l10n_cs l10n_de l10n_en l10n_pl"
+IUSE="l10n_cs l10n_de +l10n_en l10n_pl"
 
-RDEPEND=">=games-engines/scummvm-1.1"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+RDEPEND="games-engines/scummvm"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
-	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
-		mkdir en || die
-		unpack dh-en-${PV}.zip
-		mv *.{dfw,fon,mid,sam} en/ || die
-	fi
-	if use l10n_cs ; then
-		mkdir cs || die
-		unpack dh-cz-${PV}.zip
-		mv *.{dfw,fon,mid,sam,zzz} cs/ || die
-	fi
-	if use l10n_de ; then
-		mkdir de || die
-		unpack dh-de-${PV}.zip
-		mv *.{dfw,fon,mid,sam} de/ || die
-	fi
-	if use l10n_pl ; then
-		mkdir pl || die
-		unpack dh-pl-${PV}.zip
-		mv *.{dfw,fon,mid,sam,zzz} pl/ || die
-	fi
-}
-
-src_prepare() {
-	default
-	rm -f *.{bat,exe,ins} readme.* || die
+	MY_L10N=( $(usev l10n_{cs,cz}) $(usev l10n_de) $(usev l10n_en) $(usev l10n_pl) )
+	[[ ${MY_L10N} ]] || MY_L10N=( l10n_en )
+
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		mkdir ${lang} || die
+		unpack dh-${lang}-${PV}.zip
+		mv *.{dfw,fon,mid,sam} ${lang}/ || die
+	done
 }
 
 src_install() {
-	newicon bert.ico draci-historie.ico
 	insinto /usr/share/${PN}
-	for lingua in $(find * -type d); do
-		doins -r ${lingua}
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		doins -r ${lang}
+		make_wrapper ${PN}-${lang} "scummvm -f -p \"${EPREFIX}/usr/share/${PN}/${lang}\" draci"
+		make_desktop_entry ${PN}-${lang} "Dračí Historie (${lang})"
 	done
-	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
-		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
-		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
-		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
-		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
-	einstalldocs
+
+	doicon "${DISTDIR}"/${PN}.png
 }
diff --git a/games-rpg/drascula/Manifest b/games-rpg/drascula/Manifest
index d66ed6751284..13c9d8cc4b13 100644
--- a/games-rpg/drascula/Manifest
+++ b/games-rpg/drascula/Manifest
@@ -1,7 +1,7 @@
 DIST drascula-1.0.zip 32842993 BLAKE2B 5033e8e5f66f74c2b049a1246c62dd33b7b32c3d088575a8d031bc505cd3356c0b364efa9308c99e26e524dc58913cad7cc09424ac6ad30fff38175f952a0151 SHA512 74ca773264e1ed611456b230d6265dade8d745a3adb736f3d6583d43ed6820a25f481ec65612b31d4b3076418f6bc696c82fa0f5085ec43edc91761e95361d11
-DIST drascula-2.0.0.dat 219527 BLAKE2B 362cb71aa5c7ec7a391a9e371f7adbfeef7c3d015db562e613ebc5513d0d8661af6880549424c9fff0dde25e8fe3a82bc4658e0bd47eb6b65c071fff0dce9983 SHA512 b57cdde7f686d54b3dd669dc5737e0046c3f38a31c4f78cde1b51dc7dc3a28193a95d5364629716998f958b7c43ed45bdcd0bc32f94ca718e7882d16fea2c015
+DIST drascula-2.2.0.dat 259619 BLAKE2B 924dbd42276feef2ef3be599f37316687f1bc4940189082408c5e5eb923d1df2d638a87e4fdf88d443151ec4e4bb4f9c211905c9596b6608691aa40cef1b99b1 SHA512 032731a30561f1c77f2b9f93e80350371afa7673b1140b5a854ceac724c6ed89755af780e9519717f9ac75e7d34a225e03e0d84ebfb5986f6a6cdef0ca018745
 DIST drascula-audio-2.0.zip 36531704 BLAKE2B c3426f9c10e1ab5931b6474c1ba5b13a38267db5c8a8b8663e6a9bbea95751d50f4829dc427d962110ec4b0b093f2c5b59a73ca15aedd73c9ceaf1b3b158ec82 SHA512 09018bcfa062e720db6af7b38fa582f1b3674a25e7bb323d894ad767f8bcd449739fc592a10d848f6cac90a8bb51b5148c5c39558f70d29e2a5116b0b196274e
 DIST drascula-int-1.1.zip 34855203 BLAKE2B b37f6ed68d3ef6cc70915d68178a0359ae39e9d2a020f84573e8e905ec4fa946ad9328479590d5510f0b03ec5a422a4204ffd3fb6294711ea7b68f0f19899151 SHA512 f8127d09e19dec9abf75b9129792c67f3d36ea80fa69c70eeaa536f7a76f8f29072c21f041a0f9467d595f214392541c09c7a75caca0318e8d1b587db9d099cf
 DIST drascula.png 34525 BLAKE2B 1d529b02f08079921ab1021a3012fbef89fd4e9e4933727cdf96c5ce52bc3837d3f636e7b32f33cb92d027cbc330d4fc9280202a6b970821741eb8a44a905346 SHA512 e49fc17cad986b8fa42bd5ede30a1b1ef264182a476168d5c197a31d484555552e824f103b9456898940c68c2f0d751f4c2782a7a95ea92c62e3daec1dd1f52a
-EBUILD drascula-1.0-r3.ebuild 1811 BLAKE2B 44b0bf84c4b5dfc0f525ed56e74b3f07ad8348a3317d4b3dcc3c4d880b94f31e907146042c40a1c3ab02447b0cc130b2e9ee613cd1a914327259f1737ebea165 SHA512 1a75811d70d6df3635eb40f138dd5d3ad9acd66fbc183e82b2193262953df84403669b8e4f1f5275234e956a68df1571a6ed4361d605291948cf487634311a47
+EBUILD drascula-1.0-r4.ebuild 1850 BLAKE2B 77e09dbf843cc15febc3e73e8d67398d66074c25d2c53d9447235d513914002b9cf627eff5f007af545621098751df4b63260cc0d7789a4d325d1e7bc5a73e6a SHA512 de24f163dad03f9622de431dc4cf530af44fd9a020e327cadcdcd467c23ccd611bbf3307507012ca53ce4befe3f67e349ee5a4596085e9c93976aa1262590202
 MISC metadata.xml 473 BLAKE2B 5c14edc9041dd442f8cdde7cb168b024495d7b5e1ac12438bfb47d4dd533ca7280fe51c6d6dba950e14aa96bca40973faa7a4580f067985afef04202ed4c9374 SHA512 4e247fb0a866b080da09b521cdfa1d8eaf3463e4cc62199dc58f22eec49f41c3843f71981b0f41a0ebbda98f9fd6e02f3a15e63a8b445266630324dbfecbda91
diff --git a/games-rpg/drascula/drascula-1.0-r3.ebuild b/games-rpg/drascula/drascula-1.0-r4.ebuild
index f058ca3b8da3..e88289450b68 100644
--- a/games-rpg/drascula/drascula-1.0-r3.ebuild
+++ b/games-rpg/drascula/drascula-1.0-r4.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop wrapper
 
 INT_PV="1.1"
 INT_URI="mirror://sourceforge/scummvm/drascula-int-${INT_PV}.zip"
-DAT_PV="2.0.0"
+DAT_PV="2.2.0"
 AUD_PV="2.0"
 
 DESCRIPTION="Drascula: The Vampire Strikes Back"
@@ -19,6 +20,7 @@ SRC_URI="mirror://sourceforge/scummvm/drascula-${PV}.zip
 	l10n_de? ( ${INT_URI} )
 	l10n_fr? ( ${INT_URI} )
 	l10n_it? ( ${INT_URI} )"
+S="${WORKDIR}"
 
 LICENSE="drascula"
 SLOT="0"
@@ -26,12 +28,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="l10n_es l10n_de l10n_fr l10n_it +sound"
 RESTRICT="mirror"
 
-RDEPEND=">=games-engines/scummvm-0.13.1"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
+RDEPEND="games-engines/scummvm[vorbis]"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
 	if use l10n_es || use l10n_de || use l10n_fr || use l10n_it; then
@@ -44,22 +42,27 @@ src_unpack() {
 }
 
 src_install() {
-	local lang
-
-	make_wrapper ${PN} "scummvm -f -p \"/usr/share/${PN}\" drascula" .
-	for lang in es de fr it; do
-		if use l10n_${lang} ; then
-			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 /usr/share/${PN}
-	find . -name "P*.*" -execdir doins '{}' +
 	newins "${DISTDIR}"/drascula-${DAT_PV}.dat drascula.dat
-	if use sound; then
-		doins audio/*
+	doins Packet.001
+
+	if use l10n_es || use l10n_de || use l10n_fr || use l10n_it; then
+		doins ${PN}-int-${INT_PV}/PACKET.00[2-5]
+
+		local lang
+		for lang in es de fr it; do
+			if use l10n_${lang}; then
+				make_wrapper ${PN}-${lang} "scummvm -q ${lang} -f -p \"${EPREFIX}/usr/share/${PN}\" drascula"
+				make_desktop_entry ${PN}-${lang} "Drascula (${lang})"
+			fi
+		done
 	fi
-	dodoc readme.txt drascula.doc
+
 	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} "Drascula: The Vampire Strikes Back"
+	make_wrapper ${PN} "scummvm -f -p \"${EPREFIX}/usr/share/${PN}\" drascula"
+	make_desktop_entry ${PN} Drascula
+
+	use sound && doins -r audio/.
+
+	dodoc readme.txt drascula.doc
 }
diff --git a/games-rpg/dreamweb/Manifest b/games-rpg/dreamweb/Manifest
index f673b12057a7..fc9bd497765a 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-r1.ebuild 3445 BLAKE2B 3f2e0268c430f9dc9790fa04fb78093b459d519e1ddf2c419584af28cba2a93c4ac2b67059c63fc335b78d0fcc6f3a295c031e6e4726cc93ac69f9c570a48eaf SHA512 81680845395edf75fb51bca7e9bf438e70fb7a89b8c781b6e35cae98f377a912001c9c5fd567cb21d27342f68be6f733c596a165dbef62bcb23ed9ecdc7d872b
+EBUILD dreamweb-1.1-r1.ebuild 1993 BLAKE2B 2af2bdd6541f905a520675ca23c014988176a3b108a3516ac26fc6c5e71bfae24b094b1b3216c684cd9b46d370d599def23d2ae1dcb95aa12b54b85aff756193 SHA512 c84fd205d9b8988222b2688175976d4cf16d799ef8899b03014ca1bb3bac5f641fa1e04f603d636c3e3b668654375b034468e91b8fea264cc86b982f7866671d
 MISC metadata.xml 459 BLAKE2B f764c68b92e4614c49c37cee671b5b69ed25eb3938f4d6efdc1061ff34f2a12d1dd896f2dd9ac9ba91e7cbfa5c77aab9c6437b0ec1d685a930dbe7ca6b96823c SHA512 06373bf69e200ed3a6b86bb7f914147c26ea4d4b00f3592b3235917d878e45ed2b86f33136057a64471bdc711cdc5740a35f80b39a92e7fbe55304d8c98c1474
diff --git a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
index b041a158412f..8e0173c49eac 100644
--- a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
+++ b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop wrapper
 
 DESCRIPTION="Top-down adventure game set in a gritty futuristic/dystopian city"
 HOMEPAGE="https://wiki.scummvm.org/index.php/Dreamweb"
@@ -16,51 +17,30 @@ SRC_URI="doc? ( mirror://sourceforge/scummvm/${PN}-manuals-en-highres.zip )
 	!l10n_de? ( !l10n_en? ( !l10n_en-GB? ( !l10n_es? ( !l10n_fr? ( !l10n_it? \
 		( mirror://sourceforge/scummvm/${PN}-cd-us-${PV}.zip ) ) ) ) ) )
 	http://www.scummvm.org/images/cat-dreamweb.png"
+S="${WORKDIR}"
 
 LICENSE="Dreamweb"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it"
+IUSE="doc l10n_de +l10n_en l10n_en-GB l10n_es l10n_fr l10n_it"
 
-RDEPEND=">=games-engines/scummvm-1.7[flac]"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+RDEPEND="games-engines/scummvm[flac]"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
-	if use l10n_de ; then
-		mkdir -p "${S}"/de || die
-		cd "${S}"/de || die
-		unpack ${PN}-cd-de-${PV}.zip
-	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
-		mkdir -p "${S}"/en_US || die
-		cd "${S}"/en_US || die
-		unpack ${PN}-cd-us-${PV}.zip
-	fi
-	if use l10n_en-GB ; then
-		mkdir -p "${S}"/en_GB || die
-		cd "${S}"/en_GB || die
-		unpack ${PN}-cd-uk-${PV}.zip
-	fi
-	if use l10n_es ; then
-		mkdir -p "${S}"/es || die
-		cd "${S}"/es || die
-		unpack ${PN}-cd-es-${PV}.zip
-	fi
-	if use l10n_fr ; then
-		mkdir -p "${S}"/fr || die
-		cd "${S}"/fr || die
-		unpack ${PN}-cd-fr-${PV}.zip
-	fi
-	if use l10n_it ; then
-		mkdir -p "${S}"/it || die
-		cd "${S}"/it || die
-		unpack ${PN}-cd-it-${PV}.zip
-	fi
-	if use doc ; then
-		mkdir -p "${S}"/doc || die
+	MY_L10N=( $(usev l10n_de) $(usev l10n_es) $(usev l10n_fr) $(usev l10n_it) )
+	MY_L10N+=( $(usev l10n_{en,us}) $(usev l10n_{en-GB,uk}) )
+	[[ ${MY_L10N} ]] || MY_L10N=( l10n_us )
+
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		mkdir "${S}"/${lang} || die
+		cd "${S}"/${lang} || die
+		unpack ${PN}-cd-${lang}-${PV}.zip
+	done
+
+	if use doc; then
+		mkdir "${S}"/doc || die
 		cd "${S}"/doc || die
 		unpack ${PN}-manuals-en-highres.zip
 	fi
@@ -68,42 +48,18 @@ src_unpack() {
 
 src_prepare() {
 	default
-	rm -rf */license.txt */*.EXE || die
+	rm -f */license.txt */*.EXE || die
 }
 
 src_install() {
 	insinto /usr/share/${PN}
-	newicon "${DISTDIR}"/cat-dreamweb.png dreamweb.png
-	if use l10n_de ; then
-		doins -r de
-		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
-		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
-		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
-		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
-		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
-		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/*
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		doins -r ${lang}
+		make_wrapper ${PN}-${lang} "scummvm -f -p \"${EPREFIX}/usr/share/${PN}/${lang}\" ${PN}"
+		make_desktop_entry ${PN}-${lang} "Dreamweb (${lang})"
+	done
+
+	newicon "${DISTDIR}"/cat-${PN}.png ${PN}.png
+	use doc && dodoc -r doc/.
 }
diff --git a/games-rpg/gwiz/Manifest b/games-rpg/gwiz/Manifest
index 81457d7774d8..60c28388613c 100644
--- a/games-rpg/gwiz/Manifest
+++ b/games-rpg/gwiz/Manifest
@@ -1,4 +1,4 @@
 AUX gwiz-0.8-buffer.patch 653 BLAKE2B 1041deef28648a2cee73bd1b0ac458bbb290bed152588fb6400e6b305c3c702472612bea5015adb52da8533af1fd80325fd17ca6e855f6b98e88ee6d4714ebb7 SHA512 127bf8b442f437fa1ad373f203aaa388f28e59f570257a6ea44906997ed069c379f7b96879c95a198e420a86653331e73a0d2f54fbb55731383f22f274d5b4ba
 DIST gwiz-0.8.tar.bz2 1141667 BLAKE2B 60c28da8caa2b54c1b193b6bc0e8173fea525394c9467beae74ccef69ab21d5c8d259d0e5a1c6d2b557114c8405643bf5c2d74ab6ba01ee92252a350ee5a80e2 SHA512 3c18cc7e905dd87eab7dbf332b985600bbcc8c2992fbc79d992fb0f00c3095c502f416166f0e3320f18b9e011c26675c42e79375f44225b61aba415509837f20
-EBUILD gwiz-0.8-r1.ebuild 774 BLAKE2B 6a5ccaf7f6be75580df34d3c2cefe5940aff9295c79c0f0a03e1f72dd2e7d02af1d96e38fdaa0106d2443e52909bab88e191dd1235acf2d1f2585a7d77c4e7e3 SHA512 9e305c35a0d2efa22c409ffc4898859624644cd4a34a897ba8dcadd640653e5160fd0c4ae95f6efe6c42fe2e890bd9b56e9f4514d39e0fc4f96c98de21b67626
+EBUILD gwiz-0.8-r1.ebuild 745 BLAKE2B 88dea36500196c0b4556aba65ed67e25d0b9c88a24566b7d88afb1e579f60db66bb5a66c1285919f64eeebe81bfc305aa4a180ac216b6d5c2ca381353d9edd66 SHA512 348eeb438f7e12a515ecd4c79aabec9d072769af346065ad1292890ef526b492cd3ebfa0baf771e82bf36929a06278ead8aafa4fefeb202d74a898b1c174d816
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/gwiz/gwiz-0.8-r1.ebuild b/games-rpg/gwiz/gwiz-0.8-r1.ebuild
index f7a462a9a302..d8d166f528bb 100644
--- a/games-rpg/gwiz/gwiz-0.8-r1.ebuild
+++ b/games-rpg/gwiz/gwiz-0.8-r1.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic
+EAPI=8
 
-DESCRIPTION="clone of old-school Wizardry(tm) games by SirTech"
-HOMEPAGE="http://icculus.org/gwiz/"
-SRC_URI="http://icculus.org/gwiz/${P}.tar.bz2"
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Clone of old-school Wizardry(tm) games by SirTech"
+HOMEPAGE="https://icculus.org/gwiz/"
+SRC_URI="https://icculus.org/gwiz/${P}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~x86"
 SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
+LICENSE="GPL-2+"
 
-DEPEND=">=media-libs/libsdl-1.2.3[joystick,video]
-	>=media-libs/sdl-image-1.2.1-r1[png]
-	>=media-libs/sdl-ttf-2.0.4"
-RDEPEND=${DEPEND}
+DEPEND="media-libs/libsdl[joystick,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-ttf"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-buffer.patch
@@ -25,12 +25,14 @@ PATCHES=(
 src_prepare() {
 	default
 
+	tc-export CC
 	append-cflags -std=gnu89 # build with gcc5 (bug #572532)
 }
 
 src_install() {
-	DOCS="AUTHORS ChangeLog README doc/HOWTO-PLAY" \
-		default
+	default
+
+	dodoc doc/HOWTO-PLAY
 	newicon pixmaps/gwiz_icon.xpm ${PN}.xpm
 	make_desktop_entry gwiz Gwiz
 }
diff --git a/games-rpg/soltys/Manifest b/games-rpg/soltys/Manifest
index b88c8b565434..7bf5a1fc875c 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-r2.ebuild 1817 BLAKE2B 67656d421d4346aaeecf93a54daaa3986c060456407ef7636f77e05b6df0a2c0e5d435b9befb5ebe99dbc66bc957948dd6ae4c3ef3a47b013fc56739289be846 SHA512 222b12c0bf49159946398d1d060276f54d4d2d2d57aecea1d48651fcc42c02fe95d3213f6f363fe583d2168835f95a1a215c3efd4b482ff7b03fca92bcf5af50
+EBUILD soltys-1.0-r2.ebuild 1412 BLAKE2B 047e25014aa0c0c62a1e7eb5ce091da534b31b4698a66757a67caad4c3a44271e01fd6c1697c049f0b3fd2c28a9846d0edfae4f7d6e5ba4feb472d36091e8061 SHA512 470ff4b7cad9b4ff1c4d24be6277adc4806656ee1c6aa8fa74aa9456a6f38321bb330ef4acbc6b1a70e17053f0cfae23af8c910d711ddbd844284e62bb472c66
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/soltys/soltys-1.0-r2.ebuild b/games-rpg/soltys/soltys-1.0-r2.ebuild
index e9d29906063f..3b59a9cabce4 100644
--- a/games-rpg/soltys/soltys-1.0-r2.ebuild
+++ b/games-rpg/soltys/soltys-1.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop wrapper
 
 DESCRIPTION="Classic adventure game"
 HOMEPAGE="https://wiki.scummvm.org/index.php/Soltys"
@@ -10,55 +11,41 @@ SRC_URI="l10n_en? ( mirror://sourceforge/scummvm/${PN}-en-v${PV}.zip )
 	l10n_es? ( mirror://sourceforge/scummvm/${PN}-es-v${PV}.zip )
 	l10n_pl? ( mirror://sourceforge/scummvm/${PN}-pl-v${PV}.zip )
 	!l10n_en? ( !l10n_es? ( !l10n_pl? ( mirror://sourceforge/scummvm/${PN}-en-v${PV}.zip ) ) )
-	http://www.scummvm.org/images/cat-soltys.png"
+	http://www.scummvm.org/images/cat-${PN}.png"
+S="${WORKDIR}"
 
 LICENSE="Soltys"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="l10n_en l10n_es l10n_pl"
 
-RDEPEND=">=games-engines/scummvm-1.5"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+RDEPEND="games-engines/scummvm"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
-	if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
-		mkdir -p en || die
-		unpack ${PN}-en-v${PV}.zip
-		mv vol.{cat,dat} en/ || die
-	fi
-	if use l10n_es ; then
-		mkdir -p es || die
-		unpack ${PN}-es-v${PV}.zip
-		mv soltys-es-v1-0/vol.{cat,dat} es/ || die
-	fi
-	if use l10n_pl ; then
-		mkdir -p pl || die
-		unpack ${PN}-pl-v${PV}.zip
-		mv vol.{cat,dat} pl/ || die
-	fi
-}
-
-src_prepare() {
-	default
-	rm -rf license.txt soltys-es-v1-0
+	MY_L10N=( $(usev l10n_en) $(usev l10n_es) $(usev l10n_pl) )
+	[[ ${MY_L10N} ]] || MY_L10N=( l10n_en )
+
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		mkdir ${lang} || die
+		unpack ${PN}-${lang}-v${PV}.zip
+		if [[ ${lang} == es ]]; then
+			mv ${PN}-${lang}-v$(ver_rs 1 -)/vol.{cat,dat} ${lang}/ || die
+		else
+			mv vol.{cat,dat} ${lang}/ || die
+		fi
+	done
 }
 
 src_install() {
 	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
-		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
-		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
-		make_wrapper soltys-pl "scummvm -f -p \"/usr/share/${PN}/pl\" soltys" .
-		make_desktop_entry ${PN}-pl "Soltys (Polski)" soltys
-	fi
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		doins -r ${lang}
+		make_wrapper ${PN}-${lang} "scummvm -f -p \"${EPREFIX}/usr/share/${PN}/${lang}\" ${PN}"
+		make_desktop_entry ${PN}-${lang} "Soltys (${lang})"
+	done
+
+	newicon "${DISTDIR}"/cat-${PN}.png ${PN}.png
 }