[gentoo-commits] repo/gentoo:master commit in: games-fps/red-blue-quake2/

[Michael Sterrett]

commit:     6e5b768a29e2a8a7ec57a3b5e1ce9e11429c4552
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 04:12:44 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 06:14:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e5b768a

games-fps/red-blue-quake2: EAPI=5; tidy

Package-Manager: portage-2.2.24

 .../red-blue-quake2/red-blue-quake2-0.1.ebuild     | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

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 521b0ea..459116b 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
 }