Revert "mask games-fps/ut2004-ultraduel for removal"

This reverts commit cf00534e64f93c0992faf2584a970f1910afcc5a.

11 files changed, 76 insertions, 54 deletions

diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
index ce0458fe3e5a..4e0f40d026f6 100644
--- a/games-fps/alephone/Manifest
+++ b/games-fps/alephone/Manifest
@@ -1,3 +1,2 @@
 DIST AlephOne-20100424.tar.bz2 3180896 SHA256 d97089890ce99952027eaf6185baa6cb01b26c2882dfca9e68816dfe7076a5e6 SHA512 b246b662f4bf820238c09fbb6bc55289d0db0a9b5ba15ab2b91a53f93666e81583834fd8a64497074a2e270a2055de24b3be93bb56d58715f9d213b1f4c92494 WHIRLPOOL 3074f6c4ba4925b8a0f7718bdfb0d1084155421397a7604febfeae473635b970b3842152b9a3e200f2bc642790a0dc51e689aa3b18de2235d5697105060c7f93
 DIST AlephOne-20120514.tar.bz2 4716348 SHA256 6a7797af74cf3fae7f5505e64ffe57c56f7331521cb569bcc8b7d7041cb3718b SHA512 71e54341221485765b63c7c723f95e04d41c8e2cecf6bc3f885efc178f4c75fd88cdffe703c4bf41a5e7101fd8cef33797d00cd249e211b7de1b22fc639b4278 WHIRLPOOL 03ff5bd735a28a3113706f4de5837351404ddede2fabc09d45233b3bb646a9550f00cc1d30710a6f32952c452668e5f764fb427ef5495553f6c49ddcfcaef350
-DIST AlephOne-20150620.tar.bz2 5031898 SHA256 c0f360dfb74a6264f95d375103a74000930cf0439ffb0464f915f5379443e133 SHA512 fb47969137b791f83b111171d7b92b3708597db294ce19fb682ce28c49edcd4cb84a6ce4dcceb6630812a8c676dfe7f39f3fb4642f40ef7086a0d6c6fdeba8df WHIRLPOOL a00150e8c28763d7d01a5d805e449247dc9ff612eb0e9f0aa2d10e7fcf17654342fa31eb5a2eeb3bc756c80cce84dd9664179977900d635e67401036c71a7c10
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 862ef8715b96..1b4911213588 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,2 +1 @@
 DIST doomsday-1.14.5.tar.gz 14081857 SHA256 019cd0cf89e69d80cd8f6fbbd3e3fd57b8ae4d0bcdf4285e8a71caad9f46417e SHA512 f8ecf7d213ab57081858226ab4078fcf8f250271be19a3ce5883c01e53c43b5c0e7afc16085703fe19c0cbccb795c7fd1b651e3efb8a8e854160131c6374cd9a WHIRLPOOL 2351129c6dba951ca4975e6f6e92d78c75ad3e8f9648e9129a9f5a3a22c295b25c4fdb87d5208b2d3fe9c0af94c4ff968730929fbc645da9171018a672cfc60e
-DIST doomsday-stable-1.15.6.tar.gz 52053145 SHA256 b02a6c5495191f6d9ab0ae18a1266049847592015797ab3b2975183afd5963c5 SHA512 6bdc9bf864477e1b52d1a389189ee85cac7b279b66fd8924888abba49185a738f35827c78ff35921c2838d0d4e20ee095ac192f9a723be0b2fcbc5cb9e2701a1 WHIRLPOOL 52a241a251753f3ef37eb3a0ee5db730daab23090ea5d0eccc79aea83c3bf4e139c502d18378c310e83a9b2fb1648e40f9579a283f46b94abee0b766b1d60ae7
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
index 04f3d898fa83..9d481fecda5e 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -1,4 +1,3 @@
 DIST freedm-0.7.zip 4777958 SHA256 379e29e4ee2355d150fba04507c14544bc8af4cc5449aef2cf80b6709a78e59a SHA512 4f339f05d7a258b76b1d55ed8d69026b6870c181ba4a3f3672e12ed41a8c8eeeb7064193009f7c7ffb24ace18365d7744050f64cfd9db5dfa330983fa9669b8d WHIRLPOOL 02b0934fb5e28b623f4bfb05e2f91447aef1473e746e889269cbabfe3bc740dd012cdd8984de23b23c3668077707ace881e1166112fc6aed6e669787698d164b
-DIST freedoom-0.9.tar.gz 17270332 SHA256 be3bb97873a40558a845ec413f3e0d31bf076e87ff61acd0b88c2f529ceec7c1 SHA512 0ce7571a62489a9ded917a782816c65dd75b21e7e6e9d84716f1524bc5fe9c26ac0cfd22ceccf61831b949d72105a280cf4fd8755dcc60d3bd711d8b424955f8 WHIRLPOOL 3c524f56b0b644cd1e3f1197a28e87dbdf3e1421b4c4a3f867a840e39c65ba8b142a0b7d7f07c15dd76e46b660069bf977e3293a4a5b6906b54fa532efe9c6f8
 DIST freedoom-demo-0.7.zip 2800744 SHA256 4caf386adbf217e3c96d1d8f18cbdf5335caf7c1e88d64cdc44065aa92785286 SHA512 5a101da1c473f0bec899db03ec8c8afce5c95a6c0e041dbfebe95a370e7d64746c3f1ff0304535b58ac766518e282899887f6bad415e3519dd811fc39a0c89d8 WHIRLPOOL de48bb1c19a557ef1a4bde2839a5f9c95d10a0c4364bb88f363cc0b4ab09033a19d4ee656e190a2b31d3e1edb194f24a8e80db3284a4692e3b16c442ddc95050
 DIST freedoom-iwad-0.7.zip 9697891 SHA256 f8f75fd1909801fe42de0e74db9adcfd33f753374e4923bd93e3d9a9b802ab1f SHA512 7363517097be2bb584a8481b3c658dc046dc35f8508cbd79af602e3d15b1f570537fbf1b620684e2931d644670fbb453064ab5699f542888a29cc1b4ca295b7a WHIRLPOOL b55fd43624f21a2f2c16c8f1e56ccd6e5d5c324c381a30a258bfa36c50f17e5b905fd552598cf2ae3f83bede5a0697f02959e1533e5bd5d2e62ed2b2b467c211
diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild
index be29d3ce13ee..ecffa516a041 100644
--- a/games-fps/industri/industri-1.01.ebuild
+++ b/games-fps/industri/industri-1.01.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=2
 inherit eutils toolchain-funcs games
 
 DESCRIPTION="Quake/Tenebrae based, single player game"
@@ -20,7 +20,7 @@ RDEPEND="virtual/opengl
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXxf86vm
-	media-libs/libpng:0
+	media-libs/libpng
 	cdinstall? ( games-fps/quake1-data )"
 DEPEND="${RDEPEND}
 	x11-proto/xf86dgaproto
@@ -33,14 +33,15 @@ S=${WORKDIR}/industri_BIN
 
 src_prepare() {
 	mv linux/Makefile{.i386linux,}
-	sed -i -e "s:-mpentiumpro.*:${CFLAGS} \\\\:" linux/Makefile || die
+	sed -i -e "s:-mpentiumpro.*:${CFLAGS} \\\\:" linux/Makefile || die "sed failed"
 
 	# Remove duplicated typedefs #71841
 	for typ in PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC PFNGLVERTEXARRAYRANGEAPPLEPROC ; do
 		if echo '#include <GL/gl.h>' | $(tc-getCC) -E - 2>/dev/null | grep -sq ${typ} ; then
 			sed -i \
 				-e "/^typedef.*${typ}/d" \
-				glquake.h || die
+				glquake.h \
+				|| die "sed failed"
 		fi
 	done
 
@@ -57,25 +58,27 @@ src_compile() {
 	emake \
 		-C linux \
 		MASTER_DIR="${GAMES_DATADIR}"/quake1 \
-		build_release
+		build_release \
+		|| die "emake failed"
 }
 
 src_install() {
-	newgamesbin linux/release*/bin/industri.run industri
-	dogamesbin "${FILESDIR}"/industri.pretty
+	newgamesbin linux/release*/bin/industri.run industri || die
+	dogamesbin "${FILESDIR}"/industri.pretty || die
 	insinto /usr/share/icons
-	doins industri.ico quake.ico
+	doins industri.ico quake.ico || die
 	dodoc linux/README
 	cd "${WORKDIR}"/${PN}
 	dodoc *.txt
 	insinto "${GAMES_DATADIR}"/quake1/${PN}
-	doins *.pak *.cfg
+	doins *.pak *.cfg || die
 	prepgamesdirs
 }
 
 pkg_postinst() {
 	games_pkg_postinst
-	if ! use cdinstall ; then
+	if ! use cdinstall
+	then
 		elog "You need to copy pak0.pak to ${GAMES_DATADIR}/quake1 to play."
 	fi
 }
diff --git a/games-fps/openarena/openarena-0.8.8.ebuild b/games-fps/openarena/openarena-0.8.8.ebuild
index 51d41c8426fd..f48a436cd76f 100644
--- a/games-fps/openarena/openarena-0.8.8.ebuild
+++ b/games-fps/openarena/openarena-0.8.8.ebuild
@@ -18,7 +18,7 @@ IUSE="+curl +openal +vorbis"
 RDEPEND="virtual/opengl
 	media-libs/libsdl[joystick,opengl,video]
 	media-libs/speex
-	virtual/jpeg:0
+	virtual/jpeg
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXau
diff --git a/games-fps/quake3/quake3-1.36-r1.ebuild b/games-fps/quake3/quake3-1.36-r1.ebuild
index 41421b0f9b49..119a5e9509df 100644
--- a/games-fps/quake3/quake3-1.36-r1.ebuild
+++ b/games-fps/quake3/quake3-1.36-r1.ebuild
@@ -2,8 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs games
+# quake3-9999          -> latest svn
+# quake3-9999.REV      -> use svn REV
+# quake3-VER_alphaREV  -> svn snapshot REV for version VER
+# quake3-VER           -> normal quake release
+
+EAPI=2
+inherit eutils flag-o-matic games toolchain-funcs
+[[ "${PV}" == 9999* ]] && inherit subversion
 
 MY_PN="ioquake3"
 MY_PV="${PV}"
@@ -11,7 +17,8 @@ MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
 HOMEPAGE="http://ioquake3.org/"
-SRC_URI="http://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
+[[ "${PV}" != 9999* ]] && SRC_URI="http://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
+ESVN_REPO_URI="svn://svn.icculus.org/quake3/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,7 +44,11 @@ RDEPEND="${DEPEND}
 	games-fps/quake3-data
 	teamarena? ( games-fps/quake3-teamarena )"
 
-S="${WORKDIR}/${MY_P}"
+if [[ "${PV}" == 9999* ]] ; then
+	S="${WORKDIR}/trunk"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
 
 my_arch() {
 	case "${ARCH}" in
@@ -52,9 +63,15 @@ my_platform() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-bots.patch
+	if [[ "${PV}" == 9999* ]] ; then
+		# Workaround for the version string
+		ln -s "${ESVN_WC_PATH}/.svn" .svn || die "ln ${ESVN_WC_PATH}/.svn"
+	else
+		epatch "${FILESDIR}"/${P}-bots.patch
+	fi
+
 	einfo "Fixing libspeex linking..."
-	sed -i -e 's/\(-lspeex\)/\1 -lspeexdsp/' Makefile || die
+	sed -i -e 's/\(-lspeex\)/\1 -lspeexdsp/' Makefile || die "sed failed"
 
 	# Use system jpeg library
 #	epatch "${FILESDIR}"/${P}-remove-bundled-jpeg.patch
@@ -90,18 +107,20 @@ src_compile() {
 		USE_MUMBLE=$(buildit mumble) \
 		USE_OPENAL=$(buildit openal) \
 		USE_OPENAL_DLOPEN=0 \
-		USE_VOIP=$(buildit voice)
+		USE_VOIP=$(buildit voice) \
+		|| die "emake failed"
 }
 
 src_install() {
-	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README TODO
+	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README TODO || die
 	if use voice ; then
-		dodoc voip-readme.txt
+		dodoc voip-readme.txt || die
 	fi
 
 	if use opengl || ! use dedicated ; then
-		doicon misc/quake3.svg
+		doicon misc/quake3.svg || die
 		make_desktop_entry quake3 "Quake III Arena"
+		#use smp && make_desktop_entry quake3-smp "Quake III Arena (SMP)"
 	fi
 
 	cd build/release-$(my_platform)-$(my_arch) || die
@@ -109,8 +128,8 @@ src_install() {
 	for exe in {ioquake3,ioquake3-smp,ioq3ded}.$(my_arch) ; do
 		if [[ -x ${exe} ]] ; then
 			target=${exe%.*}
-			newgamesbin ${exe} ${target}
-			dosym ${target} "${GAMES_BINDIR}/${target/io}"
+			newgamesbin ${exe} ${target} || die "newgamesbin ${target}"
+			dosym ${target} "${GAMES_BINDIR}/${target/io}" || die "dosym ${target}"
 		fi
 	done
 
diff --git a/games-fps/quake3/quake3-9999.ebuild b/games-fps/quake3/quake3-9999.ebuild
index 5ca9661954ee..5a58d6cd6e0f 100644
--- a/games-fps/quake3/quake3-9999.ebuild
+++ b/games-fps/quake3/quake3-9999.ebuild
@@ -7,9 +7,9 @@
 # quake3-VER_alphaREV  -> git snapshot REV for version VER
 # quake3-VER           -> normal quake release
 
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs games
-[[ "${PV}" == 9999* ]] && inherit git-r3
+EAPI=2
+inherit eutils flag-o-matic games toolchain-funcs
+[[ "${PV}" == 9999* ]] && inherit git-2
 
 MY_PN="ioquake3"
 MY_PV="${PV}"
@@ -45,7 +45,9 @@ RDEPEND="${DEPEND}
 	games-fps/quake3-data
 	teamarena? ( games-fps/quake3-teamarena )"
 
-if [[ "${PV}" != 9999* ]] ; then
+if [[ "${PV}" == 9999* ]] ; then
+	S="${WORKDIR}/trunk"
+else
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -96,17 +98,18 @@ src_compile() {
 		USE_MUMBLE=$(buildit mumble) \
 		USE_OPENAL=$(buildit openal) \
 		USE_OPENAL_DLOPEN=0 \
-		USE_VOIP=$(buildit voice)
+		USE_VOIP=$(buildit voice) \
+		|| die "emake failed"
 }
 
 src_install() {
-	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README.md TODO voip-readme.txt
+	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README.md opengl2-readme.txt TODO voip-readme.txt || die
 	if use voice ; then
-		dodoc voip-readme.txt
+		dodoc voip-readme.txt || die
 	fi
 
 	if use opengl || ! use dedicated ; then
-		doicon misc/quake3.svg
+		doicon misc/quake3.svg || die
 		make_desktop_entry quake3 "Quake III Arena"
 		#use smp && make_desktop_entry quake3-smp "Quake III Arena (SMP)"
 	fi
@@ -115,8 +118,8 @@ src_install() {
 	local exe
 	for exe in ioquake3 ioquake3-smp ioq3ded ; do
 		if [[ -x ${exe} ]] ; then
-			dogamesbin ${exe}
-			dosym ${exe} "${GAMES_BINDIR}/${exe/io}"
+			dogamesbin ${exe} || die "dogamesbin ${exe}"
+			dosym ${exe} "${GAMES_BINDIR}/${exe/io}" || die "dosym ${exe}"
 		fi
 	done
 
@@ -124,7 +127,7 @@ src_install() {
 	# this should be done through 'dogameslib', but
 	# for this some files need to be patched
 	exeinto "${GAMES_DATADIR}/${PN}"
-	doexe renderer*.so
+	doexe renderer*.so || die 'install renderers failed'
 
 	prepgamesdirs
 }
diff --git a/games-fps/quakeforge/quakeforge-0.7.2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
index 8ff600802176..6388f5ff0a33 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit eutils autotools games
+inherit base eutils autotools games
 
 DESCRIPTION="A new 3d engine based off of id Softwares's legendary Quake and QuakeWorld game engine"
 HOMEPAGE="http://www.quakeforge.net/"
@@ -27,7 +27,7 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXxf86vm
 	)
-	ncurses? ( sys-libs/ncurses:0 )
+	ncurses? ( sys-libs/ncurses )
 	vorbis? ( media-libs/libogg media-libs/libvorbis )
 	zlib? ( sys-libs/zlib )
 	xv? (
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
index 7906f203feb5..2253492f7ad9 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1.ebuild
@@ -26,7 +26,7 @@ UIDEPEND="alsa? ( media-libs/alsa-lib )
 	sdl? ( media-libs/libsdl )
 	virtual/jpeg
 	media-libs/libogg
-	media-libs/libpng:0
+	media-libs/libpng
 	media-libs/libvorbis
 	sys-libs/zlib
 	x11-libs/libX11
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
index 459116bea577..521b0eaa25e2 100644
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
+EAPI=2
 
-EAPI=5
 inherit eutils games
 
 DESCRIPTION="red-blue Quake II !  play quake2 w/3d glasses !"
@@ -25,13 +25,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PV}-gentoo.patch \
 		"${FILESDIR}/${P}"-gcc41.patch \
 		"${FILESDIR}/${P}"-ldflags.patch
-	sed -i \
-		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" \
-		sys_linux.c || die
-	sed -i \
-		-e "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
-		sys_linux.c vid_so.c || die
-	echo "$(games_get_libdir)"/${PN} > "${T}"/${PN}.conf || die
+	sed -i "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" sys_linux.c \
+		|| die "sed failed"
+	sed -i "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
+		sys_linux.c vid_so.c \
+		|| die "sed failed"
 }
 
 src_compile() {
@@ -39,20 +37,22 @@ src_compile() {
 	emake \
 		GENTOO_CFLAGS="${CFLAGS}" \
 		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
-		build_release
+		build_release \
+		|| die "emake failed"
 }
 
 src_install() {
 	cd release*
 
 	exeinto "$(games_get_libdir)"/${PN}
-	doexe gamei386.so ref_softx.so
+	doexe gamei386.so ref_softx.so || die "doexe failed"
 	exeinto "$(games_get_libdir)"/${PN}/ctf
-	doexe ctf/gamei386.so
-	newgamesbin quake2 red-blue-quake2
+	doexe ctf/gamei386.so || die "doexe failed"
+	newgamesbin quake2 red-blue-quake2 || die "newgamesbin failed"
 
 	insinto "${GAMES_SYSCONFDIR}"
-	doins "${T}"/${PN}.conf
+	echo "$(games_get_libdir)"/${PN} > ${PN}.conf
+	doins ${PN}.conf || die "doins failed"
 
 	prepgamesdirs
 }
diff --git a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild b/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
index aa4ba4a4bf55..1d3ea71f0cde 100644
--- a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
+++ b/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
@@ -10,7 +10,7 @@ MOD_DIR="hamsterbash"
 
 inherit unpacker games games-mods
 
-HOMEPAGE="http://www.moddb.com/mods/hamsterbash"
+HOMEPAGE="http://www.eigensoft.com/hamsterbash.htm"
 SRC_URI="http://server088.eigensoft.com/HamsterBashFinal.zip"
 
 LICENSE="freedist"