games-fps/soldieroffortune: port to EAPI 7, games.eclass--

Signed-off-by: Sam James <sam@gentoo.org>

1 files changed, 27 insertions, 28 deletions

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"
 }