Version bump, bug #245703

Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.27.10 i686

4 files changed, 17 insertions, 117 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/Manifest b/games-fps/alienarena/Manifest
index e11c5c5c0e80..c4303d3b7693 100644
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -3,18 +3,16 @@ Hash: SHA1
 
 AUX alienarena-20071011-paths.patch 614 RMD160 6cce7779a54bff08a58a3a4fae2a3c0c0efbb624 SHA1 62d127c696a29d0b5e60cf56063d84d04d939fe8 SHA256 d85ec14925def732accbd7dd4594d7da90b0c6ff71bb6f04c8b257c2d05f66bd
 AUX alienarena-20080227-include.patch 2911 RMD160 aa99eb2947eed9659b91bde9ef1e56a6228c6028 SHA1 4d6a0c61092249c098564250d418fc99f99b7e23 SHA256 b73f6d64bd5187ec166e30b189a78e8751b4e4e1e67a10dcd88814dfe1321fbf
-DIST alienarena2007-20071011-linux.zip 245067302 RMD160 838167095481bf77446fd1286f3c75ebdd2361ad SHA1 6af33de5013d84701c2143fe1836e0721af1817a SHA256 33036bd0dec77ae06c113d8e06718bd6f9e42efb634ee304c3fd9d48184c2e20
-DIST alienarena2008-linux20080227.zip 223329701 RMD160 b3db80a2b63ad75d6e41baab30bec8ce8919db67 SHA1 84b6f853ae923f19b942c6800281b24ae669c51e SHA256 fe4325465b1b12e8a39552022d812531adae5273a79c2940514568b533e73e44
 DIST alienarena2008-linux20080603.zip 254018226 RMD160 adbe89706a74af7aa3484b9abecf9f50e179cece SHA1 ba81c19b7262fa36f51be86db7c0df50bd9d529a SHA256 d26c5b3a68a0975a3adf43cfa297a684121ca382057efc601411f53303972f39
-EBUILD alienarena-20071011.ebuild 2611 RMD160 7131c7022c43c9013c042f00648af2c1ae607965 SHA1 b134fd33c1becd134c8413b3600e09d1f4b02e92 SHA256 bf921873ee21209889bc2f1a68e31ccf49f48e3b189d11767d64937417042748
-EBUILD alienarena-20080227.ebuild 2648 RMD160 a54f090935c72b9df9c88a1da1f0fdfcfe1fb719 SHA1 1666448d0ea1cc188a8109800549e87003269471 SHA256 9456d67ceda12a1a376b9497cf34e5429696f8ce6a65f918f29a74118c5d09de
+DIST alienarena2008-linux20081016.zip 269084804 RMD160 65111ab6ac2a82efb045b39425cbf8a7eab1c1e2 SHA1 16cc5e40a0966489e902c53d7f779df04d670017 SHA256 50d69489495d561f7f15754b6cd6cdf3037521d11c21bb851be8c4d5132c3f26
 EBUILD alienarena-20080603.ebuild 2429 RMD160 733fcd7bcbd4d870d83603bca57694f36fa8d3eb SHA1 e55c8f48b697cf1c09f47e9fd462eba72bfb76c5 SHA256 ca7f7d8c05c4e93fc17a09bdb695dc670623e4ae9b1914cc1fe42e8f6abe1591
-MISC ChangeLog 2111 RMD160 1b166faa8581a66eaa9574324be59bc6ee5cc94d SHA1 dffc21150ea6ca735fa17d3f963a6e09446aaf7c SHA256 9cd2aad972996d75c3c30c68491bfcbff6f43f1db37f620a09a9c18c1d78a642
+EBUILD alienarena-20081016.ebuild 2398 RMD160 b4712fb0646c059c673aab881ded4822b3dad9c9 SHA1 7198fc6bcf48050256d788e4e781967e6fe2b3bc SHA256 b34fd6fb5af9000fe902674399ed82619064c7338a59df63bcd87c5f3e7546bf
+MISC ChangeLog 2253 RMD160 018a7522f7d5a2c77919668c9b7666fda356f93f SHA1 0fb4374ec11ee8ebe04be240b44013be2c6c87ac SHA256 a9749825e66e5b1da498fadf32f07b4c27e4927bedc8a32e549f09c5e973f1d6
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhIvmwACgkQdz7hIScOURGCdQCgnw4+9d3Cs6I2DU7+MLUfNK6S
-BggAn2jJA4eR9lo/h//WsFWo5F/SAgCb
-=2ulE
+iEYEARECAAYFAklPzMEACgkQdz7hIScOURGrJgCfUOTK3BHDPecoDF+2JMyJ/YyZ
+0/IAn32g29OdcYuILOVtpvhd3gCOJ899
+=Q+Lk
 -----END PGP SIGNATURE-----
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"