EAPI=5; tidy

Package-Manager: portage-2.2.7/cvs/Linux x86_64

3 files changed, 21 insertions, 36 deletions

diff --git a/games-fps/nexuiz/ChangeLog b/games-fps/nexuiz/ChangeLog
index a75ca210ab13..cfbea84e63a3 100644
--- a/games-fps/nexuiz/ChangeLog
+++ b/games-fps/nexuiz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/nexuiz
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.40 2013/11/19 01:03:52 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.41 2013/11/21 20:05:21 mr_bones_ Exp $
+
+  21 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org> nexuiz-2.5.2.ebuild:
+  EAPI=5; tidy
 
   19 Nov 2013; Julian Ospald <hasufell@gentoo.org>
   +files/nexuiz-2.5.2-libpng-1.4.patch, nexuiz-2.5.2.ebuild:
diff --git a/games-fps/nexuiz/Manifest b/games-fps/nexuiz/Manifest
index 19a1d284fb8f..a2ab1b347a24 100644
--- a/games-fps/nexuiz/Manifest
+++ b/games-fps/nexuiz/Manifest
@@ -1,20 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX nexuiz-2.5.2-libpng-1.4.patch 1607 SHA256 9b5113290e3dda77711ac430ff1bcbefcd793a640d012ced5dfe462857befc71 SHA512 38aa8fbd0765283c03c0bf6cc13362ed692f4776a12ad23ef582eb9c238fda6eea475284a662ba84d70eab7a7df71a0cb28b5b90f19c12d2594c3ba67f0851aa WHIRLPOOL 90f8f1cddc9df3d67430573da309f7e5b52cc0005021392493d380ef394671a2522a98c657a9a21804180bcaa7554f9ef1646028f9ea927ef9f9092d6a9fad61
-DIST nexmappack_r2.zip 113533483 SHA256 15088c7632e0b4f487c789fba4296f44ef5a5d83b51adcb9e603e289e5b8241e
+DIST nexmappack_r2.zip 113533483 SHA256 15088c7632e0b4f487c789fba4296f44ef5a5d83b51adcb9e603e289e5b8241e SHA512 f7e2dd60530b58f3fc505cdf0d605208b6905136586107210031233cb870b1892bae59efc4fb38403a4f0fc5301321297d03107b38daa501cb90e5669455eac0 WHIRLPOOL 5385fc2fe5afc4d4c2c3404311ef00c25bdc6cfd0bb3846cfdf0dee79c8205ed5861c5b6b1095d1db2938e3fc726178084ad9b52eb73989d199fb136d8be6a82
 DIST nexuiz-252.zip 931253731 SHA256 a5e27ebcc9775c4a490d0d3536c32e4a8f8f96b038c0b6a78d1823c37a962000 SHA512 da661eb2ff1764fed1d5f5547b89e4f9aa47613d41a3999c0202d8858ec2b882e4ef0ec182a81d1bdb25dff2ef65aad6af132009884e3557206941a736c2a68c WHIRLPOOL e3d08e4936a1fec97e024d0273162e15fbd4c68b13939f82c59ed2b5f613fa6f683423c753fd11d23c9be39f1bc620f2c0013456762773663a283078687eb21d
-EBUILD nexuiz-2.5.2.ebuild 3093 SHA256 d3e40f75b78193ebeb7eeffd58e21bcd745ee708acb3f68718bec41803ea73be SHA512 471839904425703e7cd831b519ce1dc197a1132581e193c28f08caf52a87871f7c2038fbdfbe8bbd71f1de86872c99f112883f2353db86b4c8d440d05f7b7868 WHIRLPOOL 9493ef0a53783dd69a177a600ca051480fb6baa99c5cd98e7878befa98c9b6d0e83d6b487fa06b0fb34227f94a920012405897f0eec3f5b80274ad1f8a127fb2
-MISC ChangeLog 5609 SHA256 eabbcecddbbfb3dfe22a50923db5292b4d6bf8d130a139d197ed826704b5c73c SHA512 698983763d6f187c396653cee82684d9d95b4ba74734e239ec3963d44c5d3f35072dca6638c73b39ad6290c25c1fd525c4236ea3c0b0ade3b3106d5e51c3b4e0 WHIRLPOOL ad69a00036b868688889026345d4d63bb8f07f4cd0addf748766544a23fdb4a356765679b356051993ba9d83351a7bbe5cd34eed75be54e734adb7faaf59068c
+EBUILD nexuiz-2.5.2.ebuild 2762 SHA256 6d49962cb7c6d5e754cad249b423e5cf8cb8819dd0e1c48a3f1d037b841e06cf SHA512 80401fa9ad413bd0288d65980946c7ab3754ab0ad731789e33accb99d8843d7ebd02348600d2d58cfc5a87d34a0f0bd2e79f97fcd7bfd366182cf30376e9fc57 WHIRLPOOL 50cafc0aa1d81535b6c38284fd3bf2df4c991a533b257d7f8a53b5f3fafb5cbc83999049e23b23f95480c8af255aefb19df612ddba395e75ac3bdd4b57bec00d
+MISC ChangeLog 5702 SHA256 eb212b26631d5eafaf326bfadbb90c8b04ba0b7c8d55c7cd5c10145be29754c7 SHA512 8ebe3c9efba001e8599ba932ea017479416af2ffeb14343cf1bca41a4cbb5b88e3f485335ae8415c62dac1a8fda3569dcba2db8697e69bfed5fd8b8b6f6d3f07 WHIRLPOOL d9ace1acd645534f742dd74a47352e96ec444a23fccfbe59cfac54d67d36fdefa8a1f91a5e5e6d39a0b11255dab0a49de57b5ba77803c211e60d05972489232d
 MISC metadata.xml 237 SHA256 a35634a2c24559545aef4e6e3a59cefa0c3d38644e83d1bbe30cd9530787b110 SHA512 f3d95ca414bd13f5ffe54c7ddf02ccc13866e32d17e61f0482fd131d2ce47d5357386aa0680e8a5fca166c1d0f9bf1cc2fc6772992d7fcfb83f64e7ba82e6ca8 WHIRLPOOL a822e0657d8ebc7de24c8b3ef25b2109ff843e271dae9259c6480b0ed18eeb4d8a52c215e5a7a9bb068fa3db405625392be2180bbb93c4a43a5807d4d0d7d85b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJSirj9AAoJEFpvPKfnPDWz52IIALCKxsHtYhh3qpTH6xfc7LNs
-GWnqnKlfv7JJnoRMTEMOX+LNJ27z2iupXZ+yC6GpVFR+JwGwxqE3Rh4pq79/wShC
-n8QIpnx94lFrogz2YNe6UsinD9NaovFrsxtC25fpxK2CiYB65La1X9mhtzUojFQg
-VUoXoy4ZZq7HOq/I3a5WTX8c1yo/DdY4YH3/6AI0Ek7molviG5rCDCSHtWgkrfOE
-wG41SpazqGqw6XgqA5qhfafExFpNA8vRayNJxkGXMAL45WA8N4RzmAThVZJlqKDZ
-54VJfoA1VAeaD6rZKDpu1h5y5lekPw96k+BrYl8HFVDPgxMsHD7xEXHstr5X/rw=
-=JZZz
------END PGP SIGNATURE-----
diff --git a/games-fps/nexuiz/nexuiz-2.5.2.ebuild b/games-fps/nexuiz/nexuiz-2.5.2.ebuild
index 7144143d52c2..8baca02c636f 100644
--- a/games-fps/nexuiz/nexuiz-2.5.2.ebuild
+++ b/games-fps/nexuiz/nexuiz-2.5.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-2.5.2.ebuild,v 1.6 2013/11/19 01:03:52 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-2.5.2.ebuild,v 1.7 2013/11/21 20:05:21 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils games
 
 MY_PN=Nexuiz
@@ -72,43 +72,40 @@ src_prepare() {
 		-e "s:-O2:${CFLAGS}:" \
 		-e "/-lm/s:$: ${LDFLAGS}:" \
 		-e '/^STRIP/s/strip/true/' \
-		makefile.inc \
-		|| die "sed failed"
+		makefile.inc || die
 
 	sed -i \
 		-e '1i DP_LINK_TO_LIBJPEG=1' \
 		-e "s:ifdef DP_.*:DP_FS_BASEDIR=${GAMES_DATADIR}/nexuiz\n&:" \
-		makefile \
-		|| die "sed failed"
+		makefile || die
 
 	if ! use alsa ; then
 		sed -i \
 			-e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
-			makefile \
-			|| die "sed failed"
+			makefile || die
 	fi
 }
 
 src_compile() {
 	if use opengl || ! use dedicated ; then
-		emake cl-${PN} || die "emake cl-${PN} failed"
+		emake cl-${PN}
 		if use sdl ; then
-			emake sdl-${PN} || die "emake sdl-${PN} failed"
+			emake sdl-${PN}
 		fi
 	fi
 
 	if use dedicated ; then
-		emake sv-${PN} || die "emake sv-${PN} failed"
+		emake sv-${PN}
 	fi
 }
 
 src_install() {
 	if use opengl || ! use dedicated ; then
-		dogamesbin ${PN}-glx || die "dogamesbin glx failed"
+		dogamesbin ${PN}-glx
 		doicon ${PN}.xpm
 		make_desktop_entry ${PN}-glx "Nexuiz (GLX)"
 		if use sdl ; then
-			dogamesbin ${PN}-sdl || die "dogamesbin sdl failed"
+			dogamesbin ${PN}-sdl
 			make_desktop_entry ${PN}-sdl "Nexuiz (SDL)"
 			dosym ${PN}-sdl "${GAMES_BINDIR}"/${PN}
 		else
@@ -117,10 +114,10 @@ src_install() {
 	fi
 
 	if use dedicated ; then
-		dogamesbin ${PN}-dedicated || die "dogamesbin dedicated failed"
+		dogamesbin ${PN}-dedicated
 	fi
 
-	cd "${WORKDIR}"/${MY_PN}
+	cd "${WORKDIR}"/${MY_PN} || die
 
 	dodoc Docs/*.txt
 	dohtml -r readme.html Docs
@@ -128,11 +125,10 @@ src_install() {
 	insinto "${GAMES_DATADIR}"/${PN}
 
 	if use dedicated ; then
-		doins -r server || die "doins server failed"
+		doins -r server
 	fi
 
-	doins -r data || die "doins data failed"
-	doins -r havoc || die "doins havoc failed"
+	doins -r data havoc
 
 	prepgamesdirs
 }