18 files changed, 78 insertions, 106 deletions

diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild
index 9b79034fd623..5873f016d9bf 100644
--- a/dev-games/ogre/ogre-1.9.0-r1.ebuild
+++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild
@@ -92,7 +92,7 @@ src_configure() {
 		$(cmake-utils_use examples OGRE_BUILD_SAMPLES)
 		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES_SOURCE)
 		-DOGRE_BUILD_TESTS=FALSE
-		$(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0")
+		-DOGRE_CONFIG_THREADS=$(usex threads 2 0)
 		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
 		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
 	)
diff --git a/eclass/games.eclass b/eclass/games.eclass
index 7d231e186cc9..2aa64617b2c5 100644
--- a/eclass/games.eclass
+++ b/eclass/games.eclass
@@ -24,7 +24,7 @@
 if [[ -z ${_GAMES_ECLASS} ]]; then
 _GAMES_ECLASS=1
 
-inherit base multilib toolchain-funcs eutils user
+inherit multilib toolchain-funcs eutils user
 
 case ${EAPI:-0} in
 	0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;;
@@ -302,12 +302,14 @@ games_src_configure() {
 
 # @FUNCTION: games_src_compile
 # @DESCRIPTION:
-# Runs base_src_make(). This function is exported as src_compile().
+# This function is exported as src_compile().
 games_src_compile() {
 	case ${EAPI:-0} in
 		0|1) games_src_configure ;;
 	esac
-	base_src_make
+	if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then
+		emake "$@" || die "died running emake, $FUNCNAME"
+	fi
 }
 
 # @FUNCTION: games_pkg_preinst
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index f487be04d720..9bd66ed9f0e9 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1 +1,2 @@
 DIST supertux-0.1.3.tar.bz2 6715265 SHA256 0092588351776626955339caaa62d12ce5954bb80c5f6952f60a122f53c2ad97 SHA512 75848583f9f9b9d0f36fec77812501875420fde8befe1ff9ac4ea7613f4d9464b2eb460c2ed89b4dc31e697fbb449a5431c72675e2820d13f5c42653dc07ad98 WHIRLPOOL bb8998845bee7f33a7aff94109d9767d000c89df6c670a1ccb85c4e9158a8ce6c4064f89587b9ea40d9ba1a854b9f5bba82ccc7dcac6dedcdb337cfaa1777898
+DIST supertux-0.3.5a.tar.bz2 72859723 SHA256 71c34502b5879a4130fb111ac754967c3a632ef3017f30883a4d496d87bef8c7 SHA512 f86c8ebe8aa0f789fc28a6634afcfc2a5c983973af677a4d7a5d80a98b732800f30c71e353e4ae044178baf4ca3abfcd08c4af7fe5c7e318c670bd7f8a00e69c WHIRLPOOL 5702db36ab11346b78bfa3237bf86396bc67763ace85eda6d660e35b346020e3e3ca7d1d0ecc242d086ba88d5e9190f0adb794a725bd9cf81ac3e3545a133fbd
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
index 4e0f40d026f6..ce0458fe3e5a 100644
--- a/games-fps/alephone/Manifest
+++ b/games-fps/alephone/Manifest
@@ -1,2 +1,3 @@
 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 1b4911213588..862ef8715b96 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1 +1,2 @@
 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 9d481fecda5e..04f3d898fa83 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -1,3 +1,4 @@
 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 ecffa516a041..be29d3ce13ee 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=2
+EAPI=5
 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
+	media-libs/libpng:0
 	cdinstall? ( games-fps/quake1-data )"
 DEPEND="${RDEPEND}
 	x11-proto/xf86dgaproto
@@ -33,15 +33,14 @@ S=${WORKDIR}/industri_BIN
 
 src_prepare() {
 	mv linux/Makefile{.i386linux,}
-	sed -i -e "s:-mpentiumpro.*:${CFLAGS} \\\\:" linux/Makefile || die "sed failed"
+	sed -i -e "s:-mpentiumpro.*:${CFLAGS} \\\\:" linux/Makefile || die
 
 	# 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 "sed failed"
+				glquake.h || die
 		fi
 	done
 
@@ -58,27 +57,25 @@ src_compile() {
 	emake \
 		-C linux \
 		MASTER_DIR="${GAMES_DATADIR}"/quake1 \
-		build_release \
-		|| die "emake failed"
+		build_release
 }
 
 src_install() {
-	newgamesbin linux/release*/bin/industri.run industri || die
-	dogamesbin "${FILESDIR}"/industri.pretty || die
+	newgamesbin linux/release*/bin/industri.run industri
+	dogamesbin "${FILESDIR}"/industri.pretty
 	insinto /usr/share/icons
-	doins industri.ico quake.ico || die
+	doins industri.ico quake.ico
 	dodoc linux/README
 	cd "${WORKDIR}"/${PN}
 	dodoc *.txt
 	insinto "${GAMES_DATADIR}"/quake1/${PN}
-	doins *.pak *.cfg || die
+	doins *.pak *.cfg
 	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 f48a436cd76f..51d41c8426fd 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
+	virtual/jpeg:0
 	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 119a5e9509df..41421b0f9b49 100644
--- a/games-fps/quake3/quake3-1.36-r1.ebuild
+++ b/games-fps/quake3/quake3-1.36-r1.ebuild
@@ -2,14 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# 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
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs games
 
 MY_PN="ioquake3"
 MY_PV="${PV}"
@@ -17,8 +11,7 @@ MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
 HOMEPAGE="http://ioquake3.org/"
-[[ "${PV}" != 9999* ]] && SRC_URI="http://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
-ESVN_REPO_URI="svn://svn.icculus.org/quake3/trunk"
+SRC_URI="http://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -44,11 +37,7 @@ RDEPEND="${DEPEND}
 	games-fps/quake3-data
 	teamarena? ( games-fps/quake3-teamarena )"
 
-if [[ "${PV}" == 9999* ]] ; then
-	S="${WORKDIR}/trunk"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
+S="${WORKDIR}/${MY_P}"
 
 my_arch() {
 	case "${ARCH}" in
@@ -63,15 +52,9 @@ my_platform() {
 }
 
 src_prepare() {
-	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
-
+	epatch "${FILESDIR}"/${P}-bots.patch
 	einfo "Fixing libspeex linking..."
-	sed -i -e 's/\(-lspeex\)/\1 -lspeexdsp/' Makefile || die "sed failed"
+	sed -i -e 's/\(-lspeex\)/\1 -lspeexdsp/' Makefile || die
 
 	# Use system jpeg library
 #	epatch "${FILESDIR}"/${P}-remove-bundled-jpeg.patch
@@ -107,20 +90,18 @@ src_compile() {
 		USE_MUMBLE=$(buildit mumble) \
 		USE_OPENAL=$(buildit openal) \
 		USE_OPENAL_DLOPEN=0 \
-		USE_VOIP=$(buildit voice) \
-		|| die "emake failed"
+		USE_VOIP=$(buildit voice)
 }
 
 src_install() {
-	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README TODO || die
+	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README TODO
 	if use voice ; then
-		dodoc voip-readme.txt || die
+		dodoc voip-readme.txt
 	fi
 
 	if use opengl || ! use dedicated ; then
-		doicon misc/quake3.svg || die
+		doicon misc/quake3.svg
 		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
@@ -128,8 +109,8 @@ src_install() {
 	for exe in {ioquake3,ioquake3-smp,ioq3ded}.$(my_arch) ; do
 		if [[ -x ${exe} ]] ; then
 			target=${exe%.*}
-			newgamesbin ${exe} ${target} || die "newgamesbin ${target}"
-			dosym ${target} "${GAMES_BINDIR}/${target/io}" || die "dosym ${target}"
+			newgamesbin ${exe} ${target}
+			dosym ${target} "${GAMES_BINDIR}/${target/io}"
 		fi
 	done
 
diff --git a/games-fps/quake3/quake3-9999.ebuild b/games-fps/quake3/quake3-9999.ebuild
index 5a58d6cd6e0f..5ca9661954ee 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=2
-inherit eutils flag-o-matic games toolchain-funcs
-[[ "${PV}" == 9999* ]] && inherit git-2
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs games
+[[ "${PV}" == 9999* ]] && inherit git-r3
 
 MY_PN="ioquake3"
 MY_PV="${PV}"
@@ -45,9 +45,7 @@ RDEPEND="${DEPEND}
 	games-fps/quake3-data
 	teamarena? ( games-fps/quake3-teamarena )"
 
-if [[ "${PV}" == 9999* ]] ; then
-	S="${WORKDIR}/trunk"
-else
+if [[ "${PV}" != 9999* ]] ; then
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -98,18 +96,17 @@ src_compile() {
 		USE_MUMBLE=$(buildit mumble) \
 		USE_OPENAL=$(buildit openal) \
 		USE_OPENAL_DLOPEN=0 \
-		USE_VOIP=$(buildit voice) \
-		|| die "emake failed"
+		USE_VOIP=$(buildit voice)
 }
 
 src_install() {
-	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README.md opengl2-readme.txt TODO voip-readme.txt || die
+	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README.md TODO voip-readme.txt
 	if use voice ; then
-		dodoc voip-readme.txt || die
+		dodoc voip-readme.txt
 	fi
 
 	if use opengl || ! use dedicated ; then
-		doicon misc/quake3.svg || die
+		doicon misc/quake3.svg
 		make_desktop_entry quake3 "Quake III Arena"
 		#use smp && make_desktop_entry quake3-smp "Quake III Arena (SMP)"
 	fi
@@ -118,8 +115,8 @@ src_install() {
 	local exe
 	for exe in ioquake3 ioquake3-smp ioq3ded ; do
 		if [[ -x ${exe} ]] ; then
-			dogamesbin ${exe} || die "dogamesbin ${exe}"
-			dosym ${exe} "${GAMES_BINDIR}/${exe/io}" || die "dosym ${exe}"
+			dogamesbin ${exe}
+			dosym ${exe} "${GAMES_BINDIR}/${exe/io}"
 		fi
 	done
 
@@ -127,7 +124,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 || die 'install renderers failed'
+	doexe renderer*.so
 
 	prepgamesdirs
 }
diff --git a/games-fps/quakeforge/quakeforge-0.7.2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
index 6388f5ff0a33..8ff600802176 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 base eutils autotools games
+inherit 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 )
+	ncurses? ( sys-libs/ncurses:0 )
 	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 2253492f7ad9..7906f203feb5 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
+	media-libs/libpng:0
 	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 521b0eaa25e2..459116bea577 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,11 +25,13 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PV}-gentoo.patch \
 		"${FILESDIR}/${P}"-gcc41.patch \
 		"${FILESDIR}/${P}"-ldflags.patch
-	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"
+	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
 }
 
 src_compile() {
@@ -37,22 +39,20 @@ src_compile() {
 	emake \
 		GENTOO_CFLAGS="${CFLAGS}" \
 		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
-		build_release \
-		|| die "emake failed"
+		build_release
 }
 
 src_install() {
 	cd release*
 
 	exeinto "$(games_get_libdir)"/${PN}
-	doexe gamei386.so ref_softx.so || die "doexe failed"
+	doexe gamei386.so ref_softx.so
 	exeinto "$(games_get_libdir)"/${PN}/ctf
-	doexe ctf/gamei386.so || die "doexe failed"
-	newgamesbin quake2 red-blue-quake2 || die "newgamesbin failed"
+	doexe ctf/gamei386.so
+	newgamesbin quake2 red-blue-quake2
 
 	insinto "${GAMES_SYSCONFDIR}"
-	echo "$(games_get_libdir)"/${PN} > ${PN}.conf
-	doins ${PN}.conf || die "doins failed"
+	doins "${T}"/${PN}.conf
 
 	prepgamesdirs
 }
diff --git a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild b/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
index 1d3ea71f0cde..aa4ba4a4bf55 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.eigensoft.com/hamsterbash.htm"
+HOMEPAGE="http://www.moddb.com/mods/hamsterbash"
 SRC_URI="http://server088.eigensoft.com/HamsterBashFinal.zip"
 
 LICENSE="freedist"
diff --git a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
index 9e173dde092c..9bda85a8bf3f 100644
--- a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
+++ b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="Free clone of an excellent NeoGeo puzzle game, Magical Drop"
@@ -16,12 +16,12 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="virtual/opengl
-	media-libs/libsdl
-	media-libs/sdl-image
+	media-libs/libsdl[opengl,video]
+	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf
 	dev-libs/libxml2"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${PN}
 
@@ -39,14 +39,13 @@ src_prepare() {
 
 	sed -i \
 		-e "/^EXEDIR:=/ s|$|/bin|" \
-		-e "/^INSTALL_PREFIX:=/ s|$|${D}|" Makefile \
-		|| die "sed Makefile failed"
+		-e "/^INSTALL_PREFIX:=/ s|$|${D}|" \
+		Makefile || die
 
 	# fix the high score location
 	sed -i \
 		-e "s:BINDIR:\"${GAMES_STATEDIR}/${PN}\":" \
-		Sources/KrystalDrop/Controller/HighScoresController.cpp \
-		|| die "sed HighScoresController.cpp failed"
+		Sources/KrystalDrop/Controller/HighScoresController.cpp || die
 }
 
 src_install() {
diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
index 6f19f0d848ef..a99613dc2f09 100644
--- a/games-strategy/ufo-ai/Manifest
+++ b/games-strategy/ufo-ai/Manifest
@@ -1,3 +1,5 @@
 DIST 1maps.pk3 242016 SHA256 8cdb8c231c0ba98900d97012b62c5cef72ab5710fe3f087e534496a66f7b0e4e SHA512 9615b365e590dceb82362e7cd683980e15401a3b5a2b359a33c7ed2a4c51e5328efb352618cc48f46971a2ced1717276b5270ca6bf6d2bc7fc2b2238030eb3ae WHIRLPOOL 8e798ffeaa83609114fd239ea8f379ee54fa6038735a09bd3abe3076073e92b44e7fa867c893d597577da462b4e583fb0a2bba7cd2014a9f4b4bb8ef04b377e6
 DIST ufoai-2.4-data.tar 937062400 SHA256 6bb322fc0362781d07439799de32c677884cef7c96fcf17dd87c62cc108030b7 SHA512 471eab2f62cad144fe9966317d48c408fba19de0c33cf7414918b502c723b722af38a025f808848698d9a06ffc10fb0faac145dd01dcd3d321547c87da1c6246 WHIRLPOOL 139251bdbd76f86cb38175eb9c14149ea0cab6bbcb04e2dba7351cdb5b0e21bdfd231e350c0af4f52379d0c5bee91f0512422a7eb9f6339eb6a07170d64fec0c
 DIST ufoai-2.4-source.tar.bz2 16875353 SHA256 254a61b770f141374d57e5c2589048be9298d0a920e914c6e72c2b98255bb94f SHA512 3f9d0df7392f50c201464c81e42435f860df97d5d7a2ef53bb9a05d2b2fc645a1130baaf16fc34818b88bb07b8cf83283f7479d685cbd3caf80ea7522e13c56f WHIRLPOOL 0e68149ab2b3eeffb7134e65cc29de9cecf60dc89c965958a0d669c2d22462d05b89b0a81a3225ebbd7e47015fc63697cbad365136706f4853f9c1e690b0667d
+DIST ufoai-2.5-data.tar 1269913600 SHA256 0d12041cba3aaaba1ce114650c36586d286dcce51c721844c06fdace06e307b8 SHA512 429ddc33391aa33ca5ff1788a01114a5c8eb0bb6d66a5bedb1c88c3a46810813cade2ecd69b4ef4f18e9dd6b41485c1bf9f9b0f13fc9255cbf1f9484186f883b WHIRLPOOL d10e517ebd158a65e427f3d105df89d0ee5eb2900b99142d0e5b044c3bdd9f5063c6774c4570f93da87f408b0099a364e48ad7cec1638b4e6c6282c495557f8e
+DIST ufoai-2.5-source.tar.bz2 24239539 SHA256 0c7cc3bc9efeb276f71cbe6ee8ff7c76f98d183de79f1a069fa63059cf182a8f SHA512 072fe8820b1b242bb13f0820459fc27092b8597573231c8921c711859df39c8e28d9854e8a0300ebabb38cdeb99db16bed388a1391ba9f54100268b831db056f WHIRLPOOL 23cf4c88e88a85f5e6857e8c91e55e19bfce3c59d49168d16deca58a4ce9de25f942f86d7219c6d07f4b8dab2649068462616b38191ceb3b03973fed165bf058
diff --git a/games-strategy/widelands/widelands-0.17.ebuild b/games-strategy/widelands/widelands-0.17.ebuild
index 9f32421c6dbb..c27274c02704 100644
--- a/games-strategy/widelands/widelands-0.17.ebuild
+++ b/games-strategy/widelands/widelands-0.17.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit eutils versionator toolchain-funcs flag-o-matic cmake-utils games
+inherit eutils versionator cmake-utils games
 
 MY_PV=build$(get_version_component_range 2)
 MY_P=${PN}-${MY_PV}-src
@@ -16,13 +16,13 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="dev-lang/lua
+DEPEND="dev-lang/lua:0
 	media-libs/libsdl[video]
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-gfx
 	media-libs/sdl-net
-	media-libs/libpng
+	media-libs/libpng:0
 	sys-libs/zlib
 	media-libs/glew
 	media-libs/sdl-ttf
@@ -43,21 +43,6 @@ src_prepare() {
 	sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die
 	sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die
 	sed -i -e '/Boost_USE_STATIC_LIBS/s:ON:OFF:' CMakeLists.txt || die
-
-	# how do I hate boost? Let me count the ways...
-	local boost_ver=$(best_version ">=dev-libs/boost-1.37")
-
-	boost_ver=${boost_ver/*boost-/}
-	boost_ver=${boost_ver%.*}
-	boost_ver=${boost_ver/./_}
-
-	einfo "Using boost version ${boost_ver}"
-	append-cxxflags \
-		-I/usr/include/boost-${boost_ver}
-	append-ldflags \
-		-L/usr/$(get_libdir)/boost-${boost_ver}
-	export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}"
-	export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
 }
 
 src_configure() {
diff --git a/profiles/package.mask b/profiles/package.mask
index 0c7b60e942c2..c92fd5996be5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Michael Sterrett <mr_bones_@gentoo.org> (21 Dec 2015)
+# Vanished from the internet. (bug #561148)
+# Masked for removal on 20160120
+games-fps/ut2004-ultraduel
+
 # Ulrich Müller <ulm@gentoo.org> (21 Dec 2015)
 # Masked for testing, see bug #448242.
 =sci-mathematics/maxima-5.37.3-r2