version bump (bug #416277)

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 198 insertions, 2 deletions

diff --git a/games-fps/darkplaces/ChangeLog b/games-fps/darkplaces/ChangeLog
index f20bd09de607..e50b8ad10af5 100644
--- a/games-fps/darkplaces/ChangeLog
+++ b/games-fps/darkplaces/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/darkplaces
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.12 2012/05/03 03:23:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.13 2012/05/16 16:29:37 mr_bones_ Exp $
+
+*darkplaces-20110628 (16 May 2012)
+
+  16 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +darkplaces-20110628.ebuild:
+  version bump (bug #416277)
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> darkplaces-20100408.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index 066b401abafe..860da223adfb 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,6 +1,8 @@
 DIST darkplacesengine20100408.zip 17078273 RMD160 6c38205255ac49a304980a817cbbbbfc2b0a6a94 SHA1 94151dd363768567568a6a3eb16b67b78d49bf08 SHA256 a644afb1a3a8b0b26772436394f063e5ee0e6e4d39478db96e3c9927ee1eb0cf
+DIST darkplacesengine20110628.zip 23377408 RMD160 6f2362b51d6e7fc8436522e8edf874287aa0288d SHA1 623da6a278e727424bd0c32183d5e93a44a63676 SHA256 d2464c681e3fdcc66cb090e79c44c0c173a43b6f181a12e500b0b1fd7d73ffce
 DIST fuhquake-lits.rar 8388829 RMD160 574937680f7354362088f2ec63d8941f0f4b0981 SHA1 1e9199c8ac7c9162e43c621487b712551711a45e SHA256 066fd58e2a6d157a1aa7925334d7e3e6cffa7f5c556e707bc31da8bfecea873c
 DIST id1.pk3 350470 RMD160 ac1633c56ca27ae3175e15305ce5d0e829daa43c SHA1 f83c25b74f666665369783b0f08949d480b382a8 SHA256 f1ee6e144d1942ebf91a8c71d0333eac94c73efae35377fbe7ae43e0e4ab37dc
 EBUILD darkplaces-20100408.ebuild 4884 RMD160 37ef473adb771a7f7830e813a21ff8a697983c73 SHA1 a0445634adbf560dbfe4f3d260a54f5b48ef2c5a SHA256 c509f4ed942f3961ab9286715dde6816d2b2751ed1632dc7554c5802320eb2f1
-MISC ChangeLog 2109 RMD160 cf14a7e444016b176b3bfdfc82e04311eab0ba06 SHA1 89b385a692fb044d2892d3169ee09a60ff4b419c SHA256 963df4b0d8b3d2f28c7bb534ffbe926d7e7ee5ca8921710d297043f199668bcd
+EBUILD darkplaces-20110628.ebuild 4889 RMD160 3df1d691974e5c346dd157e8698c0ec0afd9b829 SHA1 331144b5421824a3b2730087ca61f7c9d03b2438 SHA256 93462cee7897529f2620323af661f29c5c8689c52369afb71cb106aab23b7c7d
+MISC ChangeLog 2264 RMD160 10d5fc118a687181df9c14d80ad5a4cd7a70f03d SHA1 cea6f12dca188778e94832498e71adb0f8be5b3e SHA256 e02efcb41bcd8d583084b5e62ae6979687bb1d5b0b647d0dd43118a6ca6c49fd
 MISC metadata.xml 468 RMD160 daf06634471c2bc5588db51075e28434e73f0166 SHA1 0e2a49729b89a24d7ebdb65ffac847872ea0786e SHA256 3071980a808b9bbd6e15ec792f7545ffba8c9c0f3b037ed5cb78c31c54e50f0b
diff --git a/games-fps/darkplaces/darkplaces-20110628.ebuild b/games-fps/darkplaces/darkplaces-20110628.ebuild
new file mode 100644
index 000000000000..8ba8f5983c45
--- /dev/null
+++ b/games-fps/darkplaces/darkplaces-20110628.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20110628.ebuild,v 1.1 2012/05/16 16:29:37 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="virtual/jpeg
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	sdl? ( media-libs/libsdl )
+	x11-libs/libX11
+	x11-libs/libXpm
+	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} ) ) )
+	virtual/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
+}