version bump; add opengl use dep for libsdl for bug #345213

Package-Manager: portage-2.1.8.3/cvs/Linux i686

5 files changed, 128 insertions, 33 deletions

diff --git a/games-fps/quake3/ChangeLog b/games-fps/quake3/ChangeLog
index c33b647cfb9d..a615940d3824 100644
--- a/games-fps/quake3/ChangeLog
+++ b/games-fps/quake3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/quake3
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.53 2010/11/09 13:26:14 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.54 2010/11/13 07:33:45 mr_bones_ Exp $
+
+*quake3-1.36 (13 Nov 2010)
+
+  13 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  quake3-1.34_rc3.ebuild, +quake3-1.36.ebuild, quake3-9999.ebuild:
+  version bump; add opengl use dep for libsdl for bug #345213
 
   09 Nov 2010; Tupone Alfredo <tupone@gentoo.org> quake3-1.34_rc3.ebuild:
   Fix compiling as per bug #344441 by morgan wahl
diff --git a/games-fps/quake3/Manifest b/games-fps/quake3/Manifest
index dcf1623583ca..dfe238234034 100644
--- a/games-fps/quake3/Manifest
+++ b/games-fps/quake3/Manifest
@@ -1,6 +1,8 @@
 AUX quake3-1.34_rc3-gcc42.patch 766 RMD160 a584f52898bb9d8099dce89bcb88cd8fa099211d SHA1 72e524009f0f4bee75eadcc29ffc56bbbcf3d434 SHA256 3ded8cb46b60ee74fbfae97633f6dab371916b18a2c69b042e7eb1cf5ca78919
+DIST ioquake3-1.36.tar.bz2 3503058 RMD160 af9f65bbde2fe5531fa371ec6d2023126a523293 SHA1 0f92891e2b174253d02f666fd22e147c886089b4 SHA256 79b10b92e9e586748a67089ac871646fe8144004d3ab4a55158348bc38d74821
 DIST ioquake3_1.34-rc3.tar.bz2 3147694 RMD160 b270cd43a4f9f2700715cbd1487a8d0efab0296b SHA1 327d95a128aacc3bdd4e9497896651005cce8f92 SHA256 fb43f63178c6700f20b83634b816f77e390e375e7d9c717180c9820f0c541b01
-EBUILD quake3-1.34_rc3.ebuild 3029 RMD160 f6e1c30a3673744c6a51ef2be38225b77acd9376 SHA1 3b2a2cbc3457edfd934e6fdbf3a34647308f8c63 SHA256 e38928621a4d0027a5d79ac1bf912bd00c1c27a56f3f273c34be0d62fc0f71de
-EBUILD quake3-9999.ebuild 2858 RMD160 09e2a318b90017561088e3b1deee3312df879993 SHA1 262e00116a81fc040b7612ed2be286152e96331d SHA256 e415063d2a994607c590bee373aaf477ac3209906de518dd304e8360cc244c98
-MISC ChangeLog 4844 RMD160 731a7e7fbbe209862a022ed9ec6fc1ad4ca3cdea SHA1 93b34e4795189efed01bb27c45b70928f9668cf4 SHA256 87ac73adc15960ffd4b0bbbb3ad6c8dd251cc1d5ff440297a4deb046853fe3ba
+EBUILD quake3-1.34_rc3.ebuild 3039 RMD160 faf6f996abea6c308da7276530d9291ed1ee3706 SHA1 461b5b4e803595335e977b7bb93bbd51e75097e8 SHA256 c44f2d7119b022bb24151597f28733a6204fded6e6d52afbca435a6392a2cfc7
+EBUILD quake3-1.36.ebuild 2484 RMD160 bd76a126f91443fe29497cdb3c7fb8d432247b18 SHA1 564dad1205d9f1104e71f170482d5eaf66d6758d SHA256 ecd679f210393181e1782fe454bd9457dee1a89f50ef5e86c2d50ed50f3741fc
+EBUILD quake3-9999.ebuild 2485 RMD160 fcab8a971fb300177914ba30cff11a4953742878 SHA1 4bbe9e54ab1024b5a3646622b226113c437cf77f SHA256 8f67f8e0c19cd58f328b362e25ba83e86a970a27f7bc7de471c1e3e7231850cf
+MISC ChangeLog 5060 RMD160 aadd1cce529d31e307ef82955960ee939c6e0d20 SHA1 8f34831e1c6601dfaaa2f7bb390df4d96bebbe82 SHA256 bf747732a0259b8a275cede517cc82a97941004066e97cdc1457d353c01f86b1
 MISC metadata.xml 1052 RMD160 47127dc28337531fc3907c9d95f9d7d35d8e2d15 SHA1 08386bbbd1d751866a0201708cabfc8cbdfee975 SHA256 9552624bd6c0d0ac113dc2d283a41c556bd86948c5a14c98fb06e85948feb2aa
diff --git a/games-fps/quake3/quake3-1.34_rc3.ebuild b/games-fps/quake3/quake3-1.34_rc3.ebuild
index 8b79055877a7..e9f4101d48f4 100644
--- a/games-fps/quake3/quake3-1.34_rc3.ebuild
+++ b/games-fps/quake3/quake3-1.34_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.34_rc3.ebuild,v 1.12 2010/11/09 13:26:14 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.34_rc3.ebuild,v 1.13 2010/11/13 07:33:45 mr_bones_ Exp $
 
 # quake3-9999          -> latest svn
 # quake3-9999.REV      -> use svn REV
@@ -42,7 +42,7 @@ IUSE="dedicated opengl teamarena"
 
 UIDEPEND="virtual/opengl
 	media-libs/openal
-	media-libs/libsdl[joystick]"
+	media-libs/libsdl[joystick,opengl]"
 DEPEND="opengl? ( ${UIDEPEND} )
 	!dedicated? ( ${UIDEPEND} )"
 RDEPEND="${DEPEND}
diff --git a/games-fps/quake3/quake3-1.36.ebuild b/games-fps/quake3/quake3-1.36.ebuild
new file mode 100644
index 000000000000..0d344c6e8108
--- /dev/null
+++ b/games-fps/quake3/quake3-1.36.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.36.ebuild,v 1.1 2010/11/13 07:33:45 mr_bones_ 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
+
+EAPI=2
+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
+else
+	inherit flag-o-matic toolchain-funcs eutils games
+	SRC_URI="http://ioquake3.org/files/${PV}/ioquake3-${PV}.tar.bz2"
+	S=${WORKDIR}/io${P}
+fi
+
+DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
+HOMEPAGE="http://ioquake3.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="dedicated teamarena"
+
+DEPEND="!dedicated? (
+	virtual/opengl
+	media-libs/openal
+	media-libs/libsdl[joystick,opengl]
+	)"
+RDEPEND="${DEPEND}
+	games-fps/quake3-data
+	teamarena? ( games-fps/quake3-teamarena )"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		subversion_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	sed -i -e '/INSTALL/s: -s : :' Makefile || die
+}
+
+src_compile() {
+	filter-flags -mfpmath=sse
+	buildit() { use $1 && echo 1 || echo 0 ; }
+	emake \
+		V=1 \
+		BUILD_SERVER=1 \
+		BUILD_CLIENT=$(( $(buildit !dedicated) )) \
+		TEMPDIR="${T}" \
+		CC="$(tc-getCC)" \
+		ARCH=$(tc-arch-kernel) \
+		OPTIMIZE="${CFLAGS}" \
+		DEFAULT_BASEDIR="${GAMES_DATADIR}/quake3" \
+		DEFAULT_LIBDIR="$(games_get_libdir)/quake3" \
+		Q3ASM_CFLAGS="${CFLAGS}" \
+		|| die
+}
+
+src_install() {
+	dodoc id-readme.txt TODO README BUGS ChangeLog
+
+	if ! use dedicated ; then
+		doicon misc/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_get_libdir)"/${PN}/baseq3
+	doexe baseq3/*.so || die "baseq3 .so"
+	exeinto "$(games_get_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 5243e356c6f9..1b652b2d11fb 100644
--- a/games-fps/quake3/quake3-9999.ebuild
+++ b/games-fps/quake3/quake3-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.16 2009/08/10 02:43:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-9999.ebuild,v 1.17 2010/11/13 07:33:45 mr_bones_ Exp $
 
 # quake3-9999          -> latest svn
 # quake3-9999.REV      -> use svn REV
@@ -15,21 +15,10 @@ if [[ ${PV} == 9999* ]] ; then
 
 	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
-		http://ioquake3.org/files/${MY_P}.tar.bz2"
-	S=${WORKDIR}/${MY_P}
+	SRC_URI="http://ioquake3.org/files/${PV}/ioquake3-${PV}.tar.bz2"
+	S=${WORKDIR}/io${P}
 fi
 
 DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
@@ -37,14 +26,14 @@ HOMEPAGE="http://ioquake3.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="dedicated opengl teamarena"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="dedicated teamarena"
 
-UIDEPEND="virtual/opengl
+DEPEND="!dedicated? (
+	virtual/opengl
 	media-libs/openal
-	media-libs/libsdl[joystick]"
-DEPEND="opengl? ( ${UIDEPEND} )
-	!dedicated? ( ${UIDEPEND} )"
+	media-libs/libsdl[joystick,opengl]
+	)"
 RDEPEND="${DEPEND}
 	games-fps/quake3-data
 	teamarena? ( games-fps/quake3-teamarena )"
@@ -58,30 +47,30 @@ src_unpack() {
 }
 
 src_prepare() {
-	sed -i \
-		-e '/INSTALL/s: -s : :' \
-		Makefile code/tools/lcc/Makefile code/tools/asm/Makefile
+	sed -i -e '/INSTALL/s: -s : :' Makefile || die
 }
 
 src_compile() {
 	filter-flags -mfpmath=sse
 	buildit() { use $1 && echo 1 || echo 0 ; }
 	emake \
-		BUILD_SERVER=$(buildit dedicated) \
-		BUILD_CLIENT=$(( $(buildit opengl) | $(buildit !dedicated) )) \
+		V=1 \
+		BUILD_SERVER=1 \
+		BUILD_CLIENT=$(( $(buildit !dedicated) )) \
 		TEMPDIR="${T}" \
 		CC="$(tc-getCC)" \
 		ARCH=$(tc-arch-kernel) \
 		OPTIMIZE="${CFLAGS}" \
 		DEFAULT_BASEDIR="${GAMES_DATADIR}/quake3" \
 		DEFAULT_LIBDIR="$(games_get_libdir)/quake3" \
+		Q3ASM_CFLAGS="${CFLAGS}" \
 		|| die
 }
 
 src_install() {
 	dodoc id-readme.txt TODO README BUGS ChangeLog
 
-	if use opengl ; then
+	if ! use dedicated ; then
 		doicon misc/quake3.png
 		make_desktop_entry quake3 "Quake III Arena"
 	fi