[gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-demodata/

[gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-demodata/

[Patrick Lauer]

commit:     ed17619550a4cb5c59c0ca435f3eb44d99b0ce57
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 14:16:07 2017 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 14:19:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed176195

games-fps/quake1-demodata: Whitespace

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 games-fps/quake1-demodata/quake1-demodata-1.06.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
index 82589d35c57..da7c8282e83 100644
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
@@ -1,5 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=5
 inherit eutils versionator games
 

[gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-demodata/

[Michał Górny]

commit:     ffbd8e6622baa6529007df6f00f8da893e05fe9c
Author:     Francesco Turco <fturco <AT> fastmail <DOT> fm>
AuthorDate: Thu Sep  7 15:09:52 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 09:54:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbd8e66

games-fps/quake1-demodata: use HTTPS for links to en.wikipedia.org, bug #637190

 games-fps/quake1-demodata/quake1-demodata-1.06.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
index da7c8282e83..7b8a34815e8 100644
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
@@ -8,7 +8,7 @@ MY_PV=$(delete_all_version_separators)
 MY_PN="quake"
 
 DESCRIPTION="Demo data for Quake 1"
-HOMEPAGE="http://en.wikipedia.org/wiki/Quake_I"
+HOMEPAGE="https://en.wikipedia.org/wiki/Quake_I"
 SRC_URI="mirror://idsoftware/${MY_PN}/${MY_PN}${MY_PV}.zip"
 
 # See licinfo.txt

[gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-demodata/

[James Le Cuirot]

commit:     a1afbecce678dfd52b34b35b65984ad8645a43ee
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 17:43:02 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 14:37:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1afbecc

games-fps/quake1-demodata: [QA] Remove ebeep and epause calls.

Closes: https://bugs.gentoo.org/646172
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/quake1-demodata/quake1-demodata-1.06.ebuild | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
index 7b8a34815e8..102d80da46f 100644
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="symlink"
 
-RDEPEND=""
+RDEPEND="symlink? ( !games-fps/quake1-data )"
 DEPEND="app-arch/lha
 	app-arch/unzip"
 
@@ -30,13 +30,6 @@ 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."
-		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
-		ebeep
-		epause
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-demodata/

[Sam James]

commit:     2fd7cf754a08aba95c1f10f8c4b5a17a1dd20914
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  7 01:06:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr  7 01:57:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd7cf75

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

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

 ...-1.06.ebuild => quake1-demodata-1.06-r1.ebuild} | 34 ++++++++++------------
 1 file 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
similarity index 76%
rename from games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
rename to games-fps/quake1-demodata/quake1-demodata-1.06-r1.ebuild
index 102d80da46f..b5931771e14 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