Version bump and fix filter-flags. Blame zakk.

Package-Manager: portage-2.1.2_pre3-r3

6 files changed, 155 insertions, 24 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/Manifest b/games-fps/quake3/Manifest
index 53da3923465f..3728a762a1f7 100644
--- a/games-fps/quake3/Manifest
+++ b/games-fps/quake3/Manifest
@@ -1,19 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+DIST ioquake3_1.34-rc2.tar.bz2 3126480 RMD160 690b2ddb08cdf33e60280938dde73ac7cae26e9f SHA1 deae207454fa81c4acc500bfb43422983b2b9493 SHA256 8990959e6f175669e4d9f338a176debc03456ddecd9f32319fea4b4831107552
 DIST quake3-1.34_SVN789M.tar.bz2 2450958 RMD160 208c2ddfa36681336f97847ff358242f36f4d937 SHA1 01638be4167cf84cee48eb23a9257594277d4d06 SHA256 0b8768b97962f69b9f7455e736867a447d8677c93c43b34f67344446b797b0ee
-EBUILD quake3-1.34_alpha789.ebuild 2708 RMD160 07561fe0befb9713bb9eba32ed290183ab781e53 SHA1 c742b11fceb4415000b3de2bc7820aad1c5e314c SHA256 f65615cb02b8ffd18d262a72777388c3884092bb480e0d328b91810a55f04051
-MD5 612faab7fe8513eb4032d233c539cfe4 quake3-1.34_alpha789.ebuild 2708
-RMD160 07561fe0befb9713bb9eba32ed290183ab781e53 quake3-1.34_alpha789.ebuild 2708
-SHA256 f65615cb02b8ffd18d262a72777388c3884092bb480e0d328b91810a55f04051 quake3-1.34_alpha789.ebuild 2708
-EBUILD quake3-9999.ebuild 2675 RMD160 19eceb9b6b52bed757ab169c6123fd718f7251d8 SHA1 44e682e0f9f249b3020affca51cf539ce7407caf SHA256 5b3933a2760a4da0f9ba8d038cc7236f1b75162aa4721fb3da136930326fd484
-MD5 e05044818cb3b73e121288391f8274cc quake3-9999.ebuild 2675
-RMD160 19eceb9b6b52bed757ab169c6123fd718f7251d8 quake3-9999.ebuild 2675
-SHA256 5b3933a2760a4da0f9ba8d038cc7236f1b75162aa4721fb3da136930326fd484 quake3-9999.ebuild 2675
-MISC ChangeLog 3200 RMD160 b8185796629724babc227ebe9e3b8bdb73588eb1 SHA1 15e626148b2fa593ab86f439f235586c84a0147c SHA256 07a589c1902c1d1dd9552ed0391f8371ba5a8e132493ea805b9ab7873ae1685d
-MD5 c73835cc04a111041862fa9632d39569 ChangeLog 3200
-RMD160 b8185796629724babc227ebe9e3b8bdb73588eb1 ChangeLog 3200
-SHA256 07a589c1902c1d1dd9552ed0391f8371ba5a8e132493ea805b9ab7873ae1685d ChangeLog 3200
+EBUILD quake3-1.34_alpha789.ebuild 2779 RMD160 ec94b10a2a5a8ba0a31cea294fcec2d7755a9364 SHA1 9a3cd78a52bb5291f1c2bcf9cb6008e6d472c0aa SHA256 c7c2ba91c5d457a6509fbaf7b4e3b83095e02ab502786941a2028fdd8f47cc68
+MD5 18f9bf402e9d97f4c6e4629ef82f13bf quake3-1.34_alpha789.ebuild 2779
+RMD160 ec94b10a2a5a8ba0a31cea294fcec2d7755a9364 quake3-1.34_alpha789.ebuild 2779
+SHA256 c7c2ba91c5d457a6509fbaf7b4e3b83095e02ab502786941a2028fdd8f47cc68 quake3-1.34_alpha789.ebuild 2779
+EBUILD quake3-1.34_rc2.ebuild 2774 RMD160 6082c27e2f602ba00ea526cc0cfa5cec2045225e SHA1 a75e6abbf500891d1b6356f12dc7832f28b15d45 SHA256 aea930186022594da8fce23865f26562501a7efa42b3d8e03fa411de97ce8e5f
+MD5 9420407a9daf0b45d53096bb94d319dc quake3-1.34_rc2.ebuild 2774
+RMD160 6082c27e2f602ba00ea526cc0cfa5cec2045225e quake3-1.34_rc2.ebuild 2774
+SHA256 aea930186022594da8fce23865f26562501a7efa42b3d8e03fa411de97ce8e5f quake3-1.34_rc2.ebuild 2774
+EBUILD quake3-9999.ebuild 2746 RMD160 744d17d92eedb2fa790ceca02ee3404a367c4a4a SHA1 f67452009d84d46ea8ddf68a2cc1feadea8edbe9 SHA256 f0d7096b5ad8205bc5d61478eb7de3556ab8e17abb68c87280db6f68650aae31
+MD5 344727f4fc1c6da251c783b57fe6776b quake3-9999.ebuild 2746
+RMD160 744d17d92eedb2fa790ceca02ee3404a367c4a4a quake3-9999.ebuild 2746
+SHA256 f0d7096b5ad8205bc5d61478eb7de3556ab8e17abb68c87280db6f68650aae31 quake3-9999.ebuild 2746
+MISC ChangeLog 3413 RMD160 08647b4aeda54bc184af1b05d76cc0ebed3cecd4 SHA1 fda48f1d37f493981f7cd9409b779b806e6cd396 SHA256 4cebd5c89c287e409e124610128ad00172dacf9f68b570373eea6b291e9b087b
+MD5 74072d8f0e96d5bf12cd5ac77bca7407 ChangeLog 3413
+RMD160 08647b4aeda54bc184af1b05d76cc0ebed3cecd4 ChangeLog 3413
+SHA256 4cebd5c89c287e409e124610128ad00172dacf9f68b570373eea6b291e9b087b ChangeLog 3413
 MISC metadata.xml 954 RMD160 178b4856c0cdf3c57df6660d283aa9e4709d2511 SHA1 53680d486f627e45fc1168f66db7cd2a3c628186 SHA256 c8178e5b0a05fe236018af52c641a40d6262dd3e8d24965efafbe61f155bf58f
 MD5 0a25a9c85ee385ef578cb770a957756d metadata.xml 954
 RMD160 178b4856c0cdf3c57df6660d283aa9e4709d2511 metadata.xml 954
@@ -21,13 +26,16 @@ SHA256 c8178e5b0a05fe236018af52c641a40d6262dd3e8d24965efafbe61f155bf58f metadata
 MD5 05c3c0fba7846428333bbc67bafcafa1 files/digest-quake3-1.34_alpha789 265
 RMD160 ddf9e34f675d552455aac3b9723ccce3ddbdd886 files/digest-quake3-1.34_alpha789 265
 SHA256 52d6e39ad794c3bc913068da987f57503860d3f9bc5f93dbd630451ae2ef9c68 files/digest-quake3-1.34_alpha789 265
+MD5 d3da0c7105c95b7cd2f93457298eeb2b files/digest-quake3-1.34_rc2 259
+RMD160 14ffa430fdc52b2d715cc3de1f56d2c28d49a4e2 files/digest-quake3-1.34_rc2 259
+SHA256 54d8c3ec873552d0689e9ba67bfe1f4b60dd71da593a7e6b90195ff1f60fe810 files/digest-quake3-1.34_rc2 259
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-quake3-9999 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-quake3-9999 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-quake3-9999 1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD4DBQFFIoGSkT4lNIS36YERAqhWAKCre03jFLb2585tNO3X/bZvruGt1ACYkRLv
-SNQZrbrQCSp27hM/YG/T0Q==
-=1dcT
+iD8DBQFFN/ezkT4lNIS36YERAg2oAJ9HqGAQmDB6QnIJ460QXtg44OQ4FACfUcBd
+CEGEf2LWyIhsDorc/ycYUBU=
+=ac2O
 -----END PGP SIGNATURE-----
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) \