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

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

1 files changed, 26 insertions, 24 deletions

diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r3.ebuild
index 75458580db7e..180c6f86e698 100644
--- a/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild
+++ b/games-fps/etqw-bin/etqw-bin-1.5-r3.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop wrapper
 
 DESCRIPTION="Enemy Territory: Quake Wars"
 HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/ETQWFrontPage/"
 SRC_URI="http://ftp.jeuxlinux.fr/files/ETQW-client-${PV}-full.x86.run"
+S="${WORKDIR}"/data
 
 LICENSE="ETQW"
 SLOT="0"
@@ -14,57 +16,57 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="cdinstall"
 RESTRICT="bindist mirror strip"
 
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	virtual/jpeg-compat:62[abi_x86_32(-)]
+RDEPEND="
 	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
 	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+	sys-libs/glibc
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	cdinstall? ( games-fps/etqw-data )"
+	virtual/jpeg-compat:62[abi_x86_32(-)]
+	amd64? ( sys-libs/glibc[multilib] )
+	cdinstall? ( games-fps/etqw-data )
+"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/data
-dir=${GAMES_PREFIX_OPT}/etqw
+MY_DIR=opt/etqw
 
-QA_PREBUILT="${dir:1}/*.x86
-	${dir:1}/*.so*"
+QA_PREBUILT="
+	${MY_DIR:1}/*.x86
+	${MY_DIR:1}/*.so*
+"
 
 src_unpack() {
 	tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip
 	unpack ./${A}.zip
-	rm -f ${A}.zip
+	rm -f ${A}.zip || die
 }
 
 src_install() {
-	insinto "${dir}"
+	insinto ${MY_DIR}
 	doins -r base pb *.png
 	dodoc *.txt
 
-	exeinto "${dir}"
+	exeinto ${MY_DIR}
 	doexe etqw{,ded,-rthread}.x86 openurl.sh libCgx86.so libSDL*.id.so*
 
 	newicon etqw_icon.png etqw.png
-	games_make_wrapper etqw ./etqw.x86 "${dir}" "${dir}"
+	make_wrapper etqw ./etqw.x86 "${MY_DIR}" "${MY_DIR}"
 	make_desktop_entry etqw "Enemy Territory: Quake Wars" etqw
 
-	games_make_wrapper etqw-dedicated ./etqwded.x86 "${dir}" "${dir}"
+	make_wrapper etqw-dedicated ./etqwded.x86 "${MY_DIR}" "${MY_DIR}"
 	make_desktop_entry etqw-dedicated "Enemy Territory: Quake Wars (dedicated server)" etqw
 
-	games_make_wrapper etqw-rthread ./etqw-rthread.x86 "${dir}" "${dir}"
+	make_wrapper etqw-rthread ./etqw-rthread.x86 "${MY_DIR}" "${MY_DIR}"
 	make_desktop_entry etqw-rthread "Enemy Territory: Quake Wars (SMP)" etqw
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	if ! use cdinstall ; then
 		elog "You need to copy pak00*.pk4, zpak_*.pk4 and the megatextures"
-		elog "directory to ${dir}/base before running the game."
+		elog "directory to ${MY_DIR}/base before running the game."
 	fi
+
 	elog "To change the game language from English, add"
 	elog "seta sys_lang \"your_language\" to your autoexec.cfg file."
 	elog "Menu fonts may not show up until you do so."