diff options
author | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-03-22 21:52:01 +0000 |
---|---|---|
committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-03-22 21:52:01 +0000 |
commit | 242507f6b81f767d55fd21eabfc37a8e0f121026 (patch) | |
tree | 2163b01709261f961c8ed100e06f1591ffc58137 /games-fps | |
parent | games-emulation/visualboyadvance stable on ppc. (diff) | |
download | historical-242507f6b81f767d55fd21eabfc37a8e0f121026.tar.gz historical-242507f6b81f767d55fd21eabfc37a8e0f121026.tar.bz2 historical-242507f6b81f767d55fd21eabfc37a8e0f121026.zip |
Fixed up dedicated USE invocation so we only copy the dedicated files when necessary and synced 1.32b to 1.31 ebuild. Also added code to properly symlink pak0.pk3 from baseq3 and missionpack, if USE=cdinstall.
Package-Manager: portage-2.1_pre6-r5
Diffstat (limited to 'games-fps')
-rw-r--r-- | games-fps/quake3-bin/ChangeLog | 8 | ||||
-rw-r--r-- | games-fps/quake3-bin/Manifest | 18 | ||||
-rw-r--r-- | games-fps/quake3-bin/quake3-bin-1.31.ebuild | 82 | ||||
-rw-r--r-- | games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild | 28 |
4 files changed, 89 insertions, 47 deletions
diff --git a/games-fps/quake3-bin/ChangeLog b/games-fps/quake3-bin/ChangeLog index 80355345c32f..389bf5089a29 100644 --- a/games-fps/quake3-bin/ChangeLog +++ b/games-fps/quake3-bin/ChangeLog @@ -1,6 +1,12 @@ # 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.8 2006/03/15 22:24:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.9 2006/03/22 21:52:01 wolf31o2 Exp $ + + 22 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> + quake3-bin-1.31.ebuild, quake3-bin-1.32b-r4.ebuild: + Fixed up dedicated USE invocation so we only copy the dedicated files when + necessary and synced 1.32b to 1.31 ebuild. Also added code to properly + symlink pak0.pk3 from baseq3 and missionpack, if USE=cdinstall. 15 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> quake3-bin-1.31.ebuild, quake3-bin-1.32b-r4.ebuild: diff --git a/games-fps/quake3-bin/Manifest b/games-fps/quake3-bin/Manifest index 35f8298a5973..21c68be75802 100644 --- a/games-fps/quake3-bin/Manifest +++ b/games-fps/quake3-bin/Manifest @@ -1,6 +1,6 @@ -MD5 54a40d642d9d9b3604ee1b16dc3f4f45 ChangeLog 5258 -RMD160 9992fc0692cdbb29044da252e2f26b310f3c0855 ChangeLog 5258 -SHA256 c0912735f569dca4a0bed8bf5b761396cb5fd260f215e9ab9aceaba12f1b28c9 ChangeLog 5258 +MD5 8942016552ab722a70889fe872bebc43 ChangeLog 5583 +RMD160 327744ccd0303132ef06b8f34ffffa8c46428e7d ChangeLog 5583 +SHA256 439e6f094fe594e7acbbba30f76d34c774b2ce42f58673c9a7c95ddf7e086a38 ChangeLog 5583 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 @@ -16,9 +16,9 @@ SHA256 fc6f8b2a04370bb02661fe5f06d2128007e0ea60388d9bc4593629071975f1b4 files/q3 MD5 0a25a9c85ee385ef578cb770a957756d metadata.xml 954 RMD160 178b4856c0cdf3c57df6660d283aa9e4709d2511 metadata.xml 954 SHA256 c8178e5b0a05fe236018af52c641a40d6262dd3e8d24965efafbe61f155bf58f metadata.xml 954 -MD5 817e00e64e78e0f28d70c06435daa59a quake3-bin-1.31.ebuild 2320 -RMD160 86c1d0b16203125a79f7db5d9e4aa73717be5b3d quake3-bin-1.31.ebuild 2320 -SHA256 2c3c2f3d2bb9003986c8c05fc597076cc41973644d2f8905ee4a76e2d47d4288 quake3-bin-1.31.ebuild 2320 -MD5 ae1940b189fffca960a40909c3535dad quake3-bin-1.32b-r4.ebuild 3047 -RMD160 addad9f2ec0fcdd4cbe42ca4063247291985b9ed quake3-bin-1.32b-r4.ebuild 3047 -SHA256 9323e084445108c3d063bf387e34a0ff04d52d5e6baccc457f73a0249d16240e quake3-bin-1.32b-r4.ebuild 3047 +MD5 50fc49adf0ab659e131fec56e6e04799 quake3-bin-1.31.ebuild 3246 +RMD160 ca6e013128d5ea3e203a15df41f80eb174f90ba5 quake3-bin-1.31.ebuild 3246 +SHA256 90629d627a9031f2a9f9a56b3f6b8d0b3466624f69752b579ec9863c343c168f quake3-bin-1.31.ebuild 3246 +MD5 cc771b78e7ce6ba0a493af814563e872 quake3-bin-1.32b-r4.ebuild 3252 +RMD160 691b146b10b11dda316f4bd0a84b400e2daae410 quake3-bin-1.32b-r4.ebuild 3252 +SHA256 2c0920469a1b8219c916b996fc7fd7698cadc3ce57b7863d72499cd690035f41 quake3-bin-1.32b-r4.ebuild 3252 diff --git a/games-fps/quake3-bin/quake3-bin-1.31.ebuild b/games-fps/quake3-bin/quake3-bin-1.31.ebuild index 70882fc54961..90b24f5f6a4f 100644 --- a/games-fps/quake3-bin/quake3-bin-1.31.ebuild +++ b/games-fps/quake3-bin/quake3-bin-1.31.ebuild @@ -1,6 +1,6 @@ # 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.31.ebuild,v 1.4 2006/03/15 22:24:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.31.ebuild,v 1.5 2006/03/22 21:52:01 wolf31o2 Exp $ inherit eutils games @@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-${PV}.x86.run" LICENSE="Q3AEULA" SLOT="0" KEYWORDS="-* amd64 x86" -IUSE="dedicated opengl" +IUSE="cdinstall dedicated opengl" RESTRICT="nostrip" RDEPEND="sys-libs/glibc @@ -31,16 +31,24 @@ RDEPEND="sys-libs/glibc 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 ) ) )" + || ( + >=media-video/nvidia-glx-1.0.6629-r3 + >=x11-drivers/ati-drivers-8.8.25-r1 ) ) ) + games-fps/quake3-data" S=${WORKDIR} + +GAMES_CHECK_LICENSE="yes" dir=${GAMES_PREFIX_OPT}/quake3 Ddir=${D}/${dir} pkg_setup() { - check_license Q3AEULA 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() { @@ -48,41 +56,65 @@ src_unpack() { } src_install() { - insinto ${dir}/baseq3 - doins baseq3/*.pk3 - mv Help ${Ddir} - insinto ${dir}/missionpack - doins missionpack/*.pk3 + 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/pak0.pk3 ${dir}/baseq3/pak0.pk3 + 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/x86/{quake3.x86,q3ded} || die "doexe" + doexe bin/Linux/x86/quake3.x86 || die "doexe" doins quake3.xpm README* Q3A_EULA.txt games_make_wrapper quake3-bin ./quake3.x86 "${dir}" "${dir}" - games_make_wrapper q3ded-bin ./q3ded "${dir}" "${dir}" - - newinitd "${FILESDIR}"/q3ded.rc q3ded - newconfd "${FILESDIR}"/q3ded.conf.d q3ded - doicon quake3.xpm + 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 prepgamesdirs - make_desktop_entry quake3-bin "Quake III Arena (binary)" quake3.xpm + make_desktop_entry quake3-bin "Quake III Arena (binary)" quake3-bin.xpm } pkg_postinst() { games_pkg_postinst echo - ewarn "There are two possible security bugs in this package, both causing a denial" - ewarn "of service. One affects the game when running a server, the other when running" - ewarn "as a client. For more information, see bug #82149." - echo - einfo "You need to copy pak0.pk3 from your Quake3 CD into ${dir}/baseq3." - einfo "Or if you have got a Window installation of Q3 make a symlink to save space." - echo + 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 cdinstall ; then + echo + einfo "You need to copy pak0.pk3 from your Quake3 CD into ${dir}/baseq3." + einfo "Or if you have got a Window installation of Q3 make a symlink to save space." + fi if use dedicated; then + echo einfo "To start a dedicated server, run" - einfo "\t/etc/init.d/q3ded start" + 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-r4.ebuild b/games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild index 45e95a30c40e..5daf7c192b29 100644 --- a/games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild +++ b/games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild @@ -1,6 +1,6 @@ # 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-r4.ebuild,v 1.5 2006/03/15 22:24:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild,v 1.6 2006/03/22 21:52:01 wolf31o2 Exp $ inherit eutils games @@ -46,10 +46,8 @@ pkg_setup() { games_pkg_setup if use cdinstall then - if [ ! built_with_use games-fps/quake3-data cdinstall ] - then - die "You must install quake3-data with USE=cdinstall to get the required data." - fi + built_with_use games-fps/quake3-data cdinstall \ + || die "You must install quake3-data with USE=cdinstall to get the required data." fi } @@ -63,6 +61,9 @@ src_install() { for pk3 in baseq3/*.pk3 missionpack/*.pk3 ; do dosym ${GAMES_DATADIR}/quake3/${pk3} ${dir}/${pk3} done + dosym ${GAMES_DATADIR}/quake3/pak0.pk3 ${dir}/baseq3/pak0.pk3 + dosym ${GAMES_DATADIR}/quake3/missionpack/pak0.pk3 \ + ${dir}/missionpack/pak0.pk3 else insinto ${dir}/baseq3 doins baseq3/*.pk3 || die "ins baseq3" @@ -75,13 +76,16 @@ src_install() { exeinto ${dir} insinto ${dir} - doexe bin/Linux/x86/{quake3.x86,q3ded} || die "doexe" + doexe bin/Linux/x86/quake3.x86 || die "doexe" doins quake3.xpm README* Q3A_EULA.txt games_make_wrapper quake3-bin ./quake3.x86 "${dir}" "${dir}" - games_make_wrapper q3ded-bin ./q3ded "${dir}" "${dir}" - - newinitd "${FILESDIR}"/q3ded.rc q3ded - newconfd "${FILESDIR}"/q3ded.conf.d q3ded + 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 prepgamesdirs @@ -93,8 +97,8 @@ pkg_postinst() { echo 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. For more information, please see bug" - ewarn "#82149." + ewarn "other when running as a client." + ewarn "For more information, please see bug #82149." if ! use cdinstall ; then echo einfo "You need to copy pak0.pk3 from your Quake3 CD into ${dir}/baseq3." |