games-arcade/snake: Version bump, minor ebuild and Makefile patch fixes.

svn path=/sunrise/; revision=12538

5 files changed, 55 insertions, 48 deletions

diff --git a/games-arcade/snake/ChangeLog b/games-arcade/snake/ChangeLog
index d36a4d8b2..ac9eaa99f 100644
--- a/games-arcade/snake/ChangeLog
+++ b/games-arcade/snake/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for games-arcade/snake
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Nov 2011; Piotr Szymaniak <szarpaj@grubelek.pl> ChangeLog:
+  Version bump, minor ebuild and Makefile patch fixes.
+
   24 Aug 2009; Romain Perier (mrpouet) <mrpouet@gentoo.org>
   snake-0.5.1.ebuild, files/snake-0.5.1-clean-up-Makefile.patch:
   Clean-up Makefile in order to use portage env variables
diff --git a/games-arcade/snake/Manifest b/games-arcade/snake/Manifest
index 6e322082b..5fbfdcca4 100644
--- a/games-arcade/snake/Manifest
+++ b/games-arcade/snake/Manifest
@@ -1,6 +1,6 @@
-AUX snake-0.5.1-clean-up-Makefile.patch 2253 RMD160 0b1b7b5d3fcf383ea66e402542f5c49b227444fd SHA1 14488275945576f45e67b9ad96c710b56f5a855d SHA256 1371230a5d3f0d26ff97cc82983351ee1bec4ab6f482515ff7182b62a91305be
-AUX snake-0.5.1-qa-warnings.patch 2738 RMD160 43567ac54cbbe1604783d9a754525aba7d0f9c51 SHA1 5a4a087a0a9df78e4c98f5686506f947a1664977 SHA256 cfcf64d842a98de40a32e662332960c54ee610cbc82abe5ae8e123fd04cf4047
-DIST snake-0.5.1.tar.bz2 173330 RMD160 2da378f1875fa1739be12da5b8680ccac0737268 SHA1 e2386cd9ae9e651f63f6fc63233f66a0c1f63e83 SHA256 0a8427a5dd6017e40b7098ff71b99a5d25104fbaa7371456a36c5a415c27fa87
-EBUILD snake-0.5.1.ebuild 753 RMD160 c488cc96c13ea53536396f841cdfab477556c32b SHA1 d77ffde1dac792507c21879957c97de10bf89567 SHA256 9ee7b62c624bb3bfe83bd3e8cd7be3d377c54ffe4b28f164299382fd2c59d58c
-MISC ChangeLog 1233 RMD160 6581304739b3e7647e48073e94e49bf72c4e615d SHA1 9ac9e661cba1a847f7e2d227cbd39ba2a73ee718 SHA256 f0cf35926e474d9c77b84d962f79d8157615e9dea6264cc8ec6d6bd06341e49e
+AUX snake-0.5.2-clean-up-Makefile.patch 2610 RMD160 b315529efb8cb4fef46d56e781d228ff0cab1bfb SHA1 dc6d482c3b8c0a121f982000a5d848e0b7f2f319 SHA256 9022b3384b85cdb8e2107198c4bf77ba33fb6397c995f9bce5556fb91c20884f
+AUX snake-0.5.2-qa-warnings.patch 2738 RMD160 43567ac54cbbe1604783d9a754525aba7d0f9c51 SHA1 5a4a087a0a9df78e4c98f5686506f947a1664977 SHA256 cfcf64d842a98de40a32e662332960c54ee610cbc82abe5ae8e123fd04cf4047
+DIST snake-0.5.2.tar.bz2 141994 RMD160 8fc1b020c89a5905922de4c6cf2e1189b7349523 SHA1 8c001dd337af23f454c8391819b12bf723a687e9 SHA256 efe767eee1c284a3b81ce1e7b2706762309c83649ca5425c39b811a1fd54deaf
+EBUILD snake-0.5.2.ebuild 747 RMD160 b3de7dc579b26413da44523c5235478fe0b3baf4 SHA1 bbe2840ae465884b14619e3b1c022280dab735df SHA256 9219cf0979cf6fc6ccf180e7ef787b927712b6cd7a23e30aff898dd7a6e7733d
+MISC ChangeLog 1353 RMD160 7813f4cd2f9b2e33493af5a39535d115208d79d8 SHA1 99768f6bbd6beb4a59c69e2d0b1003388b96ea86 SHA256 c4a5c847f732a22b24dadc396d27605d0592f43a8a96c41149fbd4e3851bc969
 MISC metadata.xml 212 RMD160 fffaaa303bcf726272e6043b7b1ea1627e0048b3 SHA1 d6404d3e9f2e531ffcf9f5e16c376826225f9199 SHA256 07a46afee887443a30aa1f1755449fb5b78786e4f2ccad0470f792cc2d8e176f
diff --git a/games-arcade/snake/files/snake-0.5.1-clean-up-Makefile.patch b/games-arcade/snake/files/snake-0.5.2-clean-up-Makefile.patch
index 20fb0c551..13f564d3d 100644
--- a/games-arcade/snake/files/snake-0.5.1-clean-up-Makefile.patch
+++ b/games-arcade/snake/files/snake-0.5.2-clean-up-Makefile.patch
@@ -1,76 +1,80 @@
- Makefile |   52 +++++++++++++++-------------------------------------
- 1 files changed, 15 insertions(+), 37 deletions(-)
-
 diff --git a/Makefile b/Makefile
-index 69e39ea..660e12a 100644
+index 08ef900..0123571 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,8 +1,9 @@
--OBJS = main.o snake.o config.o playground.o queue_key.o config-player.o
--CC = g++
--DEBUG = -g
+@@ -1,8 +1,11 @@
+ OBJS = main.o snake.o config.o playground.o queue_key.o config-player.o
+ CC = g++
+ DEBUG = 
 -CFLAGS = -Wall -c -I/usr/include/SDL $(DEBUG)
--LFLAGS = -Wall -L/usr/lib -lSDL -lpthread -lSDL_image -lSDL_gfx -lSDL_ttf -lSDL_mixer  $(DEBUG)
-+CC=g++
+-LFLAGS = -Wall -L/usr/lib -lSDL -lpthread -lSDL_image -lSDL_gfx -lSDL_ttf -lSDL_mixer -lstdc++ $(DEBUG)
 +CPPFLAGS=`pkg-config sdl --cflags`
 +LIBS=`pkg-config sdl --libs` -lSDL_image -lSDL_gfx -lSDL_ttf -lSDL_mixer
 +
 +SRC=$(wildcard src/*.cpp)
-+OBJ=$(SRC:.cpp=.o)
++OBJS=$(SRC:.cpp=.o)
  
  ifndef GAMES_BINDIR
  GAMES_BINDIR=/usr/games/bin
-@@ -12,44 +13,21 @@ ifndef GAMES_DATADIR
+@@ -12,35 +15,35 @@ ifndef GAMES_DATADIR
  GAMES_DATADIR=/usr/share/games
  endif
  
 -CFLAGS+=-DBINDIR="\"$(GAMES_BINDIR)\""
 -CFLAGS+=-DDATADIR="\"$(GAMES_DATADIR)\""
--
++CPPFLAGS += -DBINDIR="\"$(GAMES_BINDIR)\""
++CPPFLAGS += -DDATADIR="\"$(GAMES_DATADIR)\""
+ 
 -Release: snake
 -Debug: snake
--
--snake : $(OBJS)
++all: snake
+ 
+ snake : $(OBJS)
 -	$(CC) $(LFLAGS) $(OBJS) -o snake
--
++	$(CC) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBS)
++%.o: src/%.cpp src/%.h
+ 
 -main.o : src/main.cpp src/config.h src/snake.h
 -	$(CC) $(CFLAGS) src/main.cpp
--
++#main.o : src/main.cpp src/config.h src/snake.h
++#	$(CC) $(CFLAGS) src/main.cpp
+ 
 -snake.o : src/snake.cpp src/snake.h src/config.h src/definitions.h src/koordinate.h src/playground.h src/queue_key.h
 -	$(CC) $(CFLAGS) src/snake.cpp
--
++#snake.o : src/snake.cpp src/snake.h src/config.h src/definitions.h src/koordinate.h src/playground.h src/queue_key.h
++#	$(CC) $(CFLAGS) src/snake.cpp
+ 
 -config.o : src/config.cpp src/config.h src/config-player.h
 -	$(CC) $(CFLAGS) src/config.cpp
-+CPPFLAGS += -DBINDIR="\"$(GAMES_BINDIR)\""
-+CPPFLAGS += -DDATADIR="\"$(GAMES_DATADIR)\""
++#config.o : src/config.cpp src/config.h src/config-player.h
++#	$(CC) $(CFLAGS) src/config.cpp
  
 -playground.o : src/playground.cpp src/playground.h src/definitions.h src/config.h
 -	$(CC) $(CFLAGS) src/playground.cpp
--
++#playground.o : src/playground.cpp src/playground.h src/definitions.h src/config.h
++#	$(CC) $(CFLAGS) src/playground.cpp
+ 
 -queue_key.o : src/queue_key.cpp src/queue_key.h src/definitions.h
 -	$(CC) $(CFLAGS) src/queue_key.cpp
--
++#queue_key.o : src/queue_key.cpp src/queue_key.h src/definitions.h
++#	$(CC) $(CFLAGS) src/queue_key.cpp
+ 
 -config-player.o : src/config-player.cpp src/config-player.h src/config.h src/definitions.h
 -	$(CC) $(CFLAGS) src/config-player.cpp
-+all: snake
++#config-player.o : src/config-player.cpp src/config-player.h src/config.h src/definitions.h
++#	$(CC) $(CFLAGS) src/config-player.cpp
  
-+snake: $(OBJ)
-+	$(CC) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBS)
-+%.o: src/%.cpp src/%.h
  clean:
 -	rm *.o *~ snake
--
--
 +	rm -f $(OBJ) *~ snake
+ 
+ 
  install:
- 	mkdir -p $(DESTDIR)/$(GAMES_BINDIR)/
- 	install -g games -m 750 ./snake $(DESTDIR)/$(GAMES_BINDIR)/
- 	mkdir -p $(DESTDIR)/$(GAMES_DATADIR)/snake/
- 	install -g games -m 640 ./src/res/* $(DESTDIR)/$(GAMES_DATADIR)/snake/
--
--
+@@ -51,5 +54,5 @@ install:
+ 
+ 
  uninstall:
 -	rm -r $(GAMES_DATADIR)/snake
 -	rm $(GAMES_BINDIR)/snake
 +	rm -rf $(GAMES_DATADIR)/snake
-+	rm -f  $(GAMES_BINDIR)/snake
++	rm -r $(GAMES_BINDIR)/snake
diff --git a/games-arcade/snake/files/snake-0.5.1-qa-warnings.patch b/games-arcade/snake/files/snake-0.5.2-qa-warnings.patch
index dc7196768..dc7196768 100644
--- a/games-arcade/snake/files/snake-0.5.1-qa-warnings.patch
+++ b/games-arcade/snake/files/snake-0.5.2-qa-warnings.patch
diff --git a/games-arcade/snake/snake-0.5.1.ebuild b/games-arcade/snake/snake-0.5.2.ebuild
index fe7f9f980..dcdcf5f3e 100644
--- a/games-arcade/snake/snake-0.5.1.ebuild
+++ b/games-arcade/snake/snake-0.5.2.ebuild
@@ -14,21 +14,21 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND="
-		media-libs/libsdl[alsa,X]
-		media-libs/sdl-gfx
-		media-libs/sdl-image[png]
-		media-libs/sdl-mixer
-		media-libs/sdl-ttf
-"
+DEPEND="media-libs/libsdl[alsa,X]
+	media-libs/sdl-gfx
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	media-libs/sdl-ttf"
 RDEPEND=${DEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-{clean-up-Makefile,qa-warnings}.patch
 }
+
 src_compile() {
 	emake CC=$(tc-getCXX) || die "emake failed"
 }
+
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 	prepgamesdirs