gentoo resync : 28.04.2021

2 files changed, 28 insertions, 29 deletions

diff --git a/games-fps/soldieroffortune/Manifest b/games-fps/soldieroffortune/Manifest
index 79ba08f86e04..c3d217236f42 100644
--- a/games-fps/soldieroffortune/Manifest
+++ b/games-fps/soldieroffortune/Manifest
@@ -1,3 +1,3 @@
 DIST sof-1.06a-cdrom-x86.run 22928437 BLAKE2B f76f605af08a19b77548455c0101e03aca7cae69462914e47911da2fadd6d4f3b766e1069556ead0d06c757b179ae2e8105e76ea37852f17796b47b4712aec87 SHA512 91ef3953bd6b6630ab602f64d15a3056f85d90139b18aa3eb9a9a0a75db2ece61ef683ddf1d03b63f0dfc902d7a27914ae673398713941f281e96555d9645078
-EBUILD soldieroffortune-1.06a-r1.ebuild 2110 BLAKE2B 787a5c00863f9019709f92b3ce6de04daeabca808b51d8e589951286497e48c771f62d7c31f9823b65726cfb57ac72ad80f8dc581100416bbf9e3b592e6302c1 SHA512 05f99512e81837bf410ed719a1610eb51daa178af43c1581f099eaf5f0a56b03ec84c36de84fb35eac5db3f4c1bdb1e5a36c682c22bd210129f572385804b84f
+EBUILD soldieroffortune-1.06a-r2.ebuild 2067 BLAKE2B 3ce93010e6cb4a30d3910db1d2be27e294fb63ab0c9cbbf1d6cea921627573a7ac6bb0db51182d9d4b2a6b8c1f9cfb1ad84d239c7279c287046684706a708676 SHA512 dd7d26e15eb1fa459d6b6d2cbb11d3c41a464476930c09c818f7b5ce8eefef178f4b45341934c5a84101817525b4e0d080df16b872a4fcf94a4397485f17c4d3
 MISC metadata.xml 963 BLAKE2B 3e6d4e2bf56378a5b2db55c5ce7ac3505a2b14a75ef00b409aa37b31d79b190284bbedd1206f9df78922844d583d947dc064ed272444ea77941b8e48dc82dd94 SHA512 59c285b27116238b779238f0179124a2ef1eefca76ae20a84f65ea8850548228dd540ba90b856dafccdd489f911beabb7b2b0a1fa4630562c995f845421f4895
diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a-r2.ebuild
index b10d3fa33648..ad644fc95b44 100644
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a-r2.ebuild
@@ -1,36 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit check-reqs eutils unpacker cdrom games
+EAPI=7
+
+CHECKREQS_DISK_BUILD="1450M"
+CHECKREQS_DISK_USR="725M"
+inherit cdrom check-reqs desktop unpacker wrapper
 
 DESCRIPTION="First-person shooter based on the mercenary trade"
 HOMEPAGE="http://www.lokigames.com/products/sof/"
 SRC_URI="mirror://lokigames/sof/sof-${PV}-cdrom-x86.run"
+S="${WORKDIR}"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="strip mirror bindist"
-IUSE=""
 
-DEPEND="games-util/loki_patch"
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	virtual/opengl[abi_x86_32(-)]
+RDEPEND="
 	media-libs/libsdl[X,opengl,sound,abi_x86_32(-)]
+	media-libs/smpeg[abi_x86_32(-)]
+	sys-libs/glibc
+	virtual/opengl[abi_x86_32(-)]
 	x11-libs/libXrender[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
-	media-libs/smpeg[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${ED}/${dir}
-unpackDir=${T}/unpack
+	amd64? ( sys-libs/glibc[multilib] )
+"
+BDEPEND="games-util/loki_patch"
 
-CHECKREQS_DISK_BUILD="1450M"
-CHECKREQS_DISK_USR="725M"
+dir=opt/${PN}
+Ddir="${ED}"/${dir}
+unpackDir="${T}"/unpack
 
 pkg_pretend() {
 	check-reqs_pkg_pretend
@@ -46,38 +46,37 @@ src_unpack() {
 
 src_install() {
 	einfo "Copying files... this may take a while..."
-	exeinto "${dir}"
+
+	exeinto ${dir}
 	doexe "${CDROM_ROOT}"/bin/x86/glibc-2.1/sof
-	insinto "${dir}"
+
+	insinto ${dir}
 	doins -r "${unpackDir}"/*
 	doins "${CDROM_ROOT}"/{README,kver.pub,sof.xpm}
 
-	cd "${S}"
+	cd "${S}" || die
 	export _POSIX2_VERSION=199209
-	loki_patch --verify patch.dat
+	loki_patch --verify patch.dat || die
 	loki_patch patch.dat "${Ddir}" >& /dev/null || die
 
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find "${Ddir}" -exec touch '{}' +
+	find "${Ddir}" -exec touch '{}' + || die
 
-	games_make_wrapper sof ./sof "${dir}" "${dir}"
+	make_wrapper sof ./sof "${dir}" "${dir}"
 
-	# fix buffer overflow
+	# Fix buffer overflow
 	sed -i -e '/^exec/i \
 export MESA_EXTENSION_MAX_YEAR=2003 \
 export __GL_ExtensionStringVersion=17700' \
-		"${ED}/${GAMES_BINDIR}/sof" || die
+		"${ED}/usr/bin/sof" || die
 
 	doicon "${CDROM_ROOT}"/sof.xpm
 	make_desktop_entry sof "Soldier of Fortune" sof
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "To play the game run:"
 	elog " sof"
 }