Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UT2004 Revival #13365

Closed
wants to merge 5 commits into from
Closed

UT2004 Revival #13365

wants to merge 5 commits into from

Conversation

SoapGentoo
Copy link
Member

No description provided.

Closes: https://bugs.gentoo.org/601402
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: David Seifert <soap@gentoo.org>
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: David Seifert <soap@gentoo.org>
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: David Seifert <soap@gentoo.org>
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: David Seifert <soap@gentoo.org>
* EAPI 7
* Fetching should work again

Bug: https://bugs.gentoo.org/601402
Signed-off-by: David Seifert <soap@gentoo.org>
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @SoapGentoo
Areas affected: ebuilds, profiles
Packages affected: games-fps/ut2004, games-fps/ut2004-bonuspack-ece, games-fps/ut2004-bonuspack-mega, games-fps/ut2004-data

games-fps/ut2004: @gentoo/games
games-fps/ut2004-bonuspack-ece: @gentoo/games
games-fps/ut2004-bonuspack-mega: @gentoo/games
games-fps/ut2004-data: @gentoo/games

Linked bugs

Bugs linked: 601402


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Oct 20, 2019
@chewi chewi self-assigned this Oct 20, 2019
@gentoo-repo-qa-bot
Copy link
Collaborator

src_prepare() {
default

mv -f UT2004MegaPack/* . || die
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not change S instead?


src_install() {
insinto /opt/ut2004
doins -r Animations Help Maps Sounds StaticMeshes System Textures
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't * work here? Especially that there's a lot of rm-ing anyway.

rm StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx || die

# System
rm System/{AL,AS-,B,b,C,D,E,F,G,I,L,O,o,S,s,U,V,W,X,x}* || die
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yyyyyy, wouldn't a whitelist (i.e. installing files selectively) work better here?

uz2unpack "${ut_unpack}/${f}" "${ut_unpack}/${f%.uz2}" \
|| die "uncompressing file ${f}"
rm -f "${ut_unpack}/${f}" || die "deleting compressed file ${f}"
done < <(find "${ut_unpack}" -maxdepth 1 -name '*.uz2' -printf '%f\n' 2>/dev/null)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not -print0?

done

make_wrapper ut2004 ./ut2004-bin "${dir}"/System "${dir}"/System "${dir}"
make_wrapper ut2004 ./ut2004-bin /opt/ut2004/System /opt/ut2004/System /opt/ut2004

# Remove unneccessary files
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You realize that keeping a huge blacklist is just insane?

@chewi
Copy link
Member

chewi commented Oct 21, 2019

@mgorny, I think all the things you've commented on are issues with the existing ebuild. I think it could be a lot simpler but it's a big job we don't have time for before the last-rite. I may look into it afterwards as I have interest in this game and I do have the DVD. As things stand, it does install for me.

@chewi
Copy link
Member

chewi commented Oct 23, 2019

@SoapGentoo, what are you doing about the ut2004-ded package? The /opt/ut2004-ded symlink you have created in the bonuspack packages will collide with this. Furthermore, I don't want to have to create that symlink in all the other mod packages. Could we just have ut2004-ded and ut2004 block each other entirely (instead of just ut2004[dedicated]) so that we can install them to the same place and avoid this whole mess?

DESCRIPTION="Editor's Choice Edition plus Mega Pack for the well-known first-person shooter"
HOMEPAGE="http://www.unrealtournament2004.com/"
SRC_URI="
http://treefort.icculus.org/${PN}/${MY_P}
http://ut2004.ut-files.com/index.php?dir=Patches/Linux/&file=${MY_P} -> ${MY_P}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can just be https://ut2004.ut-files.com/Patches/Linux/${MY_P}.

@chewi
Copy link
Member

chewi commented Oct 27, 2019

This is now merged with a bunch of tweaks. Thanks!

@chewi chewi closed this Oct 27, 2019
@SoapGentoo SoapGentoo deleted the ut2004 branch December 11, 2019 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR.
Projects
None yet
5 participants