gentoo resync : 24.06.2021

3 files changed, 11 insertions, 47 deletions

diff --git a/games-rpg/bass/Manifest b/games-rpg/bass/Manifest
index 75462f40d000..a59c535fa230 100644
--- a/games-rpg/bass/Manifest
+++ b/games-rpg/bass/Manifest
@@ -2,6 +2,5 @@ AUX scummvmGetLang.sh 358 BLAKE2B 9d3490611c16757979cc57901d178e616e9739cfc80bad
 DIST BASS-Floppy-1.3.zip 7675813 BLAKE2B dbe6e110c4901ba6f1b055208b796b71ef1ab879a0266273765c8f9544065715e0535f41ecaa1cde7e02499ac5e90624eb5a42d1b82dbeee52ddba90bd1dcdd9 SHA512 d220f84448b50e1464329e204f876acc4a9eda24b319577ed74aec8e1a0316e2df268f8768ac9267b90a29a857b010bdae71e2f3c77428987f299bec3dc1ce15
 DIST bass-cd-1.2.zip 69377781 BLAKE2B 7eb59b78eda2ab1385f742189f420706aac3364dabb9263729341d1973e93b27c0509e7d22b5eb3a228400a398a82cc074adb9a601e93cfa7d7dca1f51e9d68e SHA512 ff896e723b4dbf2cc52851ee1260c1006aa285b768a727974719d63509bdac1c65be9ea565eb037d5e9e1c8fd8fd76a8c04776bcde46616ca9ccce18ea498d64
 DIST bass.png 27613 BLAKE2B 1bc440055d4cfd3115e3b2768f5b88fa49eaed3f3d957b436e1e0df236fb0bc968ced18962ff9833962a1ab8a8b544e57ea10c679eb6d434c633f27956fdc489 SHA512 c0f62257f025970f51f32a7f3284cf117a091d40bbcd6c7503e8f0e8e98954cf96e35a04a4e633a04a721ff01beb7a6e0f4c883e286e477c3e065d411db4c87e
-EBUILD bass-1.3-r1.ebuild 1197 BLAKE2B febb9f2de79d506c39b380d16660aebe18535fdd94bfa4cf3d0f5d7978ea3f1f91b0018ca7ae71e42cdd645d21d98b7c82f7d7d87d0ccad005dd7a275e2209f6 SHA512 ad3fbabcff53c30fc87e96fe6e2b02d3901a1d46da5e9c31d2ec0d94811616f62f534347f23c0768af3ee8610edd25159cc21436ccbe82ac387df509114c48cd
-EBUILD bass-1.3.ebuild 881 BLAKE2B 3c2d8e1087f23b318561942517baf20c741af2a0967ebf6c8077a80f463f7967a7563dab361a0e7463a14e118f163ff3b06934e8630b077137fb1f5e23071bcf SHA512 ef3ec8e97db581584c41ee1289afbfec81bc1be6931d51b4d2d98ef0d3afafb2ad2afc4f14ce4ac1220ae30274b771f9d8bbf8ad2fd82a8f2f37be17c96c78b2
+EBUILD bass-1.3-r1.ebuild 1222 BLAKE2B 4e6cb95bcfe9264ff9b1d19f5334f63f447f40a7f1ca534c8469eb5e0938fbe3082702edcec2c3ba12cb00afbe9557e28c81da3ec0c80295464fc1aa2047cdcf SHA512 4ac77242e5f92beae5ccaf675f34d7fd10e1b32e278dc28a64e270d404f1a7b7f1ed2e021e66662db12d2cd2cbd170c1961b4b2fc1498d216385758818debbe2
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/bass/bass-1.3-r1.ebuild b/games-rpg/bass/bass-1.3-r1.ebuild
index 57359be0e1bf..4c3c378b760e 100644
--- a/games-rpg/bass/bass-1.3-r1.ebuild
+++ b/games-rpg/bass/bass-1.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop eutils
+EAPI=7
+
+inherit desktop wrapper
 
 DESCRIPTION="Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future"
 HOMEPAGE="https://en.wikipedia.org/wiki/Beneath_a_Steel_Sky"
@@ -11,29 +12,26 @@ CD_VERSION="1.2"
 SRC_URI="http://downloads.sourceforge.net/scummvm/BASS-Floppy-${PV}.zip
 	http://downloads.sourceforge.net/scummvm/bass-cd-${CD_VERSION}.zip
 	mirror://gentoo/${PN}.png"
+S="${WORKDIR}/"
 
 LICENSE="bass"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
 RDEPEND=">=games-engines/scummvm-0.5.0"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 src_install() {
 	dobin "${FILESDIR}"/scummvmGetLang.sh
 
 	insinto /usr/share/${PN}
 	doins sky.*
-	mv bass-cd-"${CD_VERSION}"/readme.txt readme-cd.txt
+	mv bass-cd-"${CD_VERSION}"/readme.txt readme-cd.txt || die
 	doins -r bass-cd-"${CD_VERSION}"/
 
-	make_wrapper bass "scummvm -f -p \"/usr/share/${PN}\" -q\$(scummvmGetLang.sh) sky" .
-	make_wrapper bass-cd "scummvm -f -p \"/usr/share/${PN}/bass-cd-${CD_VERSION}\" -q\$(scummvmGetLang.sh) sky" .
+	make_wrapper bass "scummvm -f -p \"${EPREFIX}/usr/share/${PN}\" -q\$(scummvmGetLang.sh) sky" .
+	make_wrapper bass-cd "scummvm -f -p \"${EPREFIX}/usr/share/${PN}/bass-cd-${CD_VERSION}\" -q\$(scummvmGetLang.sh) sky" .
 
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} "Beneath a Steel Sky (Floppy version)"
diff --git a/games-rpg/bass/bass-1.3.ebuild b/games-rpg/bass/bass-1.3.ebuild
deleted file mode 100644
index 4ca16f0ae141..000000000000
--- a/games-rpg/bass/bass-1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="http://downloads.sourceforge.net/scummvm/BASS-Floppy-${PV}.zip
-	mirror://gentoo/${PN}.png"
-
-LICENSE="bass"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=games-engines/scummvm-0.5.0"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/"
-
-src_install() {
-	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"
-}