From 814f4cf860e299a046b649eaee5463427984c09c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 8 Jul 2021 15:03:58 +0100
Subject: gentoo resync : 08.07.2021

---
 games-rpg/soltys/Manifest             |  2 +-
 games-rpg/soltys/soltys-1.0-r2.ebuild | 71 ++++++++++++++---------------------
 2 files changed, 30 insertions(+), 43 deletions(-)

(limited to 'games-rpg/soltys')

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
 }
-- 
cgit v1.2.3