move binary quake3 to quake3-bin
authorMike Frysinger <vapier@gentoo.org>
Tue, 25 Oct 2005 00:38:03 +0000 (00:38 +0000)
committerMike Frysinger <vapier@gentoo.org>
Tue, 25 Oct 2005 00:38:03 +0000 (00:38 +0000)
12 files changed:
games-fps/quake3-bin/ChangeLog [moved from games-fps/quake3/ChangeLog with 97% similarity]
games-fps/quake3-bin/Manifest [moved from games-fps/quake3/Manifest with 100% similarity]
games-fps/quake3-bin/files/digest-quake3-bin-1.31 [moved from games-fps/quake3/files/digest-quake3-1.31 with 100% similarity]
games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r3 [moved from games-fps/quake3/files/digest-quake3-1.32b-r3 with 100% similarity]
games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r4 [new file with mode: 0644]
games-fps/quake3-bin/files/q3ded.conf.d [moved from games-fps/quake3/files/q3ded.conf.d with 62% similarity]
games-fps/quake3-bin/files/q3ded.rc [moved from games-fps/quake3/files/q3ded.rc with 50% similarity]
games-fps/quake3-bin/metadata.xml [moved from games-fps/quake3/metadata.xml with 100% similarity]
games-fps/quake3-bin/quake3-bin-1.31.ebuild [moved from games-fps/quake3/quake3-1.31.ebuild with 77% similarity]
games-fps/quake3-bin/quake3-bin-1.32b-r3.ebuild [moved from games-fps/quake3/quake3-1.32b-r3.ebuild with 83% similarity]
games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild [new file with mode: 0644]
games-fps/quake3/files/quake3.png [deleted file]

similarity index 97%
rename from games-fps/quake3/ChangeLog
rename to games-fps/quake3-bin/ChangeLog
index 44d6360dc2e6f92222e975e5df9fcc1f5741c3f6..c117e57a9e672053bae3948112fa529d239baef5 100644 (file)
@@ -1,6 +1,6 @@
 # ChangeLog for games-fps/quake3
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.22 2005/10/21 17:37:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.1 2005/10/25 00:38:03 vapier Exp $
 
   21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> quake3-1.31.ebuild,
   quake3-1.32b-r3.ebuild:
diff --git a/games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r4 b/games-fps/quake3-bin/files/digest-quake3-bin-1.32b-r4
new file mode 100644 (file)
index 0000000..9a97af6
--- /dev/null
@@ -0,0 +1 @@
+MD5 c71fdddccb20e8fc393d846e9c61d685 linuxq3apoint-1.32b-3.x86.run 30923961
similarity index 62%
rename from games-fps/quake3/files/q3ded.conf.d
rename to games-fps/quake3-bin/files/q3ded.conf.d
index 94be1e562fb4d21ac6b0a6578021160be3635bc6..14301a14e9fa55816176074dcde1c7ff439e20b2 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/files/q3ded.conf.d,v 1.3 2004/07/14 22:15:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/files/q3ded.conf.d,v 1.1 2005/10/25 00:38:03 vapier Exp $
 
 q3_OPTS="+set com_hunkmegs 24 +set dedicated 1 +set net_port 27960 +map q3tourney2"
 
similarity index 50%
rename from games-fps/quake3/files/q3ded.rc
rename to games-fps/quake3-bin/files/q3ded.rc
index 614fe662d60c595e7a75370256537bf2d86f4c12..ee02531f6aa48999045d4e86ccdd431f2eb71684 100644 (file)
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/files/q3ded.rc,v 1.8 2004/09/01 20:31:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/files/q3ded.rc,v 1.1 2005/10/25 00:38:03 vapier Exp $
 
 depend() {
        need net
@@ -9,27 +9,27 @@ depend() {
 
 start() {
        ebegin "Starting Quake3 dedicated server"
-       screen -A -m -d -S q3ded su - games -c "q3ded ${q3_OPTS}"
+       screen -A -m -d -S q3ded-bin su - games -c "q3ded-bin ${q3_OPTS}"
        eend $?
 }
 
 stop() {
        ebegin "Stopping Quake3 dedicated server"
-       local pid=`screen -list | grep q3ded | awk -F . '{print $1}' | sed -e s/.//`
+       local pid=`screen -list | grep q3ded-bin | awk -F . '{print $1}' | sed -e s/.//`
        if [ -z "${pid}" ] ; then
                eend 1 "Lost screen session"
        else
-               pid=`pstree -p ${pid} | sed -e 's:^.*q3ded::'`
+               pid=`pstree -p ${pid} | sed -e 's:^.*q3ded-bin::'`
                pid=${pid:1:${#pid}-2}
                if [ -z "${pid}" ] ; then
-                       eend 1 "Lost q3ded session"
+                       eend 1 "Lost q3ded-bin session"
                else
                        kill ${pid}
-                       eend $? "Could not kill q3ded"
+                       eend $? "Could not kill q3ded-bin"
                fi
        fi
 }
 
 status() {
-       screen -list | grep q3ded
+       screen -list | grep q3ded-bin
 }
similarity index 77%
rename from games-fps/quake3/quake3-1.31.ebuild
rename to games-fps/quake3-bin/quake3-bin-1.31.ebuild
index 7e49cc17a5efbac0d929379647daa4fc16b21139..1352a81c4113c9d86fbb0e66c7182653057627ff 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.31.ebuild,v 1.21 2005/10/21 17:37:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.31.ebuild,v 1.1 2005/10/25 00:38:03 vapier Exp $
 
 inherit eutils games
 
@@ -14,7 +14,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="dedicated opengl"
 RESTRICT="nostrip"
 
-RDEPEND="virtual/libc
+RDEPEND="sys-libs/glibc
        opengl? ( virtual/opengl
                virtual/x11 )
        dedicated? ( app-misc/screen )
@@ -26,7 +26,7 @@ RDEPEND="virtual/libc
                        >=media-video/ati-drivers-8.8.25-r1 ) ) )"
 
 S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
+dir=${GAMES_PREFIX_OPT}/quake3
 Ddir=${D}/${dir}
 
 pkg_setup() {
@@ -47,17 +47,17 @@ src_install() {
 
        exeinto ${dir}
        insinto ${dir}
-       doexe bin/x86/{quake3.x86,q3ded}
+       doexe bin/x86/{quake3.x86,q3ded} || die "doexe"
        doins quake3.xpm README* Q3A_EULA.txt
-       games_make_wrapper quake3 ./quake3.x86 "${dir}" "${dir}"
-       games_make_wrapper q3ded ./q3ded "${dir}" "${dir}"
+       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
+       newinitd "${FILESDIR}"/q3ded.rc q3ded
+       newconfd "${FILESDIR}"/q3ded.conf.d q3ded
        doicon quake3.xpm
 
        prepgamesdirs
-       make_desktop_entry quake3 "Quake III Arena" quake3.xpm
+       make_desktop_entry quake3-bin "Quake III Arena (binary)" quake3.xpm
 }
 
 pkg_postinst() {
similarity index 83%
rename from games-fps/quake3/quake3-1.32b-r3.ebuild
rename to games-fps/quake3-bin/quake3-bin-1.32b-r3.ebuild
index 24026698d4dc064690535c4884a49744f213c000..f5c66625faa24e4c3a4515a9506b1b03dd057df6 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.32b-r3.ebuild,v 1.22 2005/10/21 17:37:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32b-r3.ebuild,v 1.1 2005/10/25 00:38:03 vapier Exp $
 
 inherit eutils games
 
@@ -10,11 +10,11 @@ SRC_URI="ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${PV}-3.x86
 
 LICENSE="Q3AEULA"
 SLOT="0"
-KEYWORDS="-* x86 amd64"
+KEYWORDS="-* amd64 x86"
 IUSE="dedicated opengl"
 RESTRICT="nostrip"
 
-RDEPEND="virtual/libc
+RDEPEND="sys-libs/glibc
        opengl? ( virtual/opengl
                virtual/x11 )
        dedicated? ( app-misc/screen )
@@ -26,7 +26,7 @@ RDEPEND="virtual/libc
                        >=media-video/ati-drivers-8.8.25-r1 ) ) )"
 
 S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
+dir=${GAMES_PREFIX_OPT}/quake3
 Ddir=${D}/${dir}
 
 pkg_setup() {
@@ -50,15 +50,15 @@ src_install() {
        insinto ${dir}
        doexe bin/Linux/x86/{quake3.x86,q3ded}
        doins quake3.xpm README* Q3A_EULA.txt
-       games_make_wrapper quake3 ./quake3.x86 "${dir}" "${dir}"
-       games_make_wrapper q3ded ./q3ded "${dir}" "${dir}"
+       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
 
        prepgamesdirs
-       make_desktop_entry quake3 "Quake III Arena" quake3.xpm
+       make_desktop_entry quake3-bin "Quake III Arena (binary)" quake3.xpm
 }
 
 pkg_postinst() {
diff --git a/games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild b/games-fps/quake3-bin/quake3-bin-1.32b-r4.ebuild
new file mode 100644 (file)
index 0000000..33b6212
--- /dev/null
@@ -0,0 +1,97 @@
+# Copyright 1999-2005 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.1 2005/10/25 00:38:03 vapier 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="ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${PV}-3.x86.run"
+
+LICENSE="Q3AEULA"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="cdinstall dedicated opengl"
+RESTRICT="nostrip"
+
+RDEPEND="sys-libs/glibc
+       opengl? ( virtual/opengl
+               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
+                       >=media-video/ati-drivers-8.8.25-r1 ) ) )
+       cdinstall? ( games-fps/quake3-data )"
+
+S=${WORKDIR}
+dir=${GAMES_PREFIX_OPT}/quake3
+Ddir=${D}/${dir}
+
+pkg_setup() {
+       check_license Q3AEULA
+       games_pkg_setup
+}
+
+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
+       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,q3ded} || 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
+       newicon quake3.xpm quake3-bin.xpm
+
+       prepgamesdirs
+       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."
+       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 "  /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/files/quake3.png b/games-fps/quake3/files/quake3.png
deleted file mode 100644 (file)
index cb3d824..0000000
Binary files a/games-fps/quake3/files/quake3.png and /dev/null differ