[gentoo-commits] repo/gentoo:master commit in: games-fps/etqw-demo/

["Sam James" <sam@gentoo.org>]

commit:     c4f81592921a4a86f40b35999d435c79a2784e64
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 19:45:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 19:45:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f81592

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

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

 ...2.0_p1-r2.ebuild => etqw-demo-2.0_p1-r3.ebuild} | 42 ++++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1-r3.ebuild
similarity index 64%
rename from games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild
rename to games-fps/etqw-demo/etqw-demo-2.0_p1-r3.ebuild
index 862cea3fb0d..244db5ad24e 100644
--- a/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild
+++ b/games-fps/etqw-demo/etqw-demo-2.0_p1-r3.ebuild
@@ -1,37 +1,43 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit unpacker eutils versionator games
+EAPI=7
 
-MY_MAJOR=$(get_major_version)
-MY_REV=$(get_version_component_range 3)
+inherit desktop unpacker wrapper
+
+MY_MAJOR=$(ver_cut 1)
+MY_REV=$(ver_cut 3-)
 MY_BODY="ETQW-demo${MY_MAJOR}-client-full.r${MY_REV/p/}.x86"
 
 DESCRIPTION="Enemy Territory: Quake Wars demo"
 HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
 SRC_URI="mirror://idsoftware/etqw/${MY_BODY}.run"
+S="${WORKDIR}"
 
 # See copyrights.txt
 LICENSE="ETQW"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="bindist strip mirror"
 
-DEPEND="app-arch/unzip"
-RDEPEND=">=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(-)]
+	sys-libs/ncurses-compat[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	virtual/jpeg-compat:62[abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+"
 
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
+BDEPEND="app-arch/unzip"
 
-QA_PREBUILT="${dir:1}/guis/libmojosetupgui_ncurses.so
+dir=opt/${PN}
+
+QA_PREBUILT="
+	${dir:1}/guis/libmojosetupgui_ncurses.so
 	${dir:1}/data/*
-	${dir:1}/data/pb/*.so"
+	${dir:1}/data/pb/*.so
+"
 
 src_unpack() {
 	# exit status of 1 should just be warnings, not corrupt archive
@@ -42,7 +48,7 @@ src_install() {
 	insinto "${dir}"
 	doins -r guis scripts
 
-	cd data
+	cd data || die
 	insinto "${dir}"/data
 	doins -r base pb etqw_icon.png
 	dodoc README.txt EULA.txt copyrights.txt etqwtv.txt
@@ -50,11 +56,9 @@ src_install() {
 	exeinto "${dir}"/data
 	doexe etqw *\.x86 etqw-* libCgx86* libSDL* *.sh
 
-	games_make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data
+	make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data
 	# Matches with desktop entry for enemy-territory-truecombat
 	make_desktop_entry ${PN} "Enemy Territory - Quake Wars (Demo)"
 
-	games_make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data
-
-	prepgamesdirs
+	make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data
 }