Version bump and fix filter-flags. Blame zakk.

(Portage version: 2.1.2_pre3-r3)

5 files changed, 132 insertions, 9 deletions

diff --git a/games-fps/quake3/ChangeLog b/games-fps/quake3/ChangeLog
index c4b7871ef713..6f710c9cba33 100644
--- a/games-fps/quake3/ChangeLog
+++ b/games-fps/quake3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/quake3
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.42 2006/10/03 15:28:14 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.43 2006/10/19 22:09:38 wolf31o2 Exp $
+
+*quake3-1.34_rc2 (19 Oct 2006)
+
+  19 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake3-1.34_alpha789.ebuild, +quake3-1.34_rc2.ebuild, quake3-9999.ebuild:
+  Version bump and fix filter-flags.  Blame zakk.
 
   03 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -files/quake3-1.34_alpha778-gfbsd.patch, -quake3-1.34_alpha778.ebuild,
diff --git a/games-fps/quake3/files/digest-quake3-1.34_rc2 b/games-fps/quake3/files/digest-quake3-1.34_rc2
new file mode 100644
index 000000000000..641290e3cd58
--- /dev/null
+++ b/games-fps/quake3/files/digest-quake3-1.34_rc2
@@ -0,0 +1,3 @@
+MD5 95b8e829e066bf81019f369bc9f0aae0 ioquake3_1.34-rc2.tar.bz2 3126480
+RMD160 690b2ddb08cdf33e60280938dde73ac7cae26e9f ioquake3_1.34-rc2.tar.bz2 3126480
+SHA256 8990959e6f175669e4d9f338a176debc03456ddecd9f32319fea4b4831107552 ioquake3_1.34-rc2.tar.bz2 3126480
diff --git a/games-fps/quake3/quake3-1.34_alpha789.ebuild b/games-fps/quake3/quake3-1.34_alpha789.ebuild
index ff36e2f0575b..1a9ab932a2d4 100644
--- a/games-fps/quake3/quake3-1.34_alpha789.ebuild
+++ b/games-fps/quake3/quake3-1.34_alpha789.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/quake3-1.34_alpha789.ebuild,v 1.2 2006/10/03 15:28:14 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.34_alpha789.ebuild,v 1.3 2006/10/19 22:09:38 wolf31o2 Exp $
 
 # quake3-9999          -> latest svn
 # quake3-9999.REV      -> use svn REV
@@ -24,8 +24,10 @@ elif [[ ${PV} == *_alpha* ]] ; then
 	S=${WORKDIR}/${MY_P}
 else
 	inherit flag-o-matic toolchain-funcs eutils games
-
-	SRC_URI="http://icculus.org/quake3/${P}.tar.bz2"
+	MY_PV=${PV/_/-}
+	MY_P=io${PN}_${MY_PV}
+	SRC_URI="http://icculus.org/quake3/files/${MY_P}.tar.bz2"
+	S=${WORKDIR}/${MY_P}
 fi
 
 DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
@@ -61,7 +63,7 @@ src_unpack() {
 }
 
 src_compile() {
-	filter-flag -mfpmath=sse
+	filter-flags -mfpmath=sse
 	buildit() { use $1 && echo 1 || echo 0 ; }
 	emake \
 		BUILD_SERVER=$(buildit dedicated) \
diff --git a/games-fps/quake3/quake3-1.34_rc2.ebuild b/games-fps/quake3/quake3-1.34_rc2.ebuild
new file mode 100644
index 000000000000..68b597bf18b3
--- /dev/null
+++ b/games-fps/quake3/quake3-1.34_rc2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.34_rc2.ebuild,v 1.1 2006/10/19 22:09:38 wolf31o2 Exp $
+
+# quake3-9999          -> latest svn
+# quake3-9999.REV      -> use svn REV
+# quake3-VER_alphaREV  -> svn snapshot REV for version VER
+# quake3-VER           -> normal quake release
+
+if [[ ${PV} == 9999* ]] ; then
+	[[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
+	ESVN_REPO_URI="svn://svn.icculus.org/quake3/trunk"
+	inherit subversion flag-o-matic toolchain-funcs eutils games
+
+	SRC_URI=""
+	S=${WORKDIR}/trunk
+elif [[ ${PV} == *_alpha* ]] ; then
+	inherit flag-o-matic toolchain-funcs eutils games
+
+	MY_PV=${PV/_alpha*/}
+	SNAP=${PV/*_alpha/}
+	MY_P=${PN}-${MY_PV}_SVN${SNAP}M
+	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+	S=${WORKDIR}/${MY_P}
+else
+	inherit flag-o-matic toolchain-funcs eutils games
+	MY_PV=${PV/_/-}
+	MY_P=io${PN}_${MY_PV}
+	SRC_URI="http://icculus.org/quake3/files/${MY_P}.tar.bz2"
+	S=${WORKDIR}/${MY_P}
+fi
+
+DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
+HOMEPAGE="http://icculus.org/quake3/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="dedicated opengl teamarena"
+
+UIRDEPEND="virtual/opengl
+	media-libs/openal
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	media-libs/libsdl"
+
+RDEPEND="opengl? (
+	${UIRDEPEND} )
+	!dedicated? (
+		${UIRDEPEND} )
+	games-fps/quake3-data
+	teamarena? ( games-fps/quake3-teamarena )"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		subversion_src_unpack
+	else
+		unpack ${A}
+		cd "${S}"
+	fi
+}
+
+src_compile() {
+	filter-flags -mfpmath=sse
+	buildit() { use $1 && echo 1 || echo 0 ; }
+	emake \
+		BUILD_SERVER=$(buildit dedicated) \
+		BUILD_CLIENT=$(buildit opengl) \
+		TEMPDIR="${T}" \
+		CC="$(tc-getCC)" \
+		ARCH=$(tc-arch-kernel) \
+		OPTIMIZE="${CFLAGS}" \
+		DEFAULT_BASEDIR="${GAMES_DATADIR}/quake3" \
+		DEFAULT_LIBDIR="${GAMES_LIBDIR}/quake3" \
+		|| die
+}
+
+src_install() {
+	dodoc id-readme.txt TODO README BUGS ChangeLog
+	cd code/unix
+	dodoc README.*
+
+	if use opengl ; then
+		doicon quake3.png
+		make_desktop_entry quake3 "Quake III Arena"
+	fi
+
+	cd ../../build/release*
+	local old_x x
+	for old_x in ioq* ; do
+		x=${old_x%.*}
+		newgamesbin ${old_x} ${x} || die "newgamesbin ${x}"
+		dosym ${x} "${GAMES_BINDIR}"/${x/io}
+	done
+	exeinto "${GAMES_LIBDIR}"/${PN}/baseq3
+	doexe baseq3/*.so || die "baseq3 .so"
+	exeinto "${GAMES_LIBDIR}"/${PN}/missionpack
+	doexe missionpack/*.so || die "missionpack .so"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	ewarn "The source version of Quake 3 will not work with Punk Buster."
+	ewarn "If you need pb support, then use the quake3-bin package."
+	echo
+}
diff --git a/games-fps/quake3/quake3-9999.ebuild b/games-fps/quake3/quake3-9999.ebuild
index e57bffc03ea5..7025fa5489de 100644
--- a/games-fps/quake3/quake3-9999.ebuild
+++ b/games-fps/quake3/quake3-9999.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/quake3-9999.ebuild,v 1.6 2006/10/03 15:28:14 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-9999.ebuild,v 1.7 2006/10/19 22:09:38 wolf31o2 Exp $
 
 # quake3-9999          -> latest svn
 # quake3-9999.REV      -> use svn REV
@@ -24,8 +24,10 @@ elif [[ ${PV} == *_alpha* ]] ; then
 	S=${WORKDIR}/${MY_P}
 else
 	inherit flag-o-matic toolchain-funcs eutils games
-
-	SRC_URI="http://icculus.org/quake3/${P}.tar.bz2"
+	MY_PV=${PV/_/-}
+	MY_P=io${PN}_${MY_PV}
+	SRC_URI="http://icculus.org/quake3/files/${MY_P}.tar.bz2"
+	S=${WORKDIR}/${MY_P}
 fi
 
 DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
@@ -61,7 +63,7 @@ src_unpack() {
 }
 
 src_compile() {
-	filter-flag -mfpmath=sse
+	filter-flags -mfpmath=sse
 	buildit() { use $1 && echo 1 || echo 0 ; }
 	emake \
 		BUILD_SERVER=$(buildit dedicated) \