xonotic: version bump, add s3tc USE

(Portage version: 2.1.10.11/git/Linux x86_64, unsigned Manifest commit)

5 files changed, 164 insertions, 5 deletions

diff --git a/games-fps/xonotic/ChangeLog b/games-fps/xonotic/ChangeLog
index d1fef0f..24fc1e9 100644
--- a/games-fps/xonotic/ChangeLog
+++ b/games-fps/xonotic/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xonotic-0.5.0 (08 Sep 2011)
+
+  08 Sep 2011; Nikoli <nikoli@lavabit.com> +xonotic-0.5.0.ebuild,
+  xonotic-9999.ebuild, metadata.xml:
+  version bump, add s3tc USE
+
   05 Jul 2011; Nikoli <nikoli@lavabit.com> xonotic-9999.ebuild:
   migrate to git-2
 
diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest
index dd81cfb..e4b99f8 100644
--- a/games-fps/xonotic/Manifest
+++ b/games-fps/xonotic/Manifest
@@ -1,5 +1,7 @@
 DIST xonotic-0.1.0preview.zip 1386789859 RMD160 abcf512141e9aab970ff0a91c0c0d02ac8a3b4b9 SHA1 debda2b012e6cf423fe61435f02226746fdaf9fb SHA256 7f86a9e87d050cc490fb15e3e27142a8c2522ad84907d78dadc294bf7a687b0d
+DIST xonotic-0.5.0.zip 988512100 RMD160 92a56d33c11d78884639fd0d5095589ff86b8fe0 SHA1 716135609ef953f2fbed97bd6a3cf116b7afd7a9 SHA256 58e7226a8b534858f8161c378071f4dab168e2c683f1f986e6e65be75a5b730f
 EBUILD xonotic-0.1.0_pre.ebuild 3190 RMD160 1fe7e1afcdb07d8e1d195177016fec888f9983f1 SHA1 a34e528c014d4bf267f7925da96dd03527f3ace4 SHA256 5877c297bab69f5cef570915fdac12b57213e95136b8bd16b9fc277a0f850f92
-EBUILD xonotic-9999.ebuild 3244 RMD160 a345a96fa9a35197917a2fcbd4dad41e378b1691 SHA1 72a1c8bc0b61453a10ad2c891e4c1194ed478fdd SHA256 64b02f46d97cc1e7f21eb2401ad9e97f2067b3a428fb00a326d427b3e82fcfab
-MISC ChangeLog 932 RMD160 77d51b8e2e60d1e73075d693d7e7b8618d0b6381 SHA1 4dfe32ece1bdc5752c5ef906804236d2c1c8221b SHA256 3056902620b83cc22607a92541071776f7953da0ec65af2570058703bc229818
-MISC metadata.xml 246 RMD160 fe65f53ca2aa31f6d8c4fc4ee289e6c67b53441f SHA1 15de876352ad307fca2fd3468eab43bf327ac848 SHA256 9ff4ee44fd0e30e11a2fc610b39ff825cc265c0ee045c18c1a5873e7b579f6e6
+EBUILD xonotic-0.5.0.ebuild 3139 RMD160 745b95478418b38d2725cd9329397fc87e999ba7 SHA1 c7044d76d7373344835f35effed7cb0915118098 SHA256 612b66ba4c18a1dce89ae483e82f4ec8699f687dc251d9ba074a1d4a385a29a6
+EBUILD xonotic-9999.ebuild 3251 RMD160 54796706deb4d658c53f976dbb40db242e29db47 SHA1 13eb464f145fb138213101472af5bd67ae5e3562 SHA256 562dbdaac2a9e2330dae33d9c6e1a04f43d6f3ce6ca0e743076530be0459f073
+MISC ChangeLog 1095 RMD160 f86f7b10ab7e4f8c02bc0c132fce57a10a72c31d SHA1 9d052d22374ea3beb69bd067eb7cb791290c43e6 SHA256 b989083605a066e55fe32c6eb16a18a8183dfa8160428b11080598c90be49149
+MISC metadata.xml 393 RMD160 c8032514d0e8873720ac170dbbf08fb901c923aa SHA1 edfd5f69eb3af9c523327f07459c6c47aad3f332 SHA256 c90c2b8b95fb2c5b504ff71614f6e55eabb963fcc4a3e8e8ae94fc477cab4d3e
diff --git a/games-fps/xonotic/metadata.xml b/games-fps/xonotic/metadata.xml
index bbbc0be..bbe9193 100644
--- a/games-fps/xonotic/metadata.xml
+++ b/games-fps/xonotic/metadata.xml
@@ -6,4 +6,7 @@
 		<email>nikoli@lavabit.com</email>
 		<name>Nikoli</name>
 	</maintainer>
+	<use>
+		<flag name='s3tc'>Install <pkg>media-libs/libtxc_dxtn</pkg> for S3TC texture (de)compression, works with mesa drivers only</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-fps/xonotic/xonotic-0.5.0.ebuild b/games-fps/xonotic/xonotic-0.5.0.ebuild
new file mode 100644
index 0000000..b0c5b79
--- /dev/null
+++ b/games-fps/xonotic/xonotic-0.5.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils games toolchain-funcs check-reqs
+
+MY_PN="${PN^}"
+DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
+HOMEPAGE="http://www.xonotic.org/"
+SRC_URI="http://dl.xonotic.org/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa crypt debug dedicated opengl +s3tc sdl"
+
+UIRDEPEND="
+	media-libs/libogg
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/libmodplug
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+	virtual/opengl
+	media-libs/freetype:2
+	alsa? ( media-libs/alsa-lib )
+	s3tc? ( media-libs/libtxc_dxtn )
+	sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video,alsa?] )
+"
+UIDEPEND="
+	x11-proto/xextproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xproto
+"
+RDEPEND="
+	sys-libs/zlib
+	virtual/jpeg
+	media-libs/libpng
+	net-misc/curl
+	~dev-libs/d0_blind_id-0.3[crypt?]
+	opengl? ( ${UIRDEPEND} )
+	!dedicated? ( !opengl? ( ${UIRDEPEND} ) )
+"
+DEPEND="${RDEPEND}
+	opengl? ( ${UIDEPEND} )
+	!dedicated? ( !opengl? ( ${UIDEPEND} ) )
+"
+
+S="${WORKDIR}/${MY_PN}"
+
+pkg_setup() {
+	ewarn "You need 943 MiB diskspace for distfiles."
+	CHECKREQS_DISK_BUILD="1960M"
+	CHECKREQS_DISK_USR="900M"
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# for darkplaces
+	tc-export CC
+
+	# use system libs
+	rm -rf misc/buildfiles/
+
+	# Engine
+	pushd source/darkplaces
+	sed -i \
+		-e "/^EXE_/s:darkplaces:${PN}:" \
+		-e "s:-O3:${CFLAGS}:" \
+		-e "/-lm/s:$: ${LDFLAGS}:" \
+		-e '/^STRIP/s/strip/true/' \
+		makefile.inc || die "sed failed"
+
+	if use !alsa; then
+		sed -e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
+			-i makefile || die "sed failed"
+	fi
+	popd
+}
+
+src_compile() {
+	# Engine
+	cd source/darkplaces
+	if use debug; then
+		ENGINEOPTS="debug"
+	else
+		ENGINEOPTS="release"
+	fi
+	ENGINEOPTS+=" DP_LINK_TO_LIBJPEG=1 DP_FS_BASEDIR=${GAMES_DATADIR}/${PN}"
+
+	if use opengl || ! use dedicated; then
+		emake cl-${ENGINEOPTS} || die "emake cl-${ENGINEOPTS} failed"
+		if use sdl; then
+			emake sdl-${ENGINEOPTS} || die "emake sdl-${ENGINEOPTS} failed"
+		fi
+	fi
+
+	if use dedicated; then
+		emake sv-${ENGINEOPTS} || die "emake sv-${ENGINEOPTS} failed"
+	fi
+}
+
+src_install() {
+	# Engine & docs
+	pushd source/darkplaces
+	if use opengl || use !dedicated; then
+		dogamesbin ${PN}-glx || die "dogamesbin glx failed"
+		newicon ../../misc/logos/${PN}_icon.svg ${PN}.svg
+		make_desktop_entry ${PN}-glx "${MY_PN} (GLX)"
+
+		if use sdl; then
+			dogamesbin ${PN}-sdl || die "dogamesbin sdl failed"
+			make_desktop_entry ${PN}-sdl "${MY_PN} (SDL)"
+			dosym ${PN}-sdl "${GAMES_BINDIR}"/${PN}
+		else
+			dosym ${PN}-glx "${GAMES_BINDIR}"/${PN}
+		fi
+	fi
+
+	if use dedicated; then
+		dogamesbin ${PN}-dedicated || die "dogamesbin dedicated failed"
+	fi
+	popd
+
+	dodoc Docs/*.txt
+	dohtml -r Docs
+
+	insinto "${GAMES_DATADIR}/${PN}"
+
+	# public key for d0_blind_id
+	doins key_0.d0pk || die
+
+	if use dedicated; then
+		doins -r server || die "doins server failed"
+	fi
+
+	# Data
+	doins -r data || die "doins data failed"
+
+	prepgamesdirs
+}
diff --git a/games-fps/xonotic/xonotic-9999.ebuild b/games-fps/xonotic/xonotic-9999.ebuild
index 79974ad..472ca23 100644
--- a/games-fps/xonotic/xonotic-9999.ebuild
+++ b/games-fps/xonotic/xonotic-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_REPO_URI="${BASE_URI}${PN}.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa crypt debug dedicated opengl sdl"
+IUSE="alsa crypt debug dedicated opengl +s3tc sdl"
 
 UIRDEPEND="
 	media-libs/libogg
@@ -32,9 +32,9 @@ UIRDEPEND="
 	media-libs/freetype:2
 	~games-fps/xonotic-data-9999[client]
 	alsa? ( media-libs/alsa-lib )
+	s3tc? ( media-libs/libtxc_dxtn )
 	sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video,alsa?] )
 "
-# s3tc? ( dev-libs/libtxc_dxtn )
 UIDEPEND="
 	x11-proto/xextproto
 	x11-proto/xf86dgaproto