Version bump, bug #245703

(Portage version: 2.2_rc18/cvs/Linux 2.6.27.10 i686)

3 files changed, 11 insertions, 109 deletions

diff --git a/games-fps/alienarena/ChangeLog b/games-fps/alienarena/ChangeLog
index 2cdab7380949..a6165ae94213 100644
--- a/games-fps/alienarena/ChangeLog
+++ b/games-fps/alienarena/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/alienarena
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.11 2008/06/06 04:34:37 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.12 2008/12/22 17:20:30 nyhm Exp $
+
+*alienarena-20081016 (22 Dec 2008)
+
+  22 Dec 2008; Tristan Heaven <nyhm@gentoo.org> +alienarena-20081016.ebuild:
+  Version bump, bug #245703
 
 *alienarena-20080603 (06 Jun 2008)
 
diff --git a/games-fps/alienarena/alienarena-20071011.ebuild b/games-fps/alienarena/alienarena-20071011.ebuild
deleted file mode 100644
index a0e39f12e0f5..000000000000
--- a/games-fps/alienarena/alienarena-20071011.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20071011.ebuild,v 1.2 2008/01/22 04:46:06 nyhm Exp $
-
-inherit eutils flag-o-matic toolchain-funcs games
-
-MY_PN=${PN}${PV:0:4}
-DESCRIPTION="Fast-paced multiplayer deathmatch game"
-HOMEPAGE="http://red.planetarena.org/"
-SRC_URI="http://icculus.org/${PN}/files/${MY_PN}-${PV}-linux.zip"
-
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl sdl"
-
-UIRDEPEND="media-libs/jpeg
-	media-libs/libpng
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
-	sdl? ( media-libs/libsdl )"
-RDEPEND="opengl? ( ${UIRDEPEND} )
-	!opengl? ( !dedicated? ( ${UIRDEPEND} ) )
-	net-misc/curl"
-UIDEPEND="x11-proto/xf86dgaproto
-	x11-proto/xf86vidmodeproto"
-DEPEND="${RDEPEND}
-	opengl? ( ${UIDEPEND} )
-	!opengl? ( !dedicated? ( ${UIDEPEND} ) )
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_PN}/source
-
-src_unpack() {
-	unpack ${A}
-	cd "${MY_PN}"
-
-	rm -f */*.so *.dll crded crx crx.sdl
-
-	epatch "${FILESDIR}"/${P}-paths.patch
-
-	cd "${S}"
-	sed -i \
-		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
-		-e "s:GENTOO_LIBDIR:$(games_get_libdir)/${PN}:" \
-		unix/sys_unix.c \
-		|| die "sed sys_unix.c"
-}
-
-src_compile() {
-	# To avoid audio crackling
-	[[ $(gcc-fullversion) == "4.1.1" ]] && replace-flags -O? -O0
-
-	emake \
-		CC="$(tc-getCC)" \
-		BASE_CFLAGS="${CFLAGS} -Dstricmp=strcasecmp -D_stricmp=strcasecmp -DHAVE_CURL" \
-		OPTIMIZED_CFLAGS= \
-		$(use sdl && echo SDLSOUND=1) \
-		$(use opengl && ! use dedicated && echo BUILD=GAME) \
-		$(! use opengl && use dedicated && echo BUILD=DEDICATED) \
-		$(use opengl && use dedicated && echo BUILD=ALL) \
-		$(! use opengl && ! use dedicated && echo BUILD=GAME) \
-		|| die "emake failed"
-}
-
-src_install() {
-	cd release
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe game.so || die "doexe failed"
-
-	if use opengl || ! use dedicated ; then
-		newgamesbin crx ${PN}-oss || die "newgamesbin crx failed"
-		make_desktop_entry ${PN}-oss "Alien Arena (OSS audio)"
-		use sdl || dosym ${PN}-oss "${GAMES_BINDIR}"/${PN}
-	fi
-
-	if use sdl ; then
-		newgamesbin crx.sdl ${PN}-sdl || die "newgamesbin crx.sdl failed"
-		make_desktop_entry ${PN}-sdl "Alien Arena (SDL audio)"
-		dosym ${PN}-sdl "${GAMES_BINDIR}"/${PN}
-	fi
-
-	if use dedicated ; then
-		newgamesbin crded ${PN}-ded || die "newgamesbin crded failed"
-	fi
-
-	cd "${WORKDIR}/${MY_PN}"
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r arena botinfo data1 || die "doins failed"
-	newicon aa.png ${PN}.png || die "newicon"
-	dodoc docs/README.txt
-
-	prepgamesdirs
-}
diff --git a/games-fps/alienarena/alienarena-20080227.ebuild b/games-fps/alienarena/alienarena-20081016.ebuild
index 085630ec4340..594780848605 100644
--- a/games-fps/alienarena/alienarena-20080227.ebuild
+++ b/games-fps/alienarena/alienarena-20081016.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20080227.ebuild,v 1.2 2008/03/25 22:18:56 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20081016.ebuild,v 1.1 2008/12/22 17:20:30 nyhm Exp $
 
-inherit eutils flag-o-matic toolchain-funcs games
+inherit eutils toolchain-funcs games
 
 MY_PN=${PN}${PV:0:4}
 DESCRIPTION="Fast-paced multiplayer deathmatch game"
@@ -30,21 +30,14 @@ DEPEND="${RDEPEND}
 	!opengl? ( !dedicated? ( ${UIDEPEND} ) )
 	app-arch/unzip"
 
-S=${WORKDIR}/${MY_PN}/source
+S=${WORKDIR}/source
 
 src_unpack() {
 	unpack ${A}
-	cd ${MY_PN}
-	rm -f */*.so cr*
-	mv data1/scripts/maps/tca-titan2k8{\ ,}.rscript
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-include.patch
+	rm -f */*.so
 }
 
 src_compile() {
-	# To avoid audio crackling (gcc bug)
-	[[ $(gcc-fullversion) == "4.1.1" ]] && replace-flags -O? -O0
-
 	emake \
 		CC="$(tc-getCC)" \
 		OPTIMIZED_CFLAGS=no \
@@ -83,7 +76,7 @@ src_install() {
 		newgamesbin crded ${PN}-ded || die "newgamesbin crded failed"
 	fi
 
-	cd "${WORKDIR}/${MY_PN}"
+	cd "${WORKDIR}"
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r arena botinfo data1 || die "doins failed"
 	newicon aa.png ${PN}.png || die "newicon failed"