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

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

1 files changed, 15 insertions, 19 deletions

diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06-r1.ebuild
index 102d80da46f6..b5931771e141 100644
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ b/games-fps/quake1-demodata/quake1-demodata-1.06-r1.ebuild
@@ -1,15 +1,15 @@
-# 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 versionator games
+EAPI=7
 
-MY_PV=$(delete_all_version_separators)
+MY_PV=$(ver_rs 1- '')
 MY_PN="quake"
 
 DESCRIPTION="Demo data for Quake 1"
 HOMEPAGE="https://en.wikipedia.org/wiki/Quake_I"
 SRC_URI="mirror://idsoftware/${MY_PN}/${MY_PN}${MY_PV}.zip"
+S="${WORKDIR}"
 
 # See licinfo.txt
 LICENSE="quake1-demodata"
@@ -18,15 +18,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE="symlink"
 
 RDEPEND="symlink? ( !games-fps/quake1-data )"
-DEPEND="app-arch/lha
-	app-arch/unzip"
+BDEPEND="
+	app-arch/lha
+	app-arch/unzip
+"
 
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/${MY_PN}1
+dir=usr/share/${MY_PN}1
 
 pkg_setup() {
-	games_pkg_setup
-
 	if has_version "games-fps/quake1-data" ; then
 		ewarn "games-fps/quake1-data already includes the demo data,"
 		ewarn "so this installation is not very useful."
@@ -37,31 +36,28 @@ src_unpack() {
 	unpack ${A}
 
 	# File rename for bug #159100
-	mv resource.{1,x}
+	mv resource.{1,x} || die
 
 	lha xfq resource.x || die "lha failed"
 	# Don't want to conflict with the cdinstall files
-	mv id1 demo
+	mv ID1 demo || die
 }
 
 src_install() {
-	insinto "${dir}"
+	insinto ${dir}
 	doins -r demo
 
-	dodoc *.txt
+	dodoc *.TXT
 
 	if use symlink ; then
 		# Make the demo the default, so that people can just run it,
 		# without having to mess with command-line options.
-		cd "${D}/${dir}" && ln -sfn demo id1
+		cd "${ED}/${dir}" || die
+		ln -sfn demo id1 || die
 	fi
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	elog "This is just the demo data."
 	elog "You will still need a Quake 1 client, to play, such as darkplaces."
 	echo