version bump - bug #140074 with submissions from Piotr Szymaniak and Paul Bredbury

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

3 files changed, 198 insertions, 3 deletions

diff --git a/games-fps/darkplaces/ChangeLog b/games-fps/darkplaces/ChangeLog
index b69e83a04460..484c72f8ebdc 100644
--- a/games-fps/darkplaces/ChangeLog
+++ b/games-fps/darkplaces/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-fps/darkplaces
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.4 2008/02/29 19:10:55 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.5 2009/07/21 04:13:54 mr_bones_ Exp $
+
+*darkplaces-20090709 (21 Jul 2009)
+
+  21 Jul 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +darkplaces-20090709.ebuild:
+  version bump - bug #140074 with submissions from Piotr Szymaniak and Paul
+  Bredbury
+
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org>
   darkplaces-20060616_beta1.ebuild:
diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index 3b9437330c39..b97c867729e6 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,7 +1,9 @@
 DIST darkplacesengine20060616beta1.zip 8337337 RMD160 5b88e0f18726afb999b84bcc62684aa46dd3a29f SHA1 0491b6375fedcf595c2ecc114791f9f5ca84000c SHA256 4813e2324cbae0f96f1812939115ecd268c85db0ea72e259d8b842737437bd56
+DIST darkplacesengine20090709.zip 13468363 RMD160 bcea05859617f338590948d16aa8f58143e02530 SHA1 a81a8914659c492fb3244bbbf985db672e3a3bd2 SHA256 6cd1e71d09bae850dcd6fb691a35723969b29567163e783f5d8c0e8504e7c8f1
 DIST darkplacesmod20060606.zip 5021820 RMD160 8517b739f471dc6a074e967b9082a234bfb45aa2 SHA1 43292a5916d33f058ad4beece5606fd8341df596 SHA256 6821132e551fcde45771677b65d230c5b00fd3c5aee6d685063d4aa380e1e94b
 DIST fuhquake-lits.rar 8388829 RMD160 574937680f7354362088f2ec63d8941f0f4b0981 SHA1 1e9199c8ac7c9162e43c621487b712551711a45e SHA256 066fd58e2a6d157a1aa7925334d7e3e6cffa7f5c556e707bc31da8bfecea873c
 DIST id1.pk3 350470 RMD160 ac1633c56ca27ae3175e15305ce5d0e829daa43c SHA1 f83c25b74f666665369783b0f08949d480b382a8 SHA256 f1ee6e144d1942ebf91a8c71d0333eac94c73efae35377fbe7ae43e0e4ab37dc
 EBUILD darkplaces-20060616_beta1.ebuild 5795 RMD160 224970c12fecfa87f8530e03745878470f879156 SHA1 8aea544bb52b06a7561c799ff00358d231819861 SHA256 672c40061eb35da1349d1970dc5cd68185bf0b22104b217bfec2d86681ccf78d
-MISC ChangeLog 920 RMD160 b9009676963c7d516f65037ef56d583e0c3bc1b1 SHA1 c288a939c952ac7e5fb45783974f93ed3cd6d5f8 SHA256 cc5c859cd97dd1b585454b0aa0d9d334974c1ba6c5155fb931a13d588146639b
+EBUILD darkplaces-20090709.ebuild 4768 RMD160 f220024d06c9157af909416e109ac9cec1f4988f SHA1 86bed0382f4edddd121687a874ae8e40ff57af56 SHA256 db3f3e7a7de76e430e4c64718143677f5bd063aec18438685a6a8039b0aac198
+MISC ChangeLog 1135 RMD160 eb39dcb57a3b70498f8ded2f4362ba12877dfd15 SHA1 c52571164aed50baa4f78b6e11b92736e7703192 SHA256 8f5da89a20f2432a8649757bc6e257da1e40f5d7d8e4c196ad845794ef29d839
 MISC metadata.xml 538 RMD160 cbb93c1a27e24bc19e70bd393952541ecc401603 SHA1 48da7aadd0c3025f9ecde7e7a08693dc3f3bd9a7 SHA256 109e025896cb87b71061d4e9e95a3154b4ca86a3124d44ea12fce6851b3fab48
diff --git a/games-fps/darkplaces/darkplaces-20090709.ebuild b/games-fps/darkplaces/darkplaces-20090709.ebuild
new file mode 100644
index 000000000000..d06c0f3dff4d
--- /dev/null
+++ b/games-fps/darkplaces/darkplaces-20090709.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20090709.ebuild,v 1.1 2009/07/21 04:13:54 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
+
+	# Only additional CFLAGS optimization is the -march flag
+	local march=$(get-flag -march)
+	sed -i \
+		-e '/^CC=/d' \
+		-e "s:-lasound:$(pkg-config --libs alsa):" \
+		-e "s:CPUOPTIMIZATIONS=:CPUOPTIMIZATIONS=${march}:" \
+		-e "s:strip:echo:" \
+		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}\""
+
+	# 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
+}