old

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 6 insertions, 284 deletions

diff --git a/games-fps/quake3/ChangeLog b/games-fps/quake3/ChangeLog
index f2c4a98cef2c..06168eec2a7d 100644
--- a/games-fps/quake3/ChangeLog
+++ b/games-fps/quake3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.67 2013/01/13 11:30:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.68 2013/01/31 00:38:52 mr_bones_ Exp $
+
+  31 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/quake3-1.34_rc3-gcc42.patch, -quake3-1.34_rc3.ebuild,
+  -quake3-1.36.ebuild:
+  old
 
   13 Jan 2013; Agostino Sarubbo <ago@gentoo.org> quake3-1.36-r1.ebuild:
   Stable for x86, wrt bug #447164
diff --git a/games-fps/quake3/files/quake3-1.34_rc3-gcc42.patch b/games-fps/quake3/files/quake3-1.34_rc3-gcc42.patch
deleted file mode 100644
index d62abcaf480a..000000000000
--- a/games-fps/quake3/files/quake3-1.34_rc3-gcc42.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: code/tools/asm/cmdlib.c
-===================================================================
---- code/tools/asm/cmdlib.c	(revision 1098)
-+++ code/tools/asm/cmdlib.c	(revision 1099)
-@@ -312,7 +312,7 @@ char *ExpandArg (const char *path)
- char *ExpandPath (const char *path)
- {
- 	static char full[1024];
--	if (!qdir)
-+	if (!qdir[0])
- 		Error ("ExpandPath called without qdir set");
- 	if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
- 		strcpy( full, path );
-@@ -325,7 +325,7 @@ char *ExpandPath (const char *path)
- char *ExpandGamePath (const char *path)
- {
- 	static char full[1024];
--	if (!qdir)
-+	if (!qdir[0])
- 		Error ("ExpandGamePath called without qdir set");
- 	if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
- 		strcpy( full, path );
diff --git a/games-fps/quake3/quake3-1.34_rc3.ebuild b/games-fps/quake3/quake3-1.34_rc3.ebuild
deleted file mode 100644
index e9f4101d48f4..000000000000
--- a/games-fps/quake3/quake3-1.34_rc3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.13 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
-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}
-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 opengl teamarena"
-
-UIDEPEND="virtual/opengl
-	media-libs/openal
-	media-libs/libsdl[joystick,opengl]"
-DEPEND="opengl? ( ${UIDEPEND} )
-	!dedicated? ( ${UIDEPEND} )"
-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() {
-	if [[ ${PV} == 9999* ]] ; then
-		:
-	else
-		epatch "${FILESDIR}"/${P}-gcc42.patch
-	fi
-	sed -i \
-		-e '/INSTALL/s: -s : :' \
-		Makefile code/tools/lcc/Makefile code/tools/asm/Makefile
-}
-
-src_compile() {
-	filter-flags -mfpmath=sse
-	buildit() { use $1 && echo 1 || echo 0 ; }
-	emake \
-		BUILD_SERVER=$(buildit dedicated) \
-		BUILD_CLIENT=$(( $(buildit opengl) | $(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
-	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_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-1.36.ebuild b/games-fps/quake3/quake3-1.36.ebuild
deleted file mode 100644
index 2a34007042ec..000000000000
--- a/games-fps/quake3/quake3-1.36.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 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.7 2012/07/13 03:45:47 jdhore 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
-inherit eutils flag-o-matic games toolchain-funcs
-[[ "${PV}" == 9999* ]] && inherit subversion
-
-MY_PN="ioquake3"
-MY_PV="${PV}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
-HOMEPAGE="http://ioquake3.org/"
-[[ "${PV}" != 9999* ]] && SRC_URI="http://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
-ESVN_REPO_URI="svn://svn.icculus.org/quake3/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-# "smp" is omitted, because currently it does not work.
-IUSE="dedicated opengl teamarena +openal curl vorbis voice mumble"
-
-UIDEPEND="virtual/opengl
-	media-libs/libsdl[audio,video,joystick,X,opengl]
-	openal? ( media-libs/openal )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voice? ( media-libs/speex )
-	curl? ( net-misc/curl )"
-DEPEND="opengl? ( ${UIDEPEND} )
-	!dedicated? ( ${UIDEPEND} )"
-UIRDEPEND="voice? ( mumble? ( media-sound/mumble ) )"
-RDEPEND="${DEPEND}
-	opengl? ( ${UIRDEPEND} )
-	!dedicated? ( ${UIRDEPEND} )
-	games-fps/quake3-data
-	teamarena? ( games-fps/quake3-teamarena )"
-
-if [[ "${PV}" == 9999* ]] ; then
-	S="${WORKDIR}/trunk"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-my_arch() {
-	case "${ARCH}" in
-		x86)    echo "i386" ;;
-		amd64)  echo "x86_64" ;;
-		*)      tc-arch-kernel ;;
-	esac
-}
-
-my_platform() {
-	case "${ARCH}" in
-		alpha|amd64|ppc|x86)  echo "linux" ;;
-		x86-fbsd)             echo "freebsd" ;;
-	esac
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999* ]] ; then
-		# Workaround for the version string
-		ln -s "${ESVN_WC_PATH}/.svn" .svn || die "ln ${ESVN_WC_PATH}/.svn"
-	else
-		epatch "${FILESDIR}"/${P}-bots.patch
-	fi
-
-	einfo "Fixing libspeex linking..."
-	sed -i -e 's/\(-lspeex\)/\1 -lspeexdsp/' Makefile || die "sed failed"
-}
-
-src_compile() {
-
-	buildit() { use $1 && echo 1 || echo 0 ; }
-
-	# This is the easiest way to pass CPPFLAGS to the build system, which
-	# are otherwise ignored.
-	append-flags ${CPPFLAGS}
-
-	# OPTIMIZE is disabled in favor of CFLAGS.
-	#
-	# TODO: BUILD_CLIENT_SMP=$(buildit smp)
-	emake \
-		ARCH="$(my_arch)" \
-		BUILD_CLIENT=$(( $(buildit opengl) | $(buildit !dedicated) )) \
-		BUILD_GAME_QVM=0 \
-		BUILD_GAME_SO=0 \
-		BUILD_SERVER=$(buildit dedicated) \
-		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
-		GENERATE_DEPENDENCIES=0 \
-		OPTIMIZE="" \
-		PLATFORM="$(my_platform)" \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_CURL=$(buildit curl) \
-		USE_CURL_DLOPEN=0 \
-		USE_INTERNAL_SPEEX=0 \
-		USE_INTERNAL_ZLIB=0 \
-		USE_LOCAL_HEADERS=0 \
-		USE_MUMBLE=$(buildit mumble) \
-		USE_OPENAL=$(buildit openal) \
-		USE_OPENAL_DLOPEN=0 \
-		USE_VOIP=$(buildit voice) \
-		|| die "emake failed"
-}
-
-src_install() {
-	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README TODO || die
-	if use voice ; then
-		dodoc voip-readme.txt || die
-	fi
-
-	if use opengl || ! use dedicated ; then
-		doicon misc/quake3.svg || die
-		make_desktop_entry quake3 "Quake III Arena"
-		#use smp && make_desktop_entry quake3-smp "Quake III Arena (SMP)"
-	fi
-
-	cd build/release-$(my_platform)-$(my_arch) || die
-	local exe target
-	for exe in {ioquake3,ioquake3-smp,ioq3ded}.$(my_arch) ; do
-		if [[ -x ${exe} ]] ; then
-			target=${exe%.*}
-			newgamesbin ${exe} ${target} || die "newgamesbin ${target}"
-			dosym ${target} "${GAMES_BINDIR}/${target/io}" || die "dosym ${target}"
-		fi
-	done
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	ewarn "The source version of Quake III Arena will not work with PunkBuster."
-	ewarn "If you need PB support, then use the games-fps/quake3-bin package."
-}