EAPI=5

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 19 insertions, 18 deletions

diff --git a/games-strategy/freecnc/ChangeLog b/games-strategy/freecnc/ChangeLog
index 6b86015e8538..1ff9f6b37c38 100644
--- a/games-strategy/freecnc/ChangeLog
+++ b/games-strategy/freecnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freecnc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.17 2014/05/15 17:03:39 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.18 2015/03/25 06:29:36 mr_bones_ Exp $
+
+  25 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  freecnc-0.2.1.31072003.ebuild:
+  EAPI=5
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> freecnc-0.2.1.31072003.ebuild:
   Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
diff --git a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
index 9133bfbca1f0..eb6d2054ef17 100644
--- a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
+++ b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.18 2014/05/15 17:03:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.19 2015/03/25 06:29:36 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit flag-o-matic eutils games
 
 DESCRIPTION="SDL-rewrite of the classical real time strategy hit Command & Conquer"
@@ -27,10 +27,10 @@ S=${WORKDIR}/freecnc++
 src_unpack() {
 	unpack freecnc++-${PV}-src.tar.bz2
 	if use nocd ; then
-		mkdir data ; cd data
+		mkdir data && cd data || die
 		unpack cc1demo1.zip cc1demo2.zip
 		for f in * ; do
-			mv ${f} $(echo ${f} | awk '{print tolower($1)}') || die "moving $f"
+			mv ${f} $(echo ${f} | awk '{print tolower($1)}') || die
 		done
 	fi
 }
@@ -49,37 +49,34 @@ src_prepare() {
 		-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
 		-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}/:" \
 		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}/:" \
-		src/{freecnc,vfs/vfs}.cpp tools/audplay/audplay.cpp \
-		|| die "sed failed"
+		src/{freecnc,vfs/vfs}.cpp tools/audplay/audplay.cpp || die
 	sed -i \
 		-e 's/-Werror//' \
 		-e 's/ -j2//' \
-		$(grep -rl Werror .) \
-		|| die "sed failed"
+		$(grep -rl Werror .) || die
 	sed -i \
 		-e '/^DEBUG_FLAGS/s/$/ -fPIC/' \
 		src/vfs/vfs_tgz/Makefile \
-		src/vfs/vfs_mix/Makefile \
-		|| die "sed failed"
+		src/vfs/vfs_mix/Makefile || die
 }
 
 src_compile() {
-	emake linux EXTRACFLAGS="${CFLAGS}" || die "emake failed"
+	emake linux EXTRACFLAGS="${CFLAGS}"
 }
 
 src_install() {
 	exeinto "$(games_get_libdir)"/${PN}
-	doexe freecnc *.vfs audplay shpview tmpinied || die "doexe failed"
+	doexe freecnc *.vfs audplay shpview tmpinied
 	games_make_wrapper ${PN} ./freecnc "$(games_get_libdir)"/${PN}
 	insinto "${GAMES_DATADIR}"/${PN}/conf
-	doins conf/* || die "doins failed"
+	doins conf/*
 	insinto "${GAMES_SYSCONFDIR}"/${PN}
-	doins conf/* || die "doins failed"
+	doins conf/*
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 	if use nocd ; then
 		cd "${WORKDIR}"/data
 		insinto "${GAMES_DATADIR}"/${PN}
-		doins *.mix *.aud || die "doins failed"
+		doins *.mix *.aud
 		dodoc *.txt
 	fi
 	prepgamesdirs