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

(Portage version: 2.1.8.3/cvs/Linux i686)

4 files changed, 123 insertions, 30 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/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