version bump (bug #452004)

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

3 files changed, 206 insertions, 25 deletions

diff --git a/games-fps/darkplaces/ChangeLog b/games-fps/darkplaces/ChangeLog
index 5d8dffe1caf6..b7a2e2c63b4d 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.15 2012/06/21 19:34:31 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.16 2013/01/14 18:40:42 mr_bones_ Exp $
+
+*darkplaces-20121222 (14 Jan 2013)
+
+  14 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +darkplaces-20121222.ebuild:
+  version bump (bug #452004)
 
   21 Jun 2012; Agostino Sarubbo <ago@gentoo.org> darkplaces-20110628.ebuild:
   Stable for amd64, wrt bug #422129
@@ -71,4 +77,3 @@
   +darkplaces-20060616_beta1.ebuild:
   Initial import. Ebuild by Paul Bredbury <brebs@sent.com>. Closing bug
   #106344.
-
diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index c402a4e8e3b4..e605833b7bf7 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,22 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-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
-EBUILD darkplaces-20110628.ebuild 4881 RMD160 717c6f4fb8038d1f7bc6ea3c2b1879bb3375674b SHA1 a41587ddc93d0ba6aa27eda4369cf91c09b50e38 SHA256 b8070a0c9e1c43e75c2248607a4d95d0b92dce5cb816763a5f565be7531a7208
-MISC ChangeLog 2478 RMD160 a983ef10ab02a07045199d3a4e4c7fe7e9199478 SHA1 6027b01993d682074a2a32d24a471b81539e3f07 SHA256 99de1cc76fd742cc66d490643f748bc84a11cef7a0100ed3a797dfb6fcd33520
-MISC metadata.xml 468 RMD160 daf06634471c2bc5588db51075e28434e73f0166 SHA1 0e2a49729b89a24d7ebdb65ffac847872ea0786e SHA256 3071980a808b9bbd6e15ec792f7545ffba8c9c0f3b037ed5cb78c31c54e50f0b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJP43dNAAoJEOTDgjZ80txdQz4H/1w/cvhzXJilUXK5ET/hwOek
-QhVn9+cCtbUcewWNNY2JBpRMdwidJ7OQMw2v3DC9xbmjVXfX7E0OYuelI1zWH75d
-cO7bGZLiUum8qi8aten+xMeDGnUBD3bpPfhuQKnFyjDJ0hlYNPcpa80TZ8xx7HHP
-1Me4yTJs0yVLe2hSQmmdQxFcvQpqCZm5E/dgY+Un0k3NC3Zg4mpUsIhk2WzteTx3
-AyEE/ku4oeNzJyqzMr8ubPr/gpDI9/rZWGT7bll/ACx1pgehu6SXGb9pj9JhHV61
-jmoTUzzdrNzuGthfrcv3yJfFMFtY4ORIQXn64mmECwvoGdw5pBctumSXAQxLcaw=
-=UqlF
------END PGP SIGNATURE-----
+DIST darkplacesengine20100408.zip 17078273 SHA256 a644afb1a3a8b0b26772436394f063e5ee0e6e4d39478db96e3c9927ee1eb0cf
+DIST darkplacesengine20110628.zip 23377408 SHA256 d2464c681e3fdcc66cb090e79c44c0c173a43b6f181a12e500b0b1fd7d73ffce SHA512 bf44933470be2856a80ebd73a0cb531c6d22e69da5be24bc52175998ab687b4112c88423a6b42a9a4ed746e0f96c1bb39e188a037a98ea596cf7b6183e390038 WHIRLPOOL b4214be8a9c9aadf02a92c9b7e54d508df38f9e38f650f839a8ea43d9c0768641dbf59c71b210d337f591fac2d77a21a14e7900a3038d1af828f064bf3368071
+DIST darkplacesengine20121222.zip 20105650 SHA256 13f3a2e5703cc6de1006d071dbdfd44627ead21425df35a3a9eb525e4b8c439f SHA512 3ad04b734562d2b21d1b5df500038fa198256ec2ccd15ded83287bc4724c74630c52ff335a7a73c95e7ba9bd07042c80d7e4cde03ee918b83009ac4b31285a51 WHIRLPOOL 7d1b1c8ee8acc3ad175ab20a93a0a5c62e0eccdded463adeb74ebfb5a9b5500e196e96386d2f66820a79b007d551b958528b383221dbd5191f5a6fc13df8524c
+DIST fuhquake-lits.rar 8388829 SHA256 066fd58e2a6d157a1aa7925334d7e3e6cffa7f5c556e707bc31da8bfecea873c
+DIST id1.pk3 350470 SHA256 f1ee6e144d1942ebf91a8c71d0333eac94c73efae35377fbe7ae43e0e4ab37dc
+EBUILD darkplaces-20100408.ebuild 4884 SHA256 c509f4ed942f3961ab9286715dde6816d2b2751ed1632dc7554c5802320eb2f1 SHA512 676109781245acac45aa8711a149f0e2f88097651a72b7e793210ec9b2680f4aed11a4bffea6a6cc07e0b2c7c511fc954103d17a78208785b1101a2221785140 WHIRLPOOL a3b7fa55da9b9c4227c11e30d261733bcaf8867d91c4915bf00ecd33d0347c96ae8066c813c87d980042b6ca87f6f17e5949f5650aab5395af327b05ffdbfa51
+EBUILD darkplaces-20110628.ebuild 4881 SHA256 b8070a0c9e1c43e75c2248607a4d95d0b92dce5cb816763a5f565be7531a7208 SHA512 026afbda5cd71e97d63d97d9958802169601548b0f81b68a85fa49a7ceeb88b784f70e80e66096c0f2d77634286b69b593b6e828dab7a8f0bbf5ea8ed38657ee WHIRLPOOL 9583099ef34d792d124a771b32ecdc9e6caaaa73402cb6623066f83d914d04918bf062405933b94eb19b8925c6a4cd57b716d76a1360efcac7a0ca288ea715d7
+EBUILD darkplaces-20121222.ebuild 4889 SHA256 b7a0b0b556b07ec27b4374eda030c98cb36b620bab7284e14e6e52a78d232223 SHA512 7c105a95b8215ee3938277949126cf471ee11a50ff146fabf0da7385496be8bc09a133a26a32c6bf91c5ca75c9dc87ef30d85d6e3b566a5c5ab6138c5d2bb039 WHIRLPOOL 96d7859c9d0dd09ec3a5c7137d585e7680e46b9cd272245f9c4f642a93f5b0257fb347540b1ef84f8964735fa2432c0b9321e6b5081f2cfc30301a4cde1669a0
+MISC ChangeLog 2635 SHA256 29d3670c3fd136d7cc5a004505c7689a21a0a00890c68cbbad490e9091aebf7e SHA512 9b92e578f4ad10b06544a5ae237208af4fd55df22bfb6150e95b28be6748e4c96261c6bc75df7c0d6a66961c0bcef51d64a48121a1914cf4edee0a8e8eb02f1d WHIRLPOOL 45ccc9fa69228668d0408ef1c1d549eaa5786bfa9aa5cbfbef3a420080dd9da67d32320041424cc183676bb4ab3ac921ce2d34f7e39638c0f967a27e78944893
+MISC metadata.xml 468 SHA256 3071980a808b9bbd6e15ec792f7545ffba8c9c0f3b037ed5cb78c31c54e50f0b SHA512 5d8c8c29c93544753f98fd4ea77d50c2e1991b639d99114c938380ca560364e43179fa0bfea275abf5da556229e4b791c7fda650adeecdbb88713d1dde84f9e3 WHIRLPOOL 874df2951bfd97a48b25796ddec99246438e92c31c042bdd5fa7d92406e651e201b117db36fe390d1526b60df66342566fc67721637201352ef2bc3d2afa9691
diff --git a/games-fps/darkplaces/darkplaces-20121222.ebuild b/games-fps/darkplaces/darkplaces-20121222.ebuild
new file mode 100644
index 000000000000..6eeea4d3b50a
--- /dev/null
+++ b/games-fps/darkplaces/darkplaces-20121222.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild,v 1.1 2013/01/14 18:40:42 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
+}