* [gentoo-commits] repo/gentoo:master commit in: games-fps/ut2003-data/
@ 2021-04-10 6:18 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-04-10 6:18 UTC (permalink / raw
To: gentoo-commits
commit: 61279c8447e65ed974d5191778916aa96a1adea3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 05:08:25 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 06:17:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61279c84
games-fps/ut2003-data: add missing desktop inherit
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{ut2003-data-2107-r1.ebuild => ut2003-data-2107-r2.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-fps/ut2003-data/ut2003-data-2107-r1.ebuild b/games-fps/ut2003-data/ut2003-data-2107-r2.ebuild
similarity index 98%
rename from games-fps/ut2003-data/ut2003-data-2107-r1.ebuild
rename to games-fps/ut2003-data/ut2003-data-2107-r2.ebuild
index 6172322c0c1..ac69da5ef17 100644
--- a/games-fps/ut2003-data/ut2003-data-2107-r1.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cdrom unpacker
+inherit desktop cdrom unpacker
DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 multi-player first-person shooter"
HOMEPAGE="http://www.unrealtournament2003.com/"
@@ -37,7 +37,7 @@ src_unpack() {
src_install() {
# Inlined from games.eclass
_games_ut_unpack() {
- local ut_unpack="$1"
+ local ut_unpack="${1}"
local f=
if [[ -z ${ut_unpack} ]] ; then
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-fps/ut2003-data/
@ 2021-04-09 19:33 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-04-09 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 684814c10971208de75633fdd4bd0d89208f3176
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 9 19:20:34 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 9 19:31:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684814c1
games-fps/ut2003-data: port to EAPI 7, games.eclass--
Signed-off-by: Sam James <sam <AT> gentoo.org>
...data-2107.ebuild => ut2003-data-2107-r1.ebuild} | 53 +++++++++++++++-------
1 file changed, 36 insertions(+), 17 deletions(-)
diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107-r1.ebuild
similarity index 78%
rename from games-fps/ut2003-data/ut2003-data-2107.ebuild
rename to games-fps/ut2003-data/ut2003-data-2107-r1.ebuild
index 44433cc98f3..4d14d47851c 100644
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107-r1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils unpacker cdrom games
+EAPI=7
+
+inherit cdrom unpacker
DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 multi-player first-person shooter"
HOMEPAGE="http://www.unrealtournament2003.com/"
SRC_URI="https://dev.gentoo.org/~chewi/distfiles/UT2003CrashFix.zip" # MIT licensed (bug #754360)
+S="${WORKDIR}"
LICENSE="ut2003 MIT"
SLOT="0"
@@ -14,17 +16,15 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="bindist strip"
-RDEPEND=""
-DEPEND="app-arch/unzip
- games-util/uz2unpack"
-
-S=${WORKDIR}
+BDEPEND="
+ app-arch/unzip
+ games-util/uz2unpack
+"
-dir=${GAMES_PREFIX_OPT}/ut2003
-Ddir=${D}/${dir}
+dir=opt/ut2003
+Ddir="${ED}"/${dir}
pkg_setup() {
- games_pkg_setup
ewarn "The installed game takes about 2.7GB of space!"
}
@@ -35,6 +35,27 @@ src_unpack() {
}
src_install() {
+ # Inlined from games.eclass
+ _games_ut_unpack() {
+ local ut_unpack="$1"
+ local f=
+
+ if [[ -z ${ut_unpack} ]] ; then
+ die "You must provide an argument to games_ut_unpack"
+ fi
+
+ if [[ -f ${ut_unpack} ]] ; then
+ uz2unpack "${ut_unpack}" "${ut_unpack%.uz2}" || die "failed uncompressing file ${ut_unpack}"
+ fi
+
+ if [[ -d ${ut_unpack} ]] ; then
+ while read f ; do
+ uz2unpack "${ut_unpack}/${f}" "${ut_unpack}/${f%.uz2}" || die "failed uncompressing file ${f}"
+ rm -f "${ut_unpack}/${f}" || die "failed deleting compressed file ${f}"
+ done < <(find "${ut_unpack}" -maxdepth 1 -name '*.uz2' -printf '%f\n' 2>/dev/null)
+ fi
+ }
+
insinto "${dir}"
# Disk 1
einfo "Copying files from Disk 1..."
@@ -83,7 +104,7 @@ src_install() {
insinto "${dir}"/System
doins "${S}"/System/Def{ault,User}.ini
- # install eula
+ # install EULA
insinto "${dir}"
doins "${S}"/eula/License.int
@@ -98,19 +119,19 @@ src_install() {
# uncompressing files
einfo "Uncompressing files... this may take a while..."
for j in {Animations,Maps,Sounds,StaticMeshes,Textures} ; do
- games_ut_unpack "${Ddir}"/${j} || die "uncompressing files"
+ _games_ut_unpack "${Ddir}"/${j} || die "uncompressing files"
done
# installing documentation/icon
dodoc "${S}"/README.linux
- newicon "${S}"/Unreal.xpm ut2003.xpm || die "copying icon"
+ newicon "${S}"/Unreal.xpm ut2003.xpm
doins "${S}"/README.linux "${S}"/Unreal.xpm
# copy ut2003/ucc
exeinto "${dir}"
doexe "${S}"/bin/ut2003 "${S}"/ucc
# Here we apply DrSiN's crash patch
- cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System
+ cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System || die
ed "${Ddir}"/System/Default.ini >/dev/null 2>&1 <<EOT
$
@@ -130,6 +151,4 @@ EOT
# be different ... that means portage will try to unmerge some files (!)
# we run touch on ${D} so as to make sure portage doesnt do any such thing
find "${Ddir}" -exec touch '{}' + || die
-
- prepgamesdirs
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-fps/ut2003-data/
@ 2021-04-09 19:33 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-04-09 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 09f253b4b93ab76b77b554a91484f1aea22c75be
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 9 19:32:50 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 9 19:32:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09f253b4
games-fps/ut2003-data: fix MissingLicenseRestricts (mirror)
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-fps/ut2003-data/ut2003-data-2107-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-fps/ut2003-data/ut2003-data-2107-r1.ebuild b/games-fps/ut2003-data/ut2003-data-2107-r1.ebuild
index 4d14d47851c..6172322c0c1 100644
--- a/games-fps/ut2003-data/ut2003-data-2107-r1.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="ut2003 MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RESTRICT="bindist strip"
+RESTRICT="bindist mirror strip"
BDEPEND="
app-arch/unzip
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/ut2003-data/
@ 2020-11-23 22:18 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2020-11-23 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 9db48380d3d2dc5372a6cf78957959d95864d6ce
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 22:16:09 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 22:16:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9db48380
games-fps/ut2003-data: RESTRICT bindist, fix SRC_URI, crash fix is MIT
Closes: https://bugs.gentoo.org/754360
Package-Manager: Portage-3.0.10, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-fps/ut2003-data/ut2003-data-2107.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107.ebuild
index 4a77c1f15e5..44433cc98f3 100644
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,13 +6,13 @@ inherit eutils unpacker cdrom games
DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 multi-player first-person shooter"
HOMEPAGE="http://www.unrealtournament2003.com/"
-SRC_URI="http://download.factoryunreal.com/mirror/UT2003CrashFix.zip"
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/UT2003CrashFix.zip" # MIT licensed (bug #754360)
-LICENSE="ut2003"
+LICENSE="ut2003 MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RESTRICT="strip"
+RESTRICT="bindist strip"
RDEPEND=""
DEPEND="app-arch/unzip
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/ut2003-data/
@ 2017-12-01 19:31 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-12-01 19:31 UTC (permalink / raw
To: gentoo-commits
commit: acc96a29954482e2f385fa41dc4d6b0eb0ea2976
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 1 18:56:49 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 1 19:28:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acc96a29
games-fps/ut2003-data: [QA] Fix DESCRIPTION.toolong
games-fps/ut2003-data/ut2003-data-2107.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107.ebuild
index ccd587855ce..933dc8498d8 100644
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107.ebuild
@@ -4,7 +4,7 @@
EAPI=5
inherit eutils unpacker cdrom games
-DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 Game of the Year multi-player first-person shooter"
+DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 multi-player first-person shooter"
HOMEPAGE="http://www.unrealtournament2003.com/"
SRC_URI="http://download.factoryunreal.com/mirror/UT2003CrashFix.zip"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/ut2003-data/
@ 2016-01-12 20:51 Michael Sterrett
0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett @ 2016-01-12 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 7c6ca1960b7c781a42b20062ff665ddadf14c9b8
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 20:20:17 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 20:51:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6ca196
games-fps/ut2003-data: EAPI=5
Package-Manager: portage-2.2.26
games-fps/ut2003-data/ut2003-data-2107.ebuild | 57 ++++++++++++---------------
1 file changed, 25 insertions(+), 32 deletions(-)
diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107.ebuild
index 78f5c14..0e600f5 100644
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+EAPI=5
inherit eutils unpacker cdrom games
DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 Game of the Year multi-player first-person shooter"
@@ -31,56 +32,49 @@ pkg_setup() {
src_unpack() {
cdrom_get_cds System/Packages.md5 StaticMeshes/AWHardware.usx.uz2 \
Extras/MayaPLE/Maya4PersonalLearningEditionEpic.exe
- unzip "${DISTDIR}"/UT2003CrashFix.zip \
- || die "unpacking crash-fix"
+ unzip "${DISTDIR}"/UT2003CrashFix.zip || die
}
src_install() {
insinto "${dir}"
# Disk 1
einfo "Copying files from Disk 1..."
- doins -r "${CDROM_ROOT}"/{Animations,ForceFeedback,KarmaData,Maps,Sounds,Textures,Web} || die "copying files"
+ doins -r "${CDROM_ROOT}"/{Animations,ForceFeedback,KarmaData,Maps,Sounds,Textures,Web}
insinto "${dir}"/System
- doins -r "${CDROM_ROOT}"/System/{editorres,*.{bmp,dat,det,est,frt,ini,int,itt,md5,u,upl,url}} || die "copying files"
+ doins -r "${CDROM_ROOT}"/System/{editorres,*.{bmp,dat,det,est,frt,ini,int,itt,md5,u,upl,url}}
insinto "${dir}"/Benchmark/Stuff
- doins -r "${CDROM_ROOT}"/Benchmark/Stuff/* || die "copying benchmark files"
+ doins -r "${CDROM_ROOT}"/Benchmark/Stuff/*
cdrom_load_next_cd
# Disk 2
insinto "${dir}"
einfo "Copying files from Disk 2..."
- doins -r "${CDROM_ROOT}"/{Music,Sounds,StaticMeshes,Textures} \
- || die "copying files"
+ doins -r "${CDROM_ROOT}"/{Music,Sounds,StaticMeshes,Textures}
cdrom_load_next_cd
# Disk 3
einfo "Copying files from Disk 3..."
- doins -r "${CDROM_ROOT}"/Sounds || die "copying files"
+ doins -r "${CDROM_ROOT}"/Sounds
# TODO: move this to src_unpack, where it belongs
- unpack_makeself "${CDROM_ROOT}"/linux_installer.sh \
- || die "unpacking linux installer"
- tar xf "${S}"/ut2003lnxbins.tar \
- || die "unpacking original binaries/libraries"
+ unpack_makeself "${CDROM_ROOT}"/linux_installer.sh || die
+ tar xf "${S}"/ut2003lnxbins.tar || die
# create empty files in Benchmark
for j in {CSVs,Logs,Results} ; do
- mkdir -p "${Ddir}"/Benchmark/${j} || die "creating folders"
- touch "${Ddir}"/Benchmark/${j}/DO_NOT_DELETE.ME || die "creating files"
+ mkdir -p "${Ddir}"/Benchmark/${j} || die
+ touch "${Ddir}"/Benchmark/${j}/DO_NOT_DELETE.ME || die
done
# Cleaning up our installation
- rm "${Ddir}"/System/{Build,Def{ault,User},Manifest,UT2003,User}.ini \
- || die "deleting ini files"
- rm -f "${Ddir}"/System/{Core,Engine,Setup,UnrealGame,Window,XGame,XInterface,XWeapons}.{det,est,frt,int,itt,u} || die "deleting files that have been patched"
- rm -rf "${Ddir}"/Web/ServerAdmin || die "deleting server admin web pages"
- rm -f "${Ddir}"/System/{Editor,Fire,IpDrv,UnrealEd,Vehicles,XEffects,XPickups,XWebAdmin}.u || die "removing files that will be coming from the patch"
- rm -f "${Ddir}"/System/{UWeb,XAdmin}.{int,u} || die "removing patched files"
- rm -f "${Ddir}"/System/GamePlay.{det,itt,u} || die "patch files removal"
- rm -f "${Ddir}"/System/XMaps.{det,est} "${Ddir}"/System/Xweapons.itt \
- || die "removing unused files"
- rm -f "${Ddir}"/System/Manifest.int "${Ddir}"/System/Packages.md5 \
- || die "cleanup"
+ rm "${Ddir}"/System/{Build,Def{ault,User},Manifest,UT2003,User}.ini || die
+ rm -f "${Ddir}"/System/{Core,Engine,Setup,UnrealGame,Window,XGame,XInterface,XWeapons}.{det,est,frt,int,itt,u} || die
+ rm -rf "${Ddir}"/Web/ServerAdmin || die
+ rm -f "${Ddir}"/System/{Editor,Fire,IpDrv,UnrealEd,Vehicles,XEffects,XPickups,XWebAdmin}.u || die
+ rm -f "${Ddir}"/System/{UWeb,XAdmin}.{int,u} || die
+ rm -f "${Ddir}"/System/GamePlay.{det,itt,u} || die
+ rm -f "${Ddir}"/System/XMaps.{det,est} "${Ddir}"/System/Xweapons.itt || die
+ rm -f "${Ddir}"/System/Manifest.int "${Ddir}"/System/Packages.md5 || die
# install extra help files
insinto "${dir}"/Help
@@ -95,13 +89,12 @@ src_install() {
doins "${S}"/eula/License.int
# copying extra/updater
- doins -r "${S}"/{extras,updater} || die "copying extras/updater"
- rm -f "${Ddir}"/updater/update || die "removing update"
+ doins -r "${S}"/{extras,updater}
+ rm -f "${Ddir}"/updater/update || die
# copy libraries
exeinto "${dir}"/System
- doexe "${S}"/System/libSDL-1.2.so.0 \
- || die "copying libSDL"
+ doexe "${S}"/System/libSDL-1.2.so.0 || die
# uncompressing files
einfo "Uncompressing files... this may take a while..."
@@ -131,13 +124,13 @@ q
EOT
# Here we apply fix for bug #54726
- dosed "s:UplinkToGamespy=True:UplinkToGamespy=False:" \
- "${dir}"/System/Default.ini
+ sed -i -e "s:UplinkToGamespy=True:UplinkToGamespy=False:" \
+ "${Ddir}"/System/Default.ini || die
# now, since these files are coming off a cd, the times/sizes/md5sums wont
# be different ... that means portage will try to unmerge some files (!)
# we run touch on ${D} so as to make sure portage doesnt do any such thing
- find "${Ddir}" -exec touch '{}' \;
+ find "${Ddir}" -exec touch '{}' + || die
prepgamesdirs
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-10 6:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-10 6:18 [gentoo-commits] repo/gentoo:master commit in: games-fps/ut2003-data/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-04-09 19:33 Sam James
2021-04-09 19:33 Sam James
2020-11-23 22:18 James Le Cuirot
2017-12-01 19:31 David Seifert
2016-01-12 20:51 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox