From fb43d595458946ec20cc09c0dc89ef91ae1b346c Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 7 Apr 2021 01:26:05 +0000
Subject: games-fps/quake2-demodata: port to EAPI 7, games.eclass--

Signed-off-by: Sam James <sam@gentoo.org>
---
 .../quake2-demodata/quake2-demodata-3.14-r1.ebuild | 57 +++++++++++++++++++++
 .../quake2-demodata/quake2-demodata-3.14.ebuild    | 59 ----------------------
 2 files changed, 57 insertions(+), 59 deletions(-)
 create mode 100644 games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild
 delete mode 100644 games-fps/quake2-demodata/quake2-demodata-3.14.ebuild

(limited to 'games-fps')

diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild b/games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild
new file mode 100644
index 000000000000..b7fe8cd32c7d
--- /dev/null
+++ b/games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker
+
+#MY_PV=$(delete_all_version_separators)
+MY_PV=$(ver_rs 1- '')
+MY_PN="quake2"
+FILE="q2-${MY_PV}-demo-x86.exe"
+
+DESCRIPTION="Demo data for Quake 2"
+HOMEPAGE="https://en.wikipedia.org/wiki/Quake_II"
+SRC_URI="mirror://idsoftware/${MY_PN}/${FILE}"
+S="${WORKDIR}"
+
+# See license.txt - it's a bit different to Q2EULA in Portage
+LICENSE="quake2-demodata"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="symlink"
+
+RDEPEND="!games-fps/quake2-data" # games-fps/quake2-data already includes the demo data
+BDEPEND="app-arch/unzip"
+
+dir=usr/share/${MY_PN}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	insinto ${dir}/demo
+	doins -r Install/Data/baseq2/{pak0.pak,players}
+
+	dodoc Install/Data/DOCS/*.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 "${ED}"/${dir} || die
+		ln -sfn demo baseq2 || die
+	fi
+}
+
+pkg_postinst() {
+	elog "This is just the demo data. To play, install a client"
+	elog "such as games-fps/qudos"
+	echo
+
+	if use symlink ; then
+		elog "baseq2 has been symlinked to demo, for convenience, within:"
+		elog "${dir}"
+		echo
+	fi
+}
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
deleted file mode 100644
index bcca12997738..000000000000
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker eutils versionator games
-
-MY_PV=$(delete_all_version_separators)
-MY_PN="quake2"
-FILE="q2-${MY_PV}-demo-x86.exe"
-
-DESCRIPTION="Demo data for Quake 2"
-HOMEPAGE="https://en.wikipedia.org/wiki/Quake_II"
-SRC_URI="mirror://idsoftware/${MY_PN}/${FILE}"
-
-# See license.txt - it's a bit different to Q2EULA in Portage
-LICENSE="quake2-demodata"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE="symlink"
-
-RDEPEND=""
-DEPEND="app-arch/unzip
-	!games-fps/quake2-data" # games-fps/quake2-data already includes the demo data
-
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/${MY_PN}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_install() {
-	insinto "${dir}"/demo
-	doins -r Install/Data/baseq2/{pak0.pak,players}
-
-	dodoc Install/Data/DOCS/*.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 baseq2
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "This is just the demo data. To play, install a client"
-	elog "such as games-fps/qudos"
-	echo
-
-	if use symlink ; then
-		elog "baseq2 has been symlinked to demo, for convenience, within:"
-		elog "${dir}"
-		echo
-	fi
-}
-- 
cgit v1.2.3-65-gdbad