From 0ee810ed8842319135f58a44e2d39b3b773b3a28 Mon Sep 17 00:00:00 2001
From: Michael Sterrett <mr_bones_@gentoo.org>
Date: Mon, 21 Dec 2015 17:57:13 -0500
Subject: Revert "mask games-fps/ut2004-ultraduel for removal"

This reverts commit cf00534e64f93c0992faf2584a970f1910afcc5a.
---
 games-fps/industri/industri-1.01.ebuild | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'games-fps/industri')

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
 }
-- 
cgit v1.2.3-65-gdbad