EAPI=5; respect CXX

Package-Manager: portage-2.2.24

diff --git a/games-misc/c++robots/c++robots-0.ebuild b/games-misc/c++robots/c++robots-0.ebuild
index a243b7276085d70d6a7efaf52e742a7e338be290..3fc460afc916e7e00c97c6170349e52fc5d91d44 100644 (file)
--- a/games-misc/c++robots/c++robots-0.ebuild
+++ b/games-misc/c++robots/c++robots-0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="ongoing 'King of the Hill' (KotH) tournament"

diff --git a/games-misc/c++robots/files/proper-coding.patch b/games-misc/c++robots/files/proper-coding.patch
index f54af03890799a55a1c6e2fb650c30c3ee653081..93b87c1c1da5b13074316ad0b14c78d080a7ecf9 100644 (file)
--- a/games-misc/c++robots/files/proper-coding.patch
+++ b/games-misc/c++robots/files/proper-coding.patch
@@ -1,51 +1,51 @@
---- Makefile.orig      2003-01-01 23:36:19.000000000 -0500
-+++ Makefile   2003-01-01 23:39:32.000000000 -0500
-@@ -1,8 +1,9 @@
+--- c++robots.orig/Makefile
++++ c++robots/Makefile
+@@ -1,38 +1,37 @@
  CFLAGS=-g
 +LDFLAGS=
  PROGRAMS=combat 
  ROBOTS=cylon tracker target
  
 -CC=g++ -g
-+CC=g++
- 
+-
  all: $(PROGRAMS) $(ROBOTS)
  
-@@ -10,29 +11,29 @@
+ clean:
        rm -f $(PROGRAMS) $(ROBOTS) *.o core
  
  combat:       combat.o 
 -      $(CC) $(CFLAGS) -o $@ combat.o -lm
-+      $(CC) -o $@ $(LDFLAGS) combat.o -lm
++      $(CXX) -o $@ $(LDFLAGS) combat.o -lm
  
  combat.o:     combat.c 
-       $(CC) $(CFLAGS) -c combat.c
+-      $(CC) $(CFLAGS) -c combat.c
++      $(CXX) $(CXXFLAGS) -c combat.c
  
  robots.o: robots.C robots.h
 -      g++ -c robots.C
-+      $(CC) $(CFLAGS) -c robots.C
++      $(CXX) $(CXXFLAGS) -c robots.C
  
  cylon: cylon.o robots.o
 -      g++ -static -o $@ cylon.o robots.o 
-+      $(CC) -o $@ $(LDFLAGS) cylon.o robots.o 
++      $(CXX) -o $@ $(LDFLAGS) cylon.o robots.o 
  
  cylon.o: cylon.c robots.h
 -      g++ -c cylon.c
-+      $(CC) $(CFLAGS) -c cylon.c
++      $(CXX) $(CXXFLAGS) -c cylon.c
  
  tracker: tracker.o robots.o
 -      g++ -static -o $@ tracker.o robots.o 
-+      $(CC) -o $@ $(LDFLAGS) tracker.o robots.o 
++      $(CXX) -o $@ $(LDFLAGS) tracker.o robots.o 
  
  tracker.o: tracker.c robots.h
 -      g++ -c tracker.c
-+      $(CC) $(CFLAGS) -c tracker.c
++      $(CXX) $(CXXFLAGS) -c tracker.c
  
  target: target.o robots.o
 -      g++ -static -o $@ target.o robots.o 
-+      $(CC) -o $@ $(LDFLAGS) target.o robots.o 
++      $(CXX) -o $@ $(LDFLAGS) target.o robots.o 
  
  target.o: target.c robots.h
 -      g++ -c target.c
-+      $(CC) $(CFLAGS) -c target.c
++      $(CXX) $(CXXFLAGS) -c target.c