From 3a8cea2dde4138e3e0726b45a85f5aa28b0d73f4 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 31 Mar 2006 00:55:35 +0000 Subject: Made some general code cleanups and removing older revision. Inspired by bug #127934 and Paul Bredbury's uncanny ability to point out how I could do ebuilds better. Package-Manager: portage-2.1_pre7-r2 --- games-fps/quake3-bin/ChangeLog | 10 +- games-fps/quake3-bin/Manifest | 18 +-- .../quake3-bin/files/digest-quake3-bin-1.32b-r5 | 3 - .../quake3-bin/files/digest-quake3-bin-1.32b-r6 | 3 + games-fps/quake3-bin/quake3-bin-1.32b-r5.ebuild | 117 ------------------- games-fps/quake3-bin/quake3-bin-1.32b-r6.ebuild | 125 +++++++++++++++++++++ 6 files changed, 146 insertions(+), 130 deletions(-) delete mode 100644 games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r5 create mode 100644 games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r6 delete mode 100644 games-fps/quake3-bin/quake3-bin-1.32b-r5.ebuild create mode 100644 games-fps/quake3-bin/quake3-bin-1.32b-r6.ebuild (limited to 'games-fps/quake3-bin') diff --git a/games-fps/quake3-bin/ChangeLog b/games-fps/quake3-bin/ChangeLog index 17c169b68a27..d45192240e81 100644 --- a/games-fps/quake3-bin/ChangeLog +++ b/games-fps/quake3-bin/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for games-fps/quake3-bin # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.10 2006/03/27 18:43:12 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.11 2006/03/31 00:55:35 wolf31o2 Exp $ + +*quake3-bin-1.32b-r6 (31 Mar 2006) + + 31 Mar 2006; Chris Gianelloni + -quake3-bin-1.32b-r5.ebuild, +quake3-bin-1.32b-r6.ebuild: + Made some general code cleanups and removing older revision. Inspired by bug + #127934 and Paul Bredbury's uncanny ability to point out how I could do + ebuilds better. *quake3-bin-1.32b-r5 (27 Mar 2006) diff --git a/games-fps/quake3-bin/Manifest b/games-fps/quake3-bin/Manifest index 430c9379f0d7..9cfbcbb507d8 100644 --- a/games-fps/quake3-bin/Manifest +++ b/games-fps/quake3-bin/Manifest @@ -1,15 +1,15 @@ -MD5 8e31fefa99e7f564639dd2df3c82e106 ChangeLog 5806 -RMD160 48b8917bb27d55f867dbe3449f561270b7d6c31f ChangeLog 5806 -SHA256 a358d3add1360effdeaf1c3eea0b7b43cb056f8a9116941baec01266cd696a8f ChangeLog 5806 +MD5 8bf6d2efb34b3d88e5c9015f8dac84fe ChangeLog 6128 +RMD160 fc369ca02c6b5cd86438bdad6d32578b2ca401eb ChangeLog 6128 +SHA256 eea0befb6f592e85e701516a468c53d632af4701ba9bdb46f46f35c947898318 ChangeLog 6128 MD5 aa25102bc1d29a9d3cef6ccb88b87833 files/digest-quake3-bin-1.31 73 RMD160 084f01025559c82469e11dda19bc3c2353071bc2 files/digest-quake3-bin-1.31 73 SHA256 c27c9a3d460c1225b266681f375e8a4b6e05310094eb81beced1871115064725 files/digest-quake3-bin-1.31 73 MD5 ac0eeb5bcea4995d27e0c6575b8f4dbb files/digest-quake3-bin-1.32b-r4 76 RMD160 619670e44685690f2ce6bb9f4693b7e31f9b4428 files/digest-quake3-bin-1.32b-r4 76 SHA256 8e94e99e4b05c413ff0330a3dffe98b56eb8ebe575d8e62ebb27129df9eb03af files/digest-quake3-bin-1.32b-r4 76 -MD5 0028b4a419fef22709b613a6b700eced files/digest-quake3-bin-1.32b-r5 274 -RMD160 7d1a30b298ae3fbecfebd4d45fff72e865e7ffa4 files/digest-quake3-bin-1.32b-r5 274 -SHA256 462e3f3a4440df59c419f69195975ed4f50bdf9986427801c40bf8a86fc3f874 files/digest-quake3-bin-1.32b-r5 274 +MD5 0028b4a419fef22709b613a6b700eced files/digest-quake3-bin-1.32b-r6 274 +RMD160 7d1a30b298ae3fbecfebd4d45fff72e865e7ffa4 files/digest-quake3-bin-1.32b-r6 274 +SHA256 462e3f3a4440df59c419f69195975ed4f50bdf9986427801c40bf8a86fc3f874 files/digest-quake3-bin-1.32b-r6 274 MD5 72c65c35c66233c80ad323c2e003f09e files/q3ded.conf.d 307 RMD160 8abab77c1ef7e7fd57c42094e8870ab5f918d21f files/q3ded.conf.d 307 SHA256 b9ba53020ff1da7bbd5b8c37d21435ea499b164d7a45c79a2a75d2c96e41f701 files/q3ded.conf.d 307 @@ -25,6 +25,6 @@ SHA256 4814671640ba6cce7a0b6206e6e1ca68ab132b61a37a1bcb0aeaf251ac55b996 quake3-b MD5 6a80906e2fb1f98c305792dd5fb61ddc quake3-bin-1.32b-r4.ebuild 3052 RMD160 057bc5b02703894d43ffaf5dd7eae49243899671 quake3-bin-1.32b-r4.ebuild 3052 SHA256 6e563671a5ede3d8a14627e098b0ca41f14f5a9dd72a6956c858a164d2f30d6e quake3-bin-1.32b-r4.ebuild 3052 -MD5 da745d3984c67514002a27c27e7a53bf quake3-bin-1.32b-r5.ebuild 3241 -RMD160 e80f06951b3200d559f014c8d3e33ca87c1e34b3 quake3-bin-1.32b-r5.ebuild 3241 -SHA256 3941e40be805097bb81a91b26a2f11fa82484363cc01572dbdaa3947059e291e quake3-bin-1.32b-r5.ebuild 3241 +MD5 ea97adf1383970b07ec8d9e33e56c6a6 quake3-bin-1.32b-r6.ebuild 3394 +RMD160 c5c6f8a63eb677434691f9bb4059071c41b58085 quake3-bin-1.32b-r6.ebuild 3394 +SHA256 e267e59066afc84ac9768b8c75f573db9fc5cd98860aef28b4d4c49e84a4f7c8 quake3-bin-1.32b-r6.ebuild 3394 diff --git a/games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r5 b/games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r5 deleted file mode 100644 index 91e5b5d96a21..000000000000 --- a/games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c71fdddccb20e8fc393d846e9c61d685 linuxq3apoint-1.32b-3.x86.run 30923961 -RMD160 eb63177fc0a30cda4976d8b68e065efb6dc41e50 linuxq3apoint-1.32b-3.x86.run 30923961 -SHA256 c36132c5556b35e01950f1e9c646235033a5130f87ad776ba2bc7becf4f4f186 linuxq3apoint-1.32b-3.x86.run 30923961 diff --git a/games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r6 b/games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r6 new file mode 100644 index 000000000000..91e5b5d96a21 --- /dev/null +++ b/games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r6 @@ -0,0 +1,3 @@ +MD5 c71fdddccb20e8fc393d846e9c61d685 linuxq3apoint-1.32b-3.x86.run 30923961 +RMD160 eb63177fc0a30cda4976d8b68e065efb6dc41e50 linuxq3apoint-1.32b-3.x86.run 30923961 +SHA256 c36132c5556b35e01950f1e9c646235033a5130f87ad776ba2bc7becf4f4f186 linuxq3apoint-1.32b-3.x86.run 30923961 diff --git a/games-fps/quake3-bin/quake3-bin-1.32b-r5.ebuild b/games-fps/quake3-bin/quake3-bin-1.32b-r5.ebuild deleted file mode 100644 index 7cc22ef6f38a..000000000000 --- a/games-fps/quake3-bin/quake3-bin-1.32b-r5.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32b-r5.ebuild,v 1.1 2006/03/27 18:43:12 wolf31o2 Exp $ - -inherit eutils games - -DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter" -HOMEPAGE="http://www.idsoftware.com/" -SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-${PV}-3.x86.run" - -LICENSE="Q3AEULA" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="cdinstall dedicated opengl teamarena" -RESTRICT="nostrip" - -RDEPEND="sys-libs/glibc - opengl? ( - virtual/opengl - x86? ( - || ( - ( - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp ) - virtual/x11 ) ) ) - dedicated? ( - app-misc/screen ) - amd64? ( - app-emulation/emul-linux-x86-baselibs - opengl? ( - app-emulation/emul-linux-x86-xlibs - || ( - >=media-video/nvidia-glx-1.0.6629-r3 - >=x11-drivers/ati-drivers-8.8.25-r1 ) ) ) - games-fps/quake3-data - teamarena? ( games-fps/quake3-teamarena )" - -S=${WORKDIR} - -GAMES_CHECK_LICENSE="yes" -dir=${GAMES_PREFIX_OPT}/quake3 -Ddir=${D}/${dir} - -pkg_setup() { - games_pkg_setup - if use cdinstall - then - built_with_use games-fps/quake3-data cdinstall \ - || die "You must install quake3-data with USE=cdinstall to get the required data." - fi -} - -src_unpack() { - unpack_makeself -} - -src_install() { - if use cdinstall ; then - dodir ${dir}/{baseq3,missionpack} - for pk3 in baseq3/*.pk3 missionpack/*.pk3 ; do - dosym ${GAMES_DATADIR}/quake3/${pk3} ${dir}/${pk3} - done - dosym ${GAMES_DATADIR}/quake3/baseq3/pak0.pk3 ${dir}/baseq3/pak0.pk3 - use teamarena && dosym ${GAMES_DATADIR}/quake3/missionpack/pak0.pk3 \ - ${dir}/missionpack/pak0.pk3 - else - insinto ${dir}/baseq3 - doins baseq3/*.pk3 || die "ins baseq3" - insinto ${dir}/missionpack - doins missionpack/*.pk3 || die "ins missionpack" - fi - - insinto ${dir} - doins -r Docs pb || die "ins docs/pb" - - exeinto ${dir} - insinto ${dir} - doexe bin/Linux/x86/quake3.x86 || die "doexe" - doins quake3.xpm README* Q3A_EULA.txt - games_make_wrapper quake3-bin ./quake3.x86 "${dir}" "${dir}" - if use dedicated - then - doexe bin/Linux/x86/q3ded || die "doexe q3ded" - games_make_wrapper q3ded-bin ./q3ded "${dir}" "${dir}" - newinitd "${FILESDIR}"/q3ded.rc q3ded - newconfd "${FILESDIR}"/q3ded.conf.d q3ded - fi - newicon quake3.xpm quake3-bin.xpm - make_desktop_entry quake3-bin "Quake III Arena (binary)" quake3-bin.xpm - use teamarena && make_desktop_entry "quake3-bin +set fs_game missionpack" \ - "Quake III Team Arena" quake3-bin.xpm - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - ewarn "There are two possible security bugs in this package, both causing a" - ewarn "denial of service. One affects the game when running a server, the" - ewarn "other when running as a client." - ewarn "For more information, please see bug #82149." - if use dedicated; then - echo - einfo "To start a dedicated server, run" - einfo " /etc/init.d/q3ded start" - echo - einfo "The dedicated server is started under the ${GAMES_USER_DED} user account." - fi - - # IA32 Emulation required for amd64 - if use amd64 ; then - echo - ewarn "NOTE: IA32 Emulation must be compiled into your kernel for Quake3 to run." - fi -} diff --git a/games-fps/quake3-bin/quake3-bin-1.32b-r6.ebuild b/games-fps/quake3-bin/quake3-bin-1.32b-r6.ebuild new file mode 100644 index 000000000000..005a1e2fa20f --- /dev/null +++ b/games-fps/quake3-bin/quake3-bin-1.32b-r6.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32b-r6.ebuild,v 1.1 2006/03/31 00:55:35 wolf31o2 Exp $ + +inherit eutils games + +DESCRIPTION="3rd installment of the classic id 3D first-person shooter" +HOMEPAGE="http://www.idsoftware.com/" +SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-${PV}-3.x86.run" + +LICENSE="Q3AEULA" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="cdinstall dedicated opengl teamarena" +RESTRICT="nostrip" + +UIDEPEND="virtual/opengl + x86? ( + || ( + ( + x11-libs/libXext + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp ) + virtual/x11 ) ) + amd64? ( + app-emulation/emul-linux-x86-xlibs + || ( + >=media-video/nvidia-glx-1.0.6629-r3 + >=x11-drivers/ati-drivers-8.8.25-r1 ) )" + +RDEPEND="sys-libs/glibc + dedicated? ( app-misc/screen ) + amd64? ( app-emulation/emul-linux-x86-baselibs ) + opengl? ( ${UIDEPEND} ) + games-fps/quake3-data + teamarena? ( games-fps/quake3-teamarena ) + !dedicated? ( !opengl? ( ${UIDEPEND} ) )" + +S=${WORKDIR} + +GAMES_CHECK_LICENSE="yes" +dir=${GAMES_PREFIX_OPT}/quake3 +Ddir=${D}/${dir} + +pkg_setup() { + games_pkg_setup + if use cdinstall + then + built_with_use games-fps/quake3-data cdinstall \ + || die "You must install quake3-data with USE=cdinstall to get the required data." + fi +} + +src_unpack() { + unpack_makeself +} + +src_install() { + if use cdinstall ; then + dodir ${dir}/{baseq3,missionpack} + for pk3 in baseq3/*.pk3 missionpack/*.pk3 ; do + dosym ${GAMES_DATADIR}/quake3/${pk3} ${dir}/${pk3} + done + dosym ${GAMES_DATADIR}/quake3/baseq3/pak0.pk3 ${dir}/baseq3/pak0.pk3 + use teamarena && dosym ${GAMES_DATADIR}/quake3/missionpack/pak0.pk3 \ + ${dir}/missionpack/pak0.pk3 + else + insinto ${dir}/baseq3 + doins baseq3/*.pk3 || die "ins baseq3" + insinto ${dir}/missionpack + doins missionpack/*.pk3 || die "ins missionpack" + fi + + insinto ${dir} + doins -r Docs pb || die "ins docs/pb" + + exeinto ${dir} + insinto ${dir} + doexe bin/Linux/x86/quake3.x86 || die "doexe" + doins quake3.xpm README* Q3A_EULA.txt + if use opengl || ! use dedicated + then + games_make_wrapper ${PN} ./quake3.x86 "${dir}" "${dir}" + newicon quake3.xpm ${PN}.xpm + make_desktop_entry ${PN} "Quake III Arena (binary)" ${PN}.xpm + if use teamarena + then + games_make_wrapper ${PN}-teamarena \ + "./quake3.x86 +set fs_game missionpack" "${dir}" "${dir}" + make_desktop_entry ${PN}-teamarena \ + "Quake III Team Arena" quake3-bin.xpm + fi + fi + if use dedicated + then + doexe bin/Linux/x86/q3ded || die "doexe q3ded" + games_make_wrapper q3ded-bin ./q3ded "${dir}" "${dir}" + newinitd "${FILESDIR}"/q3ded.rc q3ded + newconfd "${FILESDIR}"/q3ded.conf.d q3ded + fi + + prepgamesdirs +} + +pkg_postinst() { + games_pkg_postinst + ewarn "There are two possible security bugs in this package, both causing a" + ewarn "denial of service. One affects the game when running a server, the" + ewarn "other when running as a client." + ewarn "For more information, please see bug #82149." + if use dedicated; then + echo + einfo "To start a dedicated server, run" + einfo " /etc/init.d/q3ded start" + echo + einfo "The dedicated server is started under the ${GAMES_USER_DED} user account." + fi + + # IA32 Emulation required for amd64 + if use amd64 ; then + echo + ewarn "NOTE: IA32 Emulation must be compiled into your kernel for Quake3 to run." + fi +} -- cgit v1.2.3-65-gdbad