[gentoo-commits] repo/gentoo:master commit in: games-fps/quake2-demodata/
commit: fb43d595458946ec20cc09c0dc89ef91ae1b346c
Author: Sam James gentoo org>
AuthorDate: Wed Apr 7 01:26:05 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 7 01:57:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb43d595
games-fps/quake2-demodata: port to EAPI 7, games.eclass--
Signed-off-by: Sam James gentoo.org>
...-3.14.ebuild => quake2-demodata-3.14-r1.ebuild} | 28 ++
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
b/games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild
similarity index 70%
rename from games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
rename to games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild
index bcca1299773..b7fe8cd32c7 100644
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ b/games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild
@@ -1,16 +1,19 @@
-# 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_PV=$(delete_all_version_separators)
+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"
@@ -18,19 +21,17 @@ 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
+RDEPEND="!games-fps/quake2-data" # games-fps/quake2-data already includes the
demo data
+BDEPEND="app-arch/unzip"
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/${MY_PN}
+dir=usr/share/${MY_PN}
src_unpack() {
unpack_zip ${A}
}
src_install() {
- insinto "${dir}"/demo
+ insinto ${dir}/demo
doins -r Install/Data/baseq2/{pak0.pak,players}
dodoc Install/Data/DOCS/*.txt
@@ -38,15 +39,12 @@ src_install() {
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
+ cd "${ED}"/${dir} || die
+ ln -sfn demo baseq2 || die
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
[gentoo-commits] repo/gentoo:master commit in: games-fps/quake2-demodata/
commit: d2be3272db692fc323f58513b8c6462086fca553
Author: Francesco Turco fastmail fm>
AuthorDate: Thu Sep 7 15:10:38 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Jan 27 09:54:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2be3272
games-fps/quake2-demodata: use HTTPS for links to en.wikipedia.org, bug #637190
games-fps/quake2-demodata/quake2-demodata-3.14.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
index 03f9521ff9f..cd68c344cd8 100644
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ MY_PN="quake2"
FILE="q2-${MY_PV}-demo-x86.exe"
DESCRIPTION="Demo data for Quake 2"
-HOMEPAGE="http://en.wikipedia.org/wiki/Quake_II;
+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
[gentoo-commits] repo/gentoo:master commit in: games-fps/quake2-demodata/
commit: eb1bb488397f4ff3250ab7e0a4025a3a5f0d219a
Author: Michael Sterrett gentoo org>
AuthorDate: Wed May 18 04:42:16 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Wed May 18 05:17:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1bb488
games-fps/quake2-demodata: stable for amd64
Package-Manager: portage-2.2.28
games-fps/quake2-demodata/quake2-demodata-3.14.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
index 7c16869..5c7b39c 100644
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
@@ -1,6 +1,7 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
+
EAPI=5
inherit unpacker eutils versionator games
@@ -15,7 +16,7 @@ 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 ~ia64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-fbsd"
IUSE="symlink"
RDEPEND=""
[gentoo-commits] repo/gentoo:master commit in: games-fps/quake2-demodata/
commit: 9c4b960182331244f3295ed59d3f12188f083fc5
Author: Michael Sterrett gentoo org>
AuthorDate: Sat Apr 16 23:22:35 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Sun Apr 17 01:55:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4b9601
games-fps/quake2-demodata: add blocker on games-fps/quake2-data since that
already includes the demo data; tidy
Package-Manager: portage-2.2.26
.../quake2-demodata/quake2-demodata-3.14.ebuild| 34 ++
1 file changed, 3 insertions(+), 31 deletions(-)
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
index 132919c..7c16869 100644
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
@@ -19,40 +19,12 @@ KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc x86 ~x86-fbsd"
IUSE="symlink"
RDEPEND=""
-DEPEND="app-arch/unzip"
+DEPEND="app-arch/unzip
+ !games-fps/quake2-data" # games-fps/quake2-data already includes the
demo data
S=${WORKDIR}
dir=${GAMES_DATADIR}/${MY_PN}
-pkg_setup() {
- games_pkg_setup
-
- local alert_user
-
- if ! use symlink ; then
- ewarn "The 'symlink' USE flag is needed for Quake 2 clients"
- ewarn "to easily play the demo data."
- echo
- alert_user=y
- fi
-
- if has_version "games-fps/quake2-data" ; then
- ewarn "games-fps/quake2-data already includes the demo data,"
- ewarn "so this installation is not very useful."
- echo
- if use symlink ; then
- eerror "The symlink for the demo data conflicts with
the cdinstall data"
- die "Remove the 'symlink' USE flag for this package"
- fi
- alert_user=y
- fi
-
- if [[ -n "${alert_user}" ]] ; then
- ebeep
- epause
- fi
-}
-
src_unpack() {
unpack_zip ${A}
}
