3 files changed, 8 insertions, 136 deletions
diff --git a/games-action/atanks/ChangeLog b/games-action/atanks/ChangeLog
index 6fe2beda5227..47894ac2dd27 100644
--- a/games-action/atanks/ChangeLog
+++ b/games-action/atanks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/atanks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/ChangeLog,v 1.73 2012/03/21 20:12:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/ChangeLog,v 1.74 2012/04/21 21:22:00 mr_bones_ Exp $
+
+*atanks-5.4 (21 Apr 2012)
+
+  21 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org> -atanks-5.3.ebuild,
+  -files/atanks-5.3-build.patch, +atanks-5.4.ebuild:
+  version bump
 
 *atanks-5.3 (21 Mar 2012)
 
diff --git a/games-action/atanks/atanks-5.3.ebuild b/games-action/atanks/atanks-5.4.ebuild
index 9eac0560929c..c3b4e9947690 100644
--- a/games-action/atanks/atanks-5.3.ebuild
+++ b/games-action/atanks/atanks-5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-5.3.ebuild,v 1.1 2012/03/21 20:12:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-5.4.ebuild,v 1.1 2012/04/21 21:22:00 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -18,7 +18,6 @@ DEPEND="media-libs/allegro:0[X]"
 
 src_prepare() {
 	find . -type f -name ".directory" -exec rm -vf '{}' +
-	epatch "${FILESDIR}"/${P}-build.patch
 }
 
 src_compile() {
diff --git a/games-action/atanks/files/atanks-5.3-build.patch b/games-action/atanks/files/atanks-5.3-build.patch
deleted file mode 100644
index e5c29f501427..000000000000
--- a/games-action/atanks/files/atanks-5.3-build.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- atanks-5.3.orig/src/Makefile
-+++ atanks-5.3/src/Makefile
-@@ -4,9 +4,6 @@
-           missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o \
-           update.o network.o floattext.o land.o text.o client.o gameloop.o
- 
--CPP=g++
--CC=gcc
--LD=g++
- LIB=ar
- WINDRES=
- # FLAGS += -DDATA_DIR=\".\" -Wno-write-strings -DNETWORK -DTHREADS
-@@ -15,9 +12,9 @@
- WFLAGS = 
- OFLAGS = 
- LFLAGS +=
--LDFLAGS =  `allegro-config --libs`
-+LDFLAGS +=  `allegro-config --libs` -lm -lpthread
- 
--CFLAGS += -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
-+CXXFLAGS += -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
- 
- SRCS  = $(MODULES:.o=.cpp)
- GLOBALS	= main.h imagedefs.h externs.h
-@@ -33,82 +30,82 @@
- $(MODULES): Makefile
- 
- atanks.o: atanks.cpp globals.h main.h menucontent.h
--	$(CPP) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- button.o: button.cpp button.h
--	$(CPP) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- client.o: client.h client.cpp
--	$(CPP) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CFLAGS)
-+	$(CXX) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CXXFLAGS)
- 
- environment.o: environment.cpp environment.h
--	$(CPP) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- explosion.o: explosion.cpp explosion.h
--	$(CPP) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- files.o: files.cpp files.h text.h text.cpp
--	$(CPP) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- floattext.o: floattext.cpp floattext.h
--	$(CPP) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- gameloop.o: gameloop.cpp atanks.cpp main.h
--	$(CPP) -c gameloop.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c gameloop.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- globaldata.o: globaldata.cpp globaldata.h
--	$(CPP) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- land.o: land.cpp land.h globaldata.h environment.h
--	$(CPP) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- missile.o: missile.cpp missile.h
--	$(CPP) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- teleport.o: teleport.cpp teleport.h
--	$(CPP) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- physobj.o: physobj.cpp physobj.h
--	$(CPP) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- player.o: player.cpp player.h
--	$(CPP) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- tank.o: tank.cpp tank.h
--	$(CPP) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- team.o: team.cpp team.h
--	$(CPP) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- virtobj.o: virtobj.cpp virtobj.h
--	$(CPP) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- fade.o: fade.cpp
--	$(CPP) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- perlin.o: perlin.cpp
--	$(CPP) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- sky.o: sky.cpp sky.h
--	$(CPP) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- satellite.o: satellite.cpp satellite.h
--	$(CPP) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- text.o: text.cpp text.h
--	$(CPP) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- update.o: update.cpp update.h
--	$(CPP) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- network.o: network.cpp network.h
--	$(CPP) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- %.o: %.cpp %.h
--	$(CPP) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- $(OUTPUT): $(OBJECTS) $(MODULES)
--	$(CPP) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CFLAGS)
-+	$(CXX) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CXXFLAGS)
- 	# strip $(OUTPUT)
- 
- # dependencies: