EAPI=2; honor LDFLAGS (bug #351309); tidy

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 71 insertions, 41 deletions

diff --git a/games-action/towbowl-tactics/ChangeLog b/games-action/towbowl-tactics/ChangeLog
index 274170223520..784facb49951 100644
--- a/games-action/towbowl-tactics/ChangeLog
+++ b/games-action/towbowl-tactics/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/towbowl-tactics
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/towbowl-tactics/ChangeLog,v 1.7 2008/03/06 03:42:02 wolf31o2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/towbowl-tactics/ChangeLog,v 1.8 2011/01/10 17:43:55 mr_bones_ Exp $
+
+  10 Jan 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  towbowl-tactics-0.5.ebuild, +files/towbowl-tactics-0.5-gentoo.patch:
+  EAPI=2; honor LDFLAGS (bug #351309); tidy
 
   06 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   towbowl-tactics-0.5.ebuild:
diff --git a/games-action/towbowl-tactics/Manifest b/games-action/towbowl-tactics/Manifest
index 3ae96d162724..a7aceb1fc684 100644
--- a/games-action/towbowl-tactics/Manifest
+++ b/games-action/towbowl-tactics/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX towbowl-tactics-0.5-gentoo.patch 1731 RMD160 2dd39356cf39c4fab1aa70f372c4bfd9232c24cf SHA1 020d8b0d1338688cc0bac475cfdaf0a5f8b07a9a SHA256 20b4a372aa98fe6e0838dbe8b516806a6ab02a49567ae50a7fc1fa1c74fcd0ff
 DIST tbt.0.5.src.zip 5321239 RMD160 d2a037785faa09fd959d7cc612fd1bf73192420e SHA1 2e9479283098cb06ca0a1c8b217cdfe862e6ff1f SHA256 a4640db7039d3ffd9e7a136cc81e33e3b090da03bb4daf6a2d908aec0d4b70b2
-EBUILD towbowl-tactics-0.5.ebuild 1539 RMD160 288e0533bf8dfb9531d61dda62e086a89020263f SHA1 5776c6908fe258bfdab851a9e0624797c2ba0316 SHA256 06748c1fd00cbffcc858b929db9a7dab9bbea178ef6b77877edaf0f39ed44cd6
-MISC ChangeLog 976 RMD160 14c59e0b6de52971922301155cde85cd789a8f5e SHA1 6adc773c2227ecc8d29ffc4f18e79ca213b9f14f SHA256 14e8f69357d882e4ce2a89e7125ae84fdc0625edd1bf995633eec1f76f4c6751
+EBUILD towbowl-tactics-0.5.ebuild 1424 RMD160 419e51608c74f4f3b46b9bad42d0691afb194e49 SHA1 3ba4f0e0884c47a570779d32af722eb0039e47ae SHA256 df2fe0db27bc91601b907370810914c831c1534b6507fb1d8dc04262e86cf60b
+MISC ChangeLog 1148 RMD160 ae9fb8a7e9b5b7a2fd94af7f4e7255748c16d908 SHA1 61214b230d24459f833fd9a295a176338cfeb588 SHA256 923ccfe72a56bf54f70b9678ba6faec67665b8fc1f1b5b685c477cbc784d6146
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgsLb0ACgkQdz7hIScOUREbMgCg3tV+DjeFeb26fpZpFko+rmhB
-C44An1klgU44+bHiNO77DjfZEQ1gM+Nj
-=T8+/
------END PGP SIGNATURE-----
diff --git a/games-action/towbowl-tactics/files/towbowl-tactics-0.5-gentoo.patch b/games-action/towbowl-tactics/files/towbowl-tactics-0.5-gentoo.patch
new file mode 100644
index 000000000000..aa6a950e9a07
--- /dev/null
+++ b/games-action/towbowl-tactics/files/towbowl-tactics-0.5-gentoo.patch
@@ -0,0 +1,42 @@
+diff -ru tbt.orig/config.xml tbt/config.xml
+--- tbt.orig/config.xml	2003-02-01 15:14:56.000000000 -0500
++++ tbt/config.xml	2011-01-10 12:08:01.564649048 -0500
+@@ -5,5 +5,5 @@
+ <screen_h>600</screen_h>
+ <sound_enabled>1</sound_enabled>
+ <video_enabled>1</video_enabled>
+-<language>0</language>
++<language>1</language>
+ </config>
+diff -ru tbt.orig/src/Makefile tbt/src/Makefile
+--- tbt.orig/src/Makefile	2003-02-01 15:07:40.000000000 -0500
++++ tbt/src/Makefile	2011-01-10 12:07:29.075274834 -0500
+@@ -1,24 +1,20 @@
+ TBTHOME = /usr/local/games/tbt
+ INCDIR = -I /usr/include/smpeg -I /usr/include/libxml2 -I /usr/include/SDL/ 
+-CFLAGS = -O2 -g -fno-strength-reduce -Wall -W -DTBTHOME=\"$(TBTHOME)\" 
+-LFLAGS = -L. -lm -lSDL -lSDL_net -lSDL_image -lSDL_mixer -ldl -pthread -lxml2 -lsmpeg
+-CC     = g++
++CXXFLAGS += -DTBTHOME=\"$(TBTHOME)\"
++LIBS = -lm -lSDL -lSDL_net -lSDL_image -lSDL_mixer -ldl -pthread -lxml2 -lsmpeg
+ SOURCES = movies.cpp sounds.cpp SFont.cpp Ball.cpp CON_console.cpp CON_consolecommands.cpp CON_internal.cpp Config.cpp Console.cpp DT_drawtext.cpp DialogBox.cpp Dice.cpp Formation.cpp Main.cpp MoviePlayer.cpp NetClient.cpp NetServer.cpp Network.cpp Path.cpp Player.cpp ProgressBar.cpp Public.cpp Screen.cpp Shared.cpp SoundPlayer.cpp Square.cpp State.cpp Team.cpp Transformation.cpp Translator.cpp XmlParser.cpp dir_func.cpp 
+ OBJS = $(patsubst %.c,%.o,$(SOURCES:%.cpp=%.o))
+ PRGM = tbt
+ 
+ .SUFFIXES: .cpp .c
+ 
+-.c.o: 
+-	$(CC) -c $< $(CFLAGS) $(INCDIR) -o $@
+-
+ .cpp.o: 
+-	$(CC) -c $< $(CFLAGS) $(INCDIR) -o $@
++	$(CXX) -c $< $(CXXFLAGS) $(INCDIR) -o $@
+ 
+ all: $(PRGM)
+ 
+ $(PRGM): $(OBJS)
+-	$(CC) $(OBJS) -o $(PRGM) $(LFLAGS)
++	$(CXX) $(OBJS) -o $(PRGM) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+ 	-rm -f $(PRGM) *core *~ *.o
diff --git a/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild b/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
index 43eb672404ba..c899a071c331 100644
--- a/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
+++ b/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild,v 1.10 2008/05/15 12:34:00 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild,v 1.11 2011/01/10 17:43:55 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="Tow Bowl Tactics is a game based on Games Workshop's Blood Bowl"
@@ -15,45 +16,37 @@ IUSE=""
 
 RDEPEND="dev-libs/libxml2
 	media-libs/smpeg
+	media-libs/libsdl[audio,video]
 	media-libs/sdl-net
-	media-libs/sdl-image
+	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-S="${WORKDIR}/tbt/src"
-
-src_unpack() {
-	local f
-
-	unpack ${A}
-	cd "${S}"
+S=${WORKDIR}/tbt/src
 
+src_prepare() {
+	cd  ..
+	edos2unix $(find src -type f) config.xml
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 	sed -i \
-		-e "s/<language>0/<language>1/g" ../config.xml \
-			|| die "sed config.xml failed"
+	    -e "/^TBTHOME/ s:/.*:${GAMES_DATADIR}/tbt:" \
+		src/Makefile || die
 	sed -i \
-		-e "/^CFLAGS/ s:-O2 -g -fno-strength-reduce -Wall -W:${CFLAGS}:" \
-	    -e "/^TBTHOME/ s:/.*:${GAMES_DATADIR}/tbt:" Makefile \
-			|| die "sed Makefile failed"
-	sed -i \
-		-e "/tbt.ico/ s:\"\./:TBTHOME \"/:" Main.cpp \
-			|| die "sed Main.cpp failed"
+		-e "/tbt.ico/ s:\"\./:TBTHOME \"/:" \
+		src/Main.cpp || die
 	sed -i \
 		-e "s:TBTHOME \"/config.xml:\"${GAMES_SYSCONFDIR}/tbt/config.xml:g" \
-			global.h || die "sed global,h failed"
-
-	for f in $(find "${S}" -type f)
-	do
-		edos2unix ${f}
-	done
+		src/global.h || die
 }
 
 src_install() {
-	dogamesbin tbt || die "dogamesbin failed"
+	dogamesbin tbt || die
 	dodir "${GAMES_DATADIR}/tbt"
-	cp -r ../data ../tbt.ico "${D}${GAMES_DATADIR}/tbt" || die "cp failed"
+	cp -r ../data ../tbt.ico "${D}${GAMES_DATADIR}/tbt" || die
 	insinto "${GAMES_SYSCONFDIR}/tbt"
-	doins ../config.xml || die "doins failed"
+	doins ../config.xml || die
+	newicon ../data/images/panel/turn.png ${PN}.png || die
+	make_desktop_entry tbt "Tow Bowl Tactics" || die
 	prepgamesdirs
 }