ver bump with now optional dedicated server support
authorMike Frysinger <vapier@gentoo.org>
Fri, 4 Nov 2005 03:57:37 +0000 (03:57 +0000)
committerMike Frysinger <vapier@gentoo.org>
Fri, 4 Nov 2005 03:57:37 +0000 (03:57 +0000)
Package-Manager: portage-2.0.53_rc7

games-fps/quake3/Manifest
games-fps/quake3/files/digest-quake3-1.33_alpha209 [deleted file]
games-fps/quake3/files/digest-quake3-1.33_alpha255 [new file with mode: 0644]
games-fps/quake3/quake3-1.33_alpha255.ebuild [moved from games-fps/quake3/quake3-1.33_alpha209.ebuild with 73% similarity]

index 5b243ce3c0e05f26c37bd3f914356ed1318a7d30..07e9b5da6594cf02c6ebc0a652b2f81efbc152a6 100644 (file)
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 MD5 420d40268fda31888ddc60bdabb37b6c ChangeLog 343
-MD5 e1eddf050bceb5ed6cbe9f043b0c9fa9 files/digest-quake3-1.33_alpha209 73
+MD5 f0983c11dd15d4a387dd77c2a8173c7a files/digest-quake3-1.33_alpha255 73
 MD5 0a25a9c85ee385ef578cb770a957756d metadata.xml 954
-MD5 44f31084e25704818b6fe13bb5e8e132 quake3-1.33_alpha209.ebuild 1997
+MD5 383bf3ec28d6ddb48c52140420692aef quake3-1.33_alpha255.ebuild 2359
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDaV/9gIKl8Uu19MoRAquDAJkBuaRQJrSXdDf9qSj/cn4QLHpB3gCcDjLz
-JDGGYV8WmqSM3hKdR/oG9pA=
-=YYKm
+iD8DBQFDatxdgIKl8Uu19MoRAsoXAJ98N5dLarE5X//cZbj3WujqczeNPgCeKBJD
+bh1pFANEZDofcgTWsOjiUjA=
+=AgQs
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake3/files/digest-quake3-1.33_alpha209 b/games-fps/quake3/files/digest-quake3-1.33_alpha209
deleted file mode 100644 (file)
index 69b255a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f8e3c51857657981a64ec06d270643b quake3-1.33_SVN209M.tar.bz2 2290524
diff --git a/games-fps/quake3/files/digest-quake3-1.33_alpha255 b/games-fps/quake3/files/digest-quake3-1.33_alpha255
new file mode 100644 (file)
index 0000000..ea0cfc5
--- /dev/null
@@ -0,0 +1 @@
+MD5 1ac0e62f63d50c768040e89b2e2feb7a quake3-1.33_SVN255M.tar.bz2 1914739
similarity index 73%
rename from games-fps/quake3/quake3-1.33_alpha209.ebuild
rename to games-fps/quake3/quake3-1.33_alpha255.ebuild
index 96545dd3807bee1a899589f4f18b8852b713446e..ba0adea8240d669862687b176dc5f5927cd97551 100644 (file)
@@ -1,8 +1,14 @@
 # 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.33_alpha209.ebuild,v 1.2 2005/11/03 00:54:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.33_alpha255.ebuild,v 1.1 2005/11/04 03:57:37 vapier Exp $
 
-if [[ ${PV} == "9999" ]] ; then
+# 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 games toolchain-funcs
 
@@ -30,11 +36,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="dedicated opengl"
 
-RDEPEND="opengl? ( virtual/opengl virtual/x11 )
+RDEPEND="opengl? ( virtual/opengl virtual/x11 media-libs/libsdl )
+       !dedicated? ( virtual/opengl virtual/x11 media-libs/libsdl )
        games-fps/quake3-data"
 
 src_unpack() {
-       if [[ ${PV} == "9999" ]] ; then
+       if [[ ${PV} == 9999* ]] ; then
                subversion_src_unpack
        else
                unpack ${A}
@@ -42,12 +49,14 @@ src_unpack() {
 }
 
 src_compile() {
-       # Force -fno-strict-aliasing to fix graphical bugs #110509
+       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} -fno-strict-aliasing" \
+               OPTIMIZE="${CFLAGS}" \
                DEFAULT_BASEDIR="${GAMES_DATADIR}/quake3" \
                DEFAULT_LIBDIR="${GAMES_LIBDIR}/quake3" \
                || die