Fix patch file as per Bug #507932

Migrate to EAPI=4

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 17 insertions, 115 deletions

diff --git a/games-misc/c++robots/ChangeLog b/games-misc/c++robots/ChangeLog
index 39abe761e8d1..edda05fd9545 100644
--- a/games-misc/c++robots/ChangeLog
+++ b/games-misc/c++robots/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-misc/c++robots
 # Copyright 2002-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/c++robots/ChangeLog,v 1.9 2014/04/17 19:17:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/c++robots/ChangeLog,v 1.10 2014/05/13 06:37:18 tupone Exp $
+
+  13 May 2014; Tupone Alfredo <tupone@gentoo.org> c++robots-0.ebuild,
+  files/proper-coding.patch:
+  Fix patch file as per Bug #507932 by Ulrich Muller
+  Migrate to EAPI=4
 
   17 Apr 2014; Ulrich Müller <ulm@gentoo.org> c++robots-0.ebuild:
   Update LICENSE, BSD according to LICENSE file, bug 505858.
diff --git a/games-misc/c++robots/Manifest b/games-misc/c++robots/Manifest
index 03cc7c2a0ed3..868e2d72ffbb 100644
--- a/games-misc/c++robots/Manifest
+++ b/games-misc/c++robots/Manifest
@@ -1,22 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX proper-coding.patch 3366 SHA256 ed0532b80ed862c10c402dda086578d8031c93e04233f5b826433644acd96876 SHA512 c15a8f2be07e1aeb8a22ddf3c47caf9512cf15487735a211098e55f25a93284448beeacf6578e074b1b97f4e5ecbdb14f2b4e55f9b88a1795f06c816366996b6 WHIRLPOOL b3cef8fd6715b5ced63d1ad42a57ab81cc6b98d111809cc1cf8a40e73c8424ca405b4a718ead06456d34ed2bb6bc5a458a0dadbeb9cfab233b2cd7d92e3cbdb6
+AUX proper-coding.patch 1102 SHA256 6eb3ffeb8a05a10f2529461ecefaa05e69a834e8ab7e098f85bd4c0ff7235e38 SHA512 f18f08c7225215960828eaf7016ab5638bbd74b195152b38a9da978f362e4a7bd5e7e85670e991f65aa38e63dc8110024959cae8f4fc2cbfbe50cc002e083d9d WHIRLPOOL 80f5fe8792da740775f81bb4032b5d7297c19273e99fd8c290fd2ba27a6ed6af0be885b9490c1de2a618e9a169ff22a37d4aa5452f4eee7808591e0cd51e29ae
 DIST c++robots.tar.gz 10896 SHA256 8102fb0da308e6118676d54642cd6f652fcfa145384a7e830ca7103aaf02f3f5 SHA512 410a08c920f8e54abe74b085d67607bcc381e768c0127cf98eabab894a106d5d1466a1cac4146924b53c29ccffddd5eb77c9383c42b6fe6e48c7e89691e691f3 WHIRLPOOL 24483a323e2c7bbdc3e116635f1433ffd133e9886631373b7a660456078dde33a46c9479757cbc02d66c9aaa98811946eea5b791625fd0a340bd33ad9bdd8d04
-EBUILD c++robots-0.ebuild 847 SHA256 97a5d81618df3fd1097a93d89dd2e3be3902b3efedf22c99424319272b30ffca SHA512 dac4441a5ca8ab0d20119e3a4f75f58664238ff8984cb768e632534c11bfd14d9a80c9cbf5775bb7eaf218bda339465fd8f1c0c26b53e50399b9d513fc4e1a05 WHIRLPOOL fa18e94f7d89ee1b109f6ab78faa436b6bc319de36e09d79b0d66b34d3902ed3dee1e2969aac8b2cfc2c11587874d4d10635fcd4051d56d5b1c2903177c31184
-MISC ChangeLog 1001 SHA256 b94879439b3ccfcf1bb5f1233d1bc55c4b3bcb13f68a5dbd7010d50ce954d553 SHA512 4703498e03ef969062671a88c6b36b4b5c513478c3c532d94f82f6816896d258f236b62dfe2b632f797bd5c48a00ecfa3dc0b8e2510bdcc53423539bb128ba07 WHIRLPOOL 4eadd22fcbe26a5ae0631d42a2d946c4584320a80f671b45a8af223f8bc79fb6a3c0d1e02e8fe489e4d6fad891178fe4f81c84c2a73ec2206571ce96bda9bb95
+EBUILD c++robots-0.ebuild 786 SHA256 294d6c3f6c3bb19b90d7028980e929b15aae1d30c0566dc01020efdcf28c027f SHA512 b39f82647d28abedb146ca91c0e6fef6840217ca55d9d5149a7bf645944effea16943a4acd0d7eea549ecf128d2f50c790a4411e49227b3f3f1f0f73b8bf61e6 WHIRLPOOL 74733548093e0a1ca0fd226e4f34ee8057283eb1a27f8532d9d23b799fc9df66a1fab9e78d6c92b8d9fe5f498c916339f0f6d2b7cc0b4aace4952f0a06e94bfc
+MISC ChangeLog 1178 SHA256 8da8f59e5daa7d5bf7a67f8da1b84cd068454311d155f2e44b6d395fc09bdc2f SHA512 ade3f7be9301aaebfb77cbb18efbc55ddde117e649b2ca675ef47e1a22eadbdfd376885edc6374a458c013b5f829afecabdcdcb339c642a2faefb1629241103d WHIRLPOOL ad5d9024ea106721f6d2f8b1e83091b632574cfb50eb64abd9e78a9a83bcd98863609f58103d90c437ea19226d53038d982d962e9db087b38ceb20501817df6f
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTUCjgAAoJEJQzkH1pP7W4oxgL/3gk76C6EPQ8Dexo5Ki3AMof
-PEI6lnUgUChX88bU0zt3p522pD8DMMBwhs3VxqckPa+Lyq1QgYmIkKQ+A+zwiutu
-yVQ1FjclsZFRUeJHMLq0aTIlWQOLLLi9I/4+fnVoO/jY4t9x8vhVGzmfpzC9UnNU
-42HJudwjJ77dmV6BsRzKvtayILdFZfyq+P4SXkM2vR6eVyxZCzPHHh7ImKxkPzNM
-/3DME0sf75+9CNUCzPZO1VZ5T3gMTd5x+XtWhDhOGWerUs8gbFN6QRRx4v847f88
-erGxM3/NFG4mlh9cnXV4gfULlC40TalXWxdDoXWB35VUeYveYvHRUYTg6RnQmeDh
-D0axJTRKbWFbut5IoI4DKqUx+pyU3lhr/9zmfZm75zG1GnZVHX6DrhWlhaVdvCse
-b5fPH7Yk3sVlgyUVzyr0h8IJKj63H8Yb7EBS/0CthCT+sFVkMrjmYe104qbMWihA
-V5QBGiqwszaUhWtfzcorUUuyV8g6FX15QG+X/ksJLw==
-=ZExJ
+iEYEAREIAAYFAlNxvaQACgkQIY77eQFFFC3ChwCfT3QzgDHrVAx/xFwQUpsBBY7m
+yJoAoJx+U9yGdCwEXWT013k9IUQYvtER
+=NY2b
 -----END PGP SIGNATURE-----
diff --git a/games-misc/c++robots/c++robots-0.ebuild b/games-misc/c++robots/c++robots-0.ebuild
index 54529c11d72c..a3d05c76e605 100644
--- a/games-misc/c++robots/c++robots-0.ebuild
+++ b/games-misc/c++robots/c++robots-0.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/c++robots/c++robots-0.ebuild,v 1.9 2014/04/17 19:17:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/c++robots/c++robots-0.ebuild,v 1.10 2014/05/13 06:37:18 tupone Exp $
 
+EAPI=4
 inherit eutils games
 
 DESCRIPTION="ongoing 'King of the Hill' (KotH) tournament"
@@ -15,20 +16,18 @@ IUSE="static"
 
 S=${WORKDIR}/${PN}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/proper-coding.patch"
 }
 
 src_compile() {
 	local myldflags="${LDFLAGS}"
 	use static && myldflags="${myldflags} -static"
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${myldflags}" || die "emake failed"
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${myldflags}"
 }
 
 src_install() {
-	dogamesbin combat cylon target tracker || die "dogamesbin failed"
+	dogamesbin combat cylon target tracker
 	dodoc README
 	prepgamesdirs
 }
diff --git a/games-misc/c++robots/files/proper-coding.patch b/games-misc/c++robots/files/proper-coding.patch
index 3df36a153758..f54af0389079 100644
--- a/games-misc/c++robots/files/proper-coding.patch
+++ b/games-misc/c++robots/files/proper-coding.patch
@@ -49,98 +49,3 @@
 -	g++ -c target.c
 +	$(CC) $(CFLAGS) -c target.c
  
---- combat.c.orig	2003-01-01 23:32:55.000000000 -0500
-+++ combat.c	2003-01-01 23:34:06.000000000 -0500
-@@ -29,6 +29,7 @@
- #include <signal.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-+#include <time.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <errno.h>
-@@ -96,7 +97,7 @@
- Robot *robots=NULL;
- int   nrobots=0;
- 
--plot(int x, int y, char c)
-+void plot(int x, int y, char c)
- {
- 	int h = int(x)*79/10000;
- 	int v = 34-int(y)*(31-nrobots)/10000;
-@@ -472,7 +473,7 @@
- 
- }
- 
--Between(double x1, double y1, double x2, double y2, double x0, double y0)
-+int Between(double x1, double y1, double x2, double y2, double x0, double y0)
- {
- 	double tx,ty;
- 	/* is (x0,y0) between (x1,y1) - (x2,y2)? */
---- cylon.c.orig	2003-01-01 23:32:49.000000000 -0500
-+++ cylon.c	2003-01-01 23:40:13.000000000 -0500
-@@ -1,6 +1,6 @@
- #include "robots.h"
- 
--Distance(int x1, int y1, int x2, int y2)
-+int Distance(int x1, int y1, int x2, int y2)
- {
-     int dx = x1-x2;
-     int dy = y1-y2;
-@@ -8,7 +8,7 @@
-     return sqrt(dx*dx + dy*dy);
- }
- 
--Goto(int x, int y)
-+void Goto(int x, int y)
- {
-     int dir = atan2(y-loc_y(),x-loc_x());
-     int dist = Distance(x,y,loc_x(),loc_y());
-@@ -37,8 +37,9 @@
-         drive(dir,0);
- }
- 
--main()
-+int main()
- {
-     while (1)
-         Goto(rand(9000)+500,rand(9000)+500);
-+    return 0;
- }
---- robots.C.orig	2003-01-01 23:34:39.000000000 -0500
-+++ robots.C	2003-01-01 23:35:18.000000000 -0500
-@@ -6,6 +6,7 @@
- #include <time.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <string.h>
- 
- #include "robots.h"
- 
---- tracker.c.orig	2003-01-01 23:35:27.000000000 -0500
-+++ tracker.c	2003-01-01 23:35:46.000000000 -0500
-@@ -18,7 +18,7 @@
- // Shoot at a target if its in range (<= 7000 units) *and* its far
- // enough away that we will only be slightly damaged (>200 units) by the
- // resulting explosion.
--inline shoot(int dir,int range)
-+void inline shoot(int dir,int range)
- {
-     if (range <= 7000 && range > 200) {
- 		printlog("cannon(%d,%d)",dir,range);
-@@ -26,7 +26,7 @@
- 	}
- }
- 
--main()
-+int main()
- {
-     int sdir=0;     /* current scan direction */
-     int dir=0;      /* current movement direction */
-@@ -74,4 +74,6 @@
- 	else
- 	    sdir -= 20;                 /*   increment the scan */
-     }
-+
-+    return 0;
- }