EAPI=5

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

4 files changed, 36 insertions, 26 deletions

diff --git a/games-action/battalion/ChangeLog b/games-action/battalion/ChangeLog
index 6c670f577991..301920530d6a 100644
--- a/games-action/battalion/ChangeLog
+++ b/games-action/battalion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/battalion
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/ChangeLog,v 1.13 2014/08/10 21:21:43 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/ChangeLog,v 1.14 2015/03/30 22:36:05 mr_bones_ Exp $
+
+  30 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/battalion-1.4b-warning.patch, battalion-1.4b.ebuild:
+  EAPI=5
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> battalion-1.4b.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/games-action/battalion/Manifest b/games-action/battalion/Manifest
index 687bb835e545..dc3f3fe8784a 100644
--- a/games-action/battalion/Manifest
+++ b/games-action/battalion/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX battalion-1.4b-warning.patch 490 SHA256 78c09c947112102773f27a7068f2bdc535a77ba72c855a0246890f0b1ff76efe SHA512 ba216b192f454b07b14891dbc6c412b301257a91546b77c1e2053324248243422bfac43794849f44068afb65919958f466416d39826248b28dc71a644a1ee660 WHIRLPOOL 962781748a7abbf780b771c91c4a6ca0e65294502ff4872f9b0bc463cf785f7e3d016861ad2bdfe6ed0baab8dc6803491b04471fd0a2898c72d8b58a752844d8
 DIST battalion1.4b.tar.bz2 942342 SHA256 983db152b44b33396ab242946b51d33c405e0bef8649e2cc9e38d6229d9735f7 SHA512 c3c615772012c63a709aaeaf4f23246760bf577b82eeec7cf5b2a479c6240fe4a2f839aca50540299ed4bee9b297f61fb8b7e1f5af74ea357f0d7e749d86f84b WHIRLPOOL 4816460b6e07046934852ca7c079f13eca05827f34b19c13b00f98ced0caa57e848b9d1f3badaa31a82a0dcfba61a9591d70f815cb83596a6901728fd45088c5
-EBUILD battalion-1.4b.ebuild 1841 SHA256 e0c89ce72b78e23db486d293dd9cf3b002f878d81539ef6f94e304ff1f650d2a SHA512 6710d2d48ddc64a31c1d2dc2f928cdd98c6a2cd5737d2e478e3a81f0724812cdb74b4365d1d3570ed73a5a40116211be45e7f26500b9ed656328019a853a7ea5 WHIRLPOOL 9d00033ed39e09bf45a4a9c0df867164768ef9193383ba24193dcee2d08ecc1486b938862b0dc0499f41160ee0796d6c62872dec5e0ef14ec4c666d3e78992fd
-MISC ChangeLog 1689 SHA256 3cb235e4f74b9c0e3cfd3ba8ca54ef2280ab595f28c3f299c43ce5c4070ab582 SHA512 d9e7b3da50ab65a808126a28c86ec02c7249bf6051cc6c4bd205ca05628dd9aa4634759e1b23af132574487a1f22e9d8b8afdf256e13fbfcad0017955dba0b0b WHIRLPOOL 4cbd96ef89c209d2444c87d6446ec2de1517593e4a7bacae476298e25d7175d9b66a5a964ef93a2ba344b443ba6e0f9e4157a6789de0ace3ed364b801d17e4cc
+EBUILD battalion-1.4b.ebuild 1758 SHA256 204bfce8b40fa0c2503f3853471ffae056156c566c03511d84c55120983034d8 SHA512 d58d75eaf6e9547f473a1aef143f1472b2813343cb3cc99b5cbc443746e5f277eead752ab930431ee38202096610650ede8a6f9ad2893ea113cd7293c8e98b08 WHIRLPOOL 5fd244ea9b2409b0a4027d5f368a1dc44a6e99c837bf1115bcbac4e6d881d01c5538e23409037d66ece11fb2d3cd6cedb398a14f7c29cea18af02a0323ce8340
+MISC ChangeLog 1819 SHA256 dbcca58416adec02f5f7df1c20a5bed108eba4931e402c80aeb71260c5eb00bb SHA512 ee78de1a2d4a934d37a64d62484ecf1d9691799b732a6f7ffb190724a7fa63b6b925be9246484c90e5977256275a45d564f76e039fff2e27d591577010a53b08 WHIRLPOOL adfc2dbc9fe958b753294cdfc2409d52267f7cc05bbb889186ebd543c21f9dd114476c32ca8f8f03a35c8ae875ecd01c08cb688dea94385bfb77c45c8405947e
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn4mgACgkQcaHudmEf86rBPwCcCryikDFIihBdaT7sSamAu71K
-qs4An1lG60TKzgPxG4gwPdT0u26vDZIl
-=jZ/l
------END PGP SIGNATURE-----
diff --git a/games-action/battalion/battalion-1.4b.ebuild b/games-action/battalion/battalion-1.4b.ebuild
index 6dab47d753da..285492ed77ab 100644
--- a/games-action/battalion/battalion-1.4b.ebuild
+++ b/games-action/battalion/battalion-1.4b.ebuild
@@ -1,9 +1,9 @@
-# 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-action/battalion/battalion-1.4b.ebuild,v 1.17 2014/08/10 21:21:43 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/battalion-1.4b.ebuild,v 1.18 2015/03/30 22:36:05 mr_bones_ Exp $
 
-EAPI=2
-inherit games
+EAPI=5
+inherit eutils games
 
 DESCRIPTION="Be a rampaging monster and destroy the city"
 HOMEPAGE="http://evlweb.eecs.uic.edu/aej/AndyBattalion.html"
@@ -15,41 +15,44 @@ KEYWORDS="ppc x86"
 IUSE=""
 
 DEPEND="virtual/opengl
-	virtual/glu"
+	virtual/glu
+	x11-libs/libX11"
+RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${PN}${PV}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-warning.patch
 	# Modify data paths
 	sed -i \
 		-e "s:SOUNDS/:${GAMES_DATADIR}/${PN}/SOUNDS/:" \
 		-e "s:MUSIC/:${GAMES_DATADIR}/${PN}/MUSIC/:" \
-		audio.c || die "sed audio.c failed"
+		audio.c || die
 	sed -i \
 		-e "s:DATA/:${GAMES_DATADIR}/${PN}/DATA/:" \
 		-e "s:/usr/tmp:${GAMES_STATEDIR}:" \
-		battalion.c || die "sed battalion.c failed"
+		battalion.c || die
 	sed -i \
 		-e "s:TEXTURES/:${GAMES_DATADIR}/${PN}/TEXTURES/:" \
-		graphics.c || die "sed graphics.c failed"
+		graphics.c || die
 
 	# Modify Makefile and add CFLAGS
 	sed -i \
 		-e "s:-O2:${CFLAGS}:" \
 		-e "/^CC/d" \
-		Makefile || die "sed Makefile failed"
+		Makefile || die
 	# Only .raw sound files are used on Linux. The .au files are not needed.
 	rm -f {SOUNDS,MUSIC}/*.au
 }
 
 src_compile() {
-	emake LIBFLAGS="${LDFLAGS}" || die "died running emake"
+	emake LIBFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	dogamesbin battalion || die "dogamesbin failed"
+	dogamesbin battalion
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r DATA MUSIC SOUNDS TEXTURES || die "doins failed"
+	doins -r DATA MUSIC SOUNDS TEXTURES
 	dodoc README
 
 	dodir "${GAMES_STATEDIR}"
diff --git a/games-action/battalion/files/battalion-1.4b-warning.patch b/games-action/battalion/files/battalion-1.4b-warning.patch
new file mode 100644
index 000000000000..91fd8ee51d3b
--- /dev/null
+++ b/games-action/battalion/files/battalion-1.4b-warning.patch
@@ -0,0 +1,12 @@
+diff -ru battalion1.4b.orig/net.c battalion1.4b/net.c
+--- battalion1.4b.orig/net.c	2002-05-06 09:57:01.000000000 -0400
++++ battalion1.4b/net.c	2015-03-30 18:29:23.885306334 -0400
+@@ -378,7 +378,7 @@
+ 
+ /* nother copy of this elsewhere */
+ 
+-	sprintf(mesg, "%s %d %3.1f %3.1f %3.1f %3.1f %0.3f %d %d #", MESG_NEW_TANK,
++	sprintf(mesg, "%s %d %3.1f %3.1f %3.1f %3.1f %0.3f %d #", MESG_NEW_TANK,
+ 						 tempTank->number, 
+ 						 tempTank->x-globalxshift, 
+ 						 tempTank->z-globalzshift,