version bump

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 200 insertions, 2 deletions

diff --git a/games-fps/darkplaces/ChangeLog b/games-fps/darkplaces/ChangeLog
index 37e3e929d737..8253979e79a5 100644
--- a/games-fps/darkplaces/ChangeLog
+++ b/games-fps/darkplaces/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/darkplaces
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.6 2010/03/17 20:17:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.7 2010/04/18 05:50:21 mr_bones_ Exp $
+
+*darkplaces-20100408 (18 Apr 2010)
+
+  18 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +darkplaces-20100408.ebuild:
+  version bump
 
 *darkplaces-20100221_beta1 (17 Mar 2010)
 
diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index 01f471624774..19ac2d5731d2 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,6 +1,8 @@
 DIST darkplacesengine20100221beta1.zip 16945797 RMD160 009619b8b36015afce9ffffee56163dd538b04ee SHA1 01ca5b781ffbc1a078e2a01d224cf768146ba6b2 SHA256 245f14452897912c9e982fef4e2ecdaf9573fb66b1caae463b21f8a5c5453969
+DIST darkplacesengine20100408.zip 17078273 RMD160 6c38205255ac49a304980a817cbbbbfc2b0a6a94 SHA1 94151dd363768567568a6a3eb16b67b78d49bf08 SHA256 a644afb1a3a8b0b26772436394f063e5ee0e6e4d39478db96e3c9927ee1eb0cf
 DIST fuhquake-lits.rar 8388829 RMD160 574937680f7354362088f2ec63d8941f0f4b0981 SHA1 1e9199c8ac7c9162e43c621487b712551711a45e SHA256 066fd58e2a6d157a1aa7925334d7e3e6cffa7f5c556e707bc31da8bfecea873c
 DIST id1.pk3 350470 RMD160 ac1633c56ca27ae3175e15305ce5d0e829daa43c SHA1 f83c25b74f666665369783b0f08949d480b382a8 SHA256 f1ee6e144d1942ebf91a8c71d0333eac94c73efae35377fbe7ae43e0e4ab37dc
 EBUILD darkplaces-20100221_beta1.ebuild 4936 RMD160 878fa122fbbae6b972ff7c164668a40cd278b814 SHA1 459f3b6f00cb43d0c7e4d7b38d6071f8aefd93fa SHA256 105117c4b5217c517bffd3712c4c747939bc75d0d8ec85cada18a2630c31cdeb
-MISC ChangeLog 1351 RMD160 7b7432ee33be42fb2e8198613c1fa39ea6ad1c3c SHA1 99aefa186291e5bae6ac1deadc4963c53661bc67 SHA256 3012fc93a3fbb20151032289a59f1cf0ff6f29ed16003573ae45526c477ab3d3
+EBUILD darkplaces-20100408.ebuild 4930 RMD160 74dba5e5bf78ea3bf2c1d8ceda71b9af576e1347 SHA1 84bd9fe243e6730a385ed0485bc004bba280aebe SHA256 1e56b22a85e7147edafc1cbcb6dadef3cf743c19f43130dd35c059a8f1574c2b
+MISC ChangeLog 1489 RMD160 8a4f7324b286785ddbd92a4ef6cf8eb3657519dd SHA1 98458162836a87a57090750f22a1169ccaea6574 SHA256 b5a6e4c8b53fbda5263e980a8862d21d66bd47dc54f70095d61b238d349a48a6
 MISC metadata.xml 468 RMD160 daf06634471c2bc5588db51075e28434e73f0166 SHA1 0e2a49729b89a24d7ebdb65ffac847872ea0786e SHA256 3071980a808b9bbd6e15ec792f7545ffba8c9c0f3b037ed5cb78c31c54e50f0b
diff --git a/games-fps/darkplaces/darkplaces-20100408.ebuild b/games-fps/darkplaces/darkplaces-20100408.ebuild
new file mode 100644
index 000000000000..b52ff3091235
--- /dev/null
+++ b/games-fps/darkplaces/darkplaces-20100408.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20100408.ebuild,v 1.1 2010/04/18 05:50:21 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils flag-o-matic games
+
+# Latest versions are in http://icculus.org/twilight/darkplaces/files/
+MY_PV=${PV/_beta/beta}
+MY_ENGINE="${PN}engine${MY_PV}.zip"
+
+# Different Quake 1 engines expect the lights in different directories
+# http://www.fuhquake.net/download.html and http://www.kgbsyndicate.com/romi/
+MY_LIGHTS="fuhquake-lits.rar"
+
+DESCRIPTION="Enhanced engine for iD Software's Quake 1"
+HOMEPAGE="http://icculus.org/twilight/darkplaces/"
+SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
+	lights? (
+		http://www.fuhquake.net/files/extras/${MY_LIGHTS}
+		http://www.kgbsyndicate.com/romi/id1.pk3 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
+
+UIRDEPEND="media-libs/jpeg
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	sdl? ( media-libs/libsdl )
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm"
+UIDEPEND="x11-proto/xextproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xproto"
+RDEPEND="net-misc/curl
+	cdinstall? ( games-fps/quake1-data )
+	demo? ( games-fps/quake1-demodata )
+	textures? ( >=games-fps/quake1-textures-20050820 )
+	opengl? ( ${UIRDEPEND} )
+	!opengl? ( sdl? ( ${UIRDEPEND} ) )
+	!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )"
+DEPEND="lights? ( || (
+			app-arch/unrar
+			app-arch/rar ) )
+	opengl? (
+		${UIRDEPEND}
+		${UIDEPEND} )
+	!opengl? ( sdl? (
+		${UIRDEPEND}
+		${UIDEPEND} ) )
+	!opengl? ( !sdl? ( !dedicated? (
+		${UIRDEPEND}
+		${UIDEPEND} ) ) )
+	dev-util/pkgconfig
+	app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+dir=${GAMES_DATADIR}/quake1
+
+opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
+
+src_unpack() {
+	if use lights ; then
+		unpack "${MY_LIGHTS}"
+		unzip -qo "${DISTDIR}"/id1.pk3 || die "unzip id1.pk3 failed"
+		mv *.lit maps/ || die
+		mv ReadMe.txt rtlights.txt
+	fi
+	unpack "${MY_ENGINE}"
+
+	unpack ./${PN}*.zip
+}
+
+src_prepare() {
+	rm "${WORKDIR}"/README-SDL.txt
+	cd "${S}"
+	rm mingw_note.txt
+
+	strip-flags
+
+	# Only additional CFLAGS optimization is the -march flag
+	local march=$(get-flag -march)
+	sed -i \
+		-e "s:-lasound:$(pkg-config --libs alsa):" \
+		-e "/^CPUOPTIMIZATIONS/d" \
+		-e '/^OPTIM_RELEASE/s/=.*/=$(CFLAGS)/' \
+		-e '/^OPTIM_DEBUG/s/=.*/=$(CFLAGS)/' \
+		-e '/^LDFLAGS_DEBUG/s/$/ $(LDFLAGS)/' \
+		-e '/^LDFLAGS_RELEASE/s/$/ $(LDFLAGS)/' \
+		-e "s:strip:true:" \
+		makefile.inc || die "sed makefile.inc failed"
+
+	if ! use cdsound ; then
+		# Turn the CD accesses off
+		sed -i \
+			-e "s:/dev/cdrom:/dev/null:" \
+			cd_linux.c || die "sed cd_linux.c failed"
+		sed -i \
+			-e 's:COM_CheckParm("-nocdaudio"):1:' \
+			cd_shared.c || die "sed cd_shared.c failed"
+	fi
+}
+
+src_compile() {
+	local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1"
+
+	# Preferred sound is alsa
+	local sound_api="NULL"
+	use oss && sound_api="OSS"
+	use alsa && sound_api="ALSA"
+	opts="${opts} DP_SOUND_API=${sound_api}"
+
+	local type="release"
+	use debug && type="debug"
+
+	# Only compile a maximum of 1 client
+	if use sdl ; then
+		emake ${opts} "sdl-${type}" || die "emake sdl-${type} failed"
+	elif opengl_client ; then
+		emake ${opts} "cl-${type}" || die "emake cl-${type} failed"
+	fi
+
+	if use dedicated ; then
+		emake ${opts} "sv-${type}" || die "emake sv-${type} failed"
+	fi
+}
+
+src_install() {
+	if opengl_client || use sdl ; then
+		local type=glx
+
+		use sdl && type=sdl
+
+		# darkplaces executable is needed, even just for demo
+		newgamesbin "${PN}-${type}" ${PN} || die "newgamesbin client failed"
+		newicon darkplaces72x72.png ${PN}.png || die "newicon failed"
+
+		if use demo ; then
+			# Install command-line for demo, even if not desktop entry
+			games_make_wrapper ${PN}-demo "${PN} -game demo"
+		fi
+
+		if use demo && ! use cdinstall ; then
+			make_desktop_entry ${PN}-demo "Dark Places (Demo)"
+		else
+			# Full version takes precedence over demo
+			make_desktop_entry ${PN} "Dark Places"
+		fi
+	fi
+
+	if use dedicated ; then
+		newgamesbin ${PN}-dedicated ${PN}-ded || die "newgamesbin ded failed"
+	fi
+
+	dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt
+
+	if use lights ; then
+		insinto "${dir}"/id1
+		doins -r "${WORKDIR}"/{cubemaps,maps} || die "doins cubemaps maps failed"
+		if use demo ; then
+			# Set up symlinks, for the demo levels to include the lights
+			local d
+			for d in cubemaps maps ; do
+				dosym "${dir}/id1/${d}" "${dir}/demo/${d}"
+			done
+		fi
+	fi
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	if ! use cdinstall && ! use demo ; then
+		elog "Place pak0.pak and pak1.pak in ${dir}/id1"
+	fi
+
+	if use sdl ; then
+		ewarn "Select opengl with alsa, instead of sdl USE flag, for better audio latency."
+	fi
+}