* [gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-data/
@ 2016-01-12 7:47 Michael Sterrett
0 siblings, 0 replies; 4+ messages in thread
From: Michael Sterrett @ 2016-01-12 7:47 UTC (permalink / raw
To: gentoo-commits
commit: 518849507a5f7d466ef010bc8eb60f109e58b6ee
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 07:45:14 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 07:47:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51884950
games-fps/quake1-data: EAPI=5
Package-Manager: portage-2.2.26
games-fps/quake1-data/quake1-data-2.40.ebuild | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild
index 1e7eff5..03074c5 100644
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40.ebuild
@@ -7,7 +7,7 @@
# http://linux.omnipotent.net/article.php?article_id=11287
# ftp://ftp.cdrom.com/pub/idgames/idstuff/quake/quake106.zip
-EAPI=2
+EAPI=5
inherit eutils cdrom games
DESCRIPTION="iD Software's Quake 1 ... the data files"
@@ -41,27 +41,25 @@ src_unpack() {
echo ">>> Unpacking q101_int.lha to ${PWD}"
cat "${CDROM_ROOT}"/q101_int.1 "${CDROM_ROOT}"/q101_int.2 > \
"${S}"/q101_int.exe
- lha xqf "${S}"/q101_int.exe || die "failure unpacking q101_int.exe"
+ lha xqf "${S}"/q101_int.exe || die
rm -f q101_int.exe
elif [[ ${CDROM_SET} == "3" ]] ; then
echo ">>> Unpacking resource.1 to ${PWD}"
- lha xqf "${CDROM_ROOT}"/resource.1 || die "failure unpacking resource.1"
+ lha xqf "${CDROM_ROOT}"/resource.1 || die
fi
}
src_install() {
insinto "${GAMES_DATADIR}"/quake1/id1
case ${CDROM_SET} in
- 0) doins "${CDROM_ROOT}"/id1/* || die "doins pak files"
+ 0) doins "${CDROM_ROOT}"/id1/*
dodoc "${CDROM_ROOT}"/*.txt
;;
- 1|3)doins id1/* || die "doins pak files"
+ 1|3)doins id1/*
dodoc *.txt
;;
- 2) newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak \
- || die "ins pak0.pak failed"
- newins "${CDROM_ROOT}"/Setup/ID1/PAK1.PAK pak1.pak \
- || die "ins pak1.pak failed"
+ 2) newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak
+ newins "${CDROM_ROOT}"/Setup/ID1/PAK1.PAK pak1.pak
dodoc "${CDROM_ROOT}"/Docs/*
;;
esac
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-data/
@ 2016-05-04 20:42 Michael Sterrett
0 siblings, 0 replies; 4+ messages in thread
From: Michael Sterrett @ 2016-05-04 20:42 UTC (permalink / raw
To: gentoo-commits
commit: f8c3f9907a86a0fd3bdf7bbde82a54e80177733b
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 20:13:09 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed May 4 20:41:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c3f990
games-fps/quake1-data: use blocker instead of pkg_setup code (bug #581536)
Package-Manager: portage-2.2.26
games-fps/quake1-data/quake1-data-2.40.ebuild | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild
index 03074c5..602e5db 100644
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,20 +20,10 @@ KEYWORDS="amd64 ~ia64 ppc x86"
IUSE=""
DEPEND="app-arch/lha"
-RDEPEND=""
+RDEPEND="!games-fps/quake1-demodata[symlink]"
S=${WORKDIR}
-pkg_setup() {
- games_pkg_setup
-
- if has_version games-fps/quake1-demodata && \
- ! has_version "games-fps/quake1-demodata[symlink]" ; then
- eerror "The symlink for the demo data conflicts with the cdinstall data"
- die "Unmerge games-fps/quake1-demodata to remove the conflict"
- fi
-}
-
src_unpack() {
export CDROM_NAME_SET=("Existing Install" "Quake CD (1.01)" "Ultimate Quake Collection" "Quake CD (newer)")
cdrom_get_cds id1:q101_int.1:Setup/ID1:resource.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-data/
@ 2021-04-07 1:58 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-04-07 1:58 UTC (permalink / raw
To: gentoo-commits
commit: 365e36d515a42a6dd5c847298641d263f75a9d50
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 7 01:09:31 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 7 01:57:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=365e36d5
games-fps/quake1-data: port to EAPI 7, games.eclass--
Signed-off-by: Sam James <sam <AT> gentoo.org>
...data-2.40.ebuild => quake1-data-2.40-r1.ebuild} | 34 ++++++++++++----------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40-r1.ebuild
similarity index 74%
rename from games-fps/quake1-data/quake1-data-2.40.ebuild
rename to games-fps/quake1-data/quake1-data-2.40-r1.ebuild
index 6c3c9e1eb19..ed730aa32cb 100644
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# TODO: if installing off of the 1.01 cd, need to fetch the
@@ -6,51 +6,53 @@
# http://linux.omnipotent.net/article.php?article_id=11287
# ftp://ftp.cdrom.com/pub/idgames/idstuff/quake/quake106.zip
-EAPI=5
-inherit eutils cdrom games
+EAPI=7
+
+inherit cdrom
DESCRIPTION="iD Software's Quake 1 ... the data files"
HOMEPAGE="https://www.idsoftware.com/games/quake/quake/"
-SRC_URI=""
+S="${WORKDIR}"
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="app-arch/lha"
RDEPEND="!games-fps/quake1-demodata[symlink]"
-
-S=${WORKDIR}
+BDEPEND="app-arch/lha"
src_unpack() {
export CDROM_NAME_SET=("Existing Install" "Quake CD (1.01)" "Ultimate Quake Collection" "Quake CD (newer)")
cdrom_get_cds id1:q101_int.1:Setup/ID1:resource.1
+
if [[ ${CDROM_SET} == "1" ]] ; then
- echo ">>> Unpacking q101_int.lha to ${PWD}"
+ elog "Unpacking q101_int.lha to ${PWD}"
cat "${CDROM_ROOT}"/q101_int.1 "${CDROM_ROOT}"/q101_int.2 > \
"${S}"/q101_int.exe
+
lha xqf "${S}"/q101_int.exe || die
- rm -f q101_int.exe
+ rm -f q101_int.exe || die
elif [[ ${CDROM_SET} == "3" ]] ; then
- echo ">>> Unpacking resource.1 to ${PWD}"
+ elog "Unpacking resource.1 to ${PWD}"
lha xqf "${CDROM_ROOT}"/resource.1 || die
fi
}
src_install() {
- insinto "${GAMES_DATADIR}"/quake1/id1
+ insinto /usr/share/quake1/id1
case ${CDROM_SET} in
- 0) doins "${CDROM_ROOT}"/id1/*
+ 0)
+ doins "${CDROM_ROOT}"/id1/*
dodoc "${CDROM_ROOT}"/*.txt
;;
- 1|3)doins id1/*
+ 1|3)
+ doins id1/*
dodoc *.txt
;;
- 2) newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak
+ 2)
+ newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak
newins "${CDROM_ROOT}"/Setup/ID1/PAK1.PAK pak1.pak
dodoc "${CDROM_ROOT}"/Docs/*
;;
esac
- prepgamesdirs
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-data/
@ 2023-12-09 8:54 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2023-12-09 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 06eaf3bc64a09c586e3add31732829f71aa4bd37
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 08:44:17 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 08:44:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06eaf3bc
games-fps/quake1-data: Add bindist restriction
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
games-fps/quake1-data/quake1-data-2.40-r1.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/games-fps/quake1-data/quake1-data-2.40-r1.ebuild b/games-fps/quake1-data/quake1-data-2.40-r1.ebuild
index ed730aa32cb3..974117cb7bf2 100644
--- a/games-fps/quake1-data/quake1-data-2.40-r1.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# TODO: if installing off of the 1.01 cd, need to fetch the
@@ -17,6 +17,7 @@ S="${WORKDIR}"
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist"
RDEPEND="!games-fps/quake1-demodata[symlink]"
BDEPEND="app-arch/lha"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-09 8:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-09 8:54 [gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-data/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2021-04-07 1:58 Sam James
2016-05-04 20:42 Michael Sterrett
2016-01-12 7:47 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox