Version bump to 0.6.0. No factical changes apart from bumped dep on d0_blind_id and einfo on media-libs/libtxc_dxtn. Fixes bug#407531.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 133 insertions, 7 deletions

diff --git a/games-fps/xonotic/ChangeLog b/games-fps/xonotic/ChangeLog
index a6c5f04524ed..7b83033eaee8 100644
--- a/games-fps/xonotic/ChangeLog
+++ b/games-fps/xonotic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/xonotic
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/xonotic/ChangeLog,v 1.4 2011/11/11 09:20:06 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/xonotic/ChangeLog,v 1.5 2012/03/09 18:30:11 scarabeus Exp $
+
+*xonotic-0.6.0 (09 Mar 2012)
+
+  09 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> +xonotic-0.6.0.ebuild:
+  Version bump to 0.6.0. No factical changes apart from bumped dep on
+  d0_blind_id and einfo on media-libs/libtxc_dxtn. Fixes bug#407531.
 
   11 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> xonotic-0.5.0.ebuild:
   x86 stable wrt bug #389269
diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest
index 3648c1ead2ae..734afc372bb8 100644
--- a/games-fps/xonotic/Manifest
+++ b/games-fps/xonotic/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST xonotic-0.5.0.zip 988512100 RMD160 92a56d33c11d78884639fd0d5095589ff86b8fe0 SHA1 716135609ef953f2fbed97bd6a3cf116b7afd7a9 SHA256 58e7226a8b534858f8161c378071f4dab168e2c683f1f986e6e65be75a5b730f
+DIST xonotic-0.6.0.zip 1010847148 RMD160 e5fa5028a2aba307edfb5c9646edb2c89577a3f7 SHA1 6bc88a32823babbec7e7a7035c7c448a83f1a686 SHA256 e8a7dbfdea1ba6250ddf363f01899411f22e518526fae4f0b4f90d622fab3819
 EBUILD xonotic-0.5.0.ebuild 2438 RMD160 afc7a9cfb9b84e24654be8b6281250ed17d1cce8 SHA1 b0f94bcae3953929ea224bff90cba897d5f6341c SHA256 7a0b5c8531391d755a5a13ac5a3ca3db016830ff59e6bf0f84ec93dc73b59642
-MISC ChangeLog 761 RMD160 c493e191e71390794538df6a239d94e06a5a6a11 SHA1 c1564b3d53ca53b09155f1506ab3dddf77045fd0 SHA256 f20d23c29be20c11c5db66e711b439d4d5d2e8a5b91c9d145e4cba16ae22f43a
+EBUILD xonotic-0.6.0.ebuild 2554 RMD160 041450e373bf4c73eaac5059cd852ae712a8922f SHA1 4dbf7397e7d3ea804b5dd4fd848a318fb106c7d3 SHA256 89057e24ca99f654d8622c0fa57a7d75041ea25777281a2cf0208d16dea17a77
+MISC ChangeLog 1008 RMD160 00c10786e7b04eb6421611d9edf236ed338edee6 SHA1 73ea1df6583121b0238a1a7496a1b9523d71ea4b SHA256 24cc0b109063d70e117090ef60e95457b4f6dde88789509f094ef8ec0c99a99e
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk686McACgkQuUQtlDBCeQIXKwCdHhDBtiJJbpkF3N6eEXyR5gVa
-Zw0An2dt53Mi4ARoxAhsoYXJvDOGdzLX
-=Heay
+iQIcBAEBAgAGBQJPWkw7AAoJEOSiRoyO7jvoMNwQAIYphatXoQj68rkj+DkWe4Mj
+FJX9ydLt19HphXmrepbETHxR5tQ4RCtK3qeSiHnhZqcbBiJ60LQk5Xlu7x1QPBAg
+MjSu0n3J5EH4xCyorQOHEFXoeN203mppvDRScWZkfzJvHfLZSGwtMUkvbqF4Aywk
+bHQ2pHzIVgB5p9kghjgENmPHkJ0I2JcGkwnCsUz9OZbPMzlHvbsd+dSO48Ii18gV
+wCg6QwGG51wvRjWvwUB6wo5fFMPbCHLIai/Srb4YWqbe5CD67I0j9i68HZZLy8VZ
+tf6vXzS3Y2MtEVZh3T3k7i5/pYGFHG4GPJPT7Hhq7J0I5ofZJ/Kt91v5WOy8eiBK
+p+pcSbBlgUwonddOitZMe+1/duCzPqDByh5ztNGuk26fyMc3r3ExeO2iM5scvcI5
+E1ZMik/fe73bE30U0B1mmBHj3yrVsrAH2e3sr5VPsbonggwdy8KLZYowMP9uTpf5
+i7s5ocuY4h8zPnuBYDGoIUaub667UcXg4qy7CkqbekfsWi971NdCWgJX7G6/fAQP
+0aB+0x0Xu6rvL/ZnKZSkz2sXbxkRO1jIms9afrxwjl9e2QFo4br6FjD6JeERlLPG
+zd4oc2rx1lRo9TqoTQGgee++s/9yZWyXJPs/UPr+dA42tQH2+XxCVUKEZZFMOcDv
+qzEUJCBkEpXdAbt37vrr
+=UEke
 -----END PGP SIGNATURE-----
diff --git a/games-fps/xonotic/xonotic-0.6.0.ebuild b/games-fps/xonotic/xonotic-0.6.0.ebuild
new file mode 100644
index 000000000000..d920c264cb57
--- /dev/null
+++ b/games-fps/xonotic/xonotic-0.6.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/xonotic/xonotic-0.6.0.ebuild,v 1.1 2012/03/09 18:30:11 scarabeus Exp $
+
+EAPI=3
+inherit eutils check-reqs games
+
+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 debug dedicated doc 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 )
+	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.5
+	!dedicated? ( ${UIRDEPEND} )"
+DEPEND="${RDEPEND}
+	!dedicated? ( ${UIDEPEND} )"
+
+S=${WORKDIR}/${MY_PN}
+
+pkg_setup() {
+	CHECKREQS_DISK_BUILD="1200M"
+	CHECKREQS_DISK_USR="950M"
+	check-reqs_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	rm -rf misc/buildfiles/ # use system libs
+
+	sed -i \
+		-e "/^EXE_/s:darkplaces:${PN}:" \
+		-e "s:-O3:${CFLAGS}:" \
+		-e "/-lm/s:$: ${LDFLAGS}:" \
+		-e '/^STRIP/s/strip/true/' \
+		source/darkplaces/makefile.inc || die
+
+	if ! use alsa; then
+		sed -i \
+			-e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
+			source/darkplaces/makefile || die
+	fi
+}
+
+src_compile() {
+	local t="$(use debug && echo debug || echo release)"
+	local d
+
+	for d in sv-${t} $(use !dedicated && echo "cl-${t} $(use sdl && echo sdl-${t})")
+	do
+		emake \
+			DP_LINK_TO_LIBJPEG=1 DP_FS_BASEDIR="${GAMES_DATADIR}/${PN}" \
+			-C source/darkplaces ${d} || die
+	done
+}
+
+src_install() {
+	if ! use dedicated; then
+		dogamesbin source/darkplaces/${PN}-glx || die
+		newicon misc/logos/${PN}_icon.svg ${PN}.svg
+		make_desktop_entry ${PN}-glx "${MY_PN} (GLX)"
+
+		if use sdl; then
+			dogamesbin source/darkplaces/${PN}-sdl || die
+			make_desktop_entry ${PN}-sdl "${MY_PN} (SDL)"
+		fi
+	fi
+	dogamesbin source/darkplaces/${PN}-dedicated || die
+
+	dodoc Docs/*.txt
+	use doc && dohtml -r Docs
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r key_0.d0pk server data || die
+	prepgamesdirs
+
+	einfo "If you are using opensource drivers you should condider installing: "
+	einfo "    media-libs/libtxc_dxtn"
+}