gentoo resync : 08.07.2021

2 files changed, 29 insertions, 26 deletions

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
 }