tidy; add use deps; fix some compile warnings

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

4 files changed, 114 insertions, 9 deletions

diff --git a/games-puzzle/trimines/ChangeLog b/games-puzzle/trimines/ChangeLog
index a9f07879d3de..ca83b6359476 100644
--- a/games-puzzle/trimines/ChangeLog
+++ b/games-puzzle/trimines/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/trimines
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/trimines/ChangeLog,v 1.5 2010/10/05 12:39:32 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/trimines/ChangeLog,v 1.6 2010/10/13 22:44:05 mr_bones_ Exp $
+
+  13 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  trimines-1.3.0.ebuild, +files/trimines-1.3.0-gentoo.patch:
+  tidy; add use deps; fix some compile warnings
 
   05 Oct 2010; Tupone Alfredo <tupone@gentoo.org> trimines-1.3.0.ebuild:
   Respect LDFLAGS. Bug #337111 by flameeyes@gentoo.org
diff --git a/games-puzzle/trimines/Manifest b/games-puzzle/trimines/Manifest
index baddd9f162d4..0d6988541bcb 100644
--- a/games-puzzle/trimines/Manifest
+++ b/games-puzzle/trimines/Manifest
@@ -1,4 +1,5 @@
+AUX trimines-1.3.0-gentoo.patch 2619 RMD160 e1de8f05a56156807a78c08e0be7f2da1fdee750 SHA1 a83924acb0d6a96e4e9e83b714f1fd54a7d98212 SHA256 1a946cef939015edc58d64fa2e1792d515dff66ad4e6b7948efffa3f7952ebcf
 DIST trimines-1.3.0.tar.gz 78590 RMD160 6bcf5f8d881139dd1fce44a973d29f950e448527 SHA1 fde5a245d0c222e4a2fd40a34136deae95b2ccf3 SHA256 87e6d48b474cf8097c0fac83f700fc098f8f4e65240ceaf0da81b5e644f7d65a
-EBUILD trimines-1.3.0.ebuild 986 RMD160 1077671ff1226975f9c2c7ffa4c82b71a841237b SHA1 2ed9359e7af3788e91d165b351fbf939071ad5b0 SHA256 3292a49f7196955f08196e26ec313d72cb657a85168a3abcfc4a6b0d86f5d013
-MISC ChangeLog 877 RMD160 04f47d91edf5686d7b770ad644119afaffe4d0fe SHA1 cc6885c6ad047f1660cfdb5ba3fc359b54f7b70e SHA256 f452d44dfde7286e045a9689fe47c68ca36fec445cf6b807628c5bae3eca15fe
+EBUILD trimines-1.3.0.ebuild 868 RMD160 93bffebd5cc4530b3ef55567bec126e69c7e37a0 SHA1 bfc995ddc1254cdd667ea83359373f0d6e9dbdde SHA256 7b4076c38a8f5bb2bad43344a39c6c5b75d96c7b3a1b892a91d54b7fdf5a648d
+MISC ChangeLog 1045 RMD160 21058bd7bbc8f01bc583143ef1e87b45b88f2faa SHA1 c61cdf10b7eb1d5a74332d4cbf120a7cad34a0f7 SHA256 014f57976058903a059fae9c0dc41e9ce6d114f8f8fff773e365abe01ce95eaa
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/trimines/files/trimines-1.3.0-gentoo.patch b/games-puzzle/trimines/files/trimines-1.3.0-gentoo.patch
new file mode 100644
index 000000000000..d7c01e6e0194
--- /dev/null
+++ b/games-puzzle/trimines/files/trimines-1.3.0-gentoo.patch
@@ -0,0 +1,101 @@
+diff -ruN trimines-1.3.0.orig/Makefile trimines-1.3.0/Makefile
+--- trimines-1.3.0.orig/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ trimines-1.3.0/Makefile	2010-10-13 18:01:50.802198348 -0400
+@@ -0,0 +1,2 @@
++trimines:
++	$(CC) $(LDFLAGS) $(CFLAGS) src/main.c -o ./trimines `sdl-config --cflags` `sdl-config --libs`
+diff -ruN trimines-1.3.0.orig/src/boardinit.c trimines-1.3.0/src/boardinit.c
+--- trimines-1.3.0.orig/src/boardinit.c	2006-05-13 15:40:32.000000000 -0400
++++ trimines-1.3.0/src/boardinit.c	2010-10-13 18:00:58.238609895 -0400
+@@ -22,7 +22,7 @@
+ 
+ void genrandmines(int ex, int ey)
+ {
+-int rx,ry,count,z,i,j;
++int rx,ry,count,i,j;
+ 
+ // generate random mines + (ex,ey) will never be a mine
+ 
+diff -ruN trimines-1.3.0.orig/src/gfx.c trimines-1.3.0/src/gfx.c
+--- trimines-1.3.0.orig/src/gfx.c	2006-05-13 15:40:32.000000000 -0400
++++ trimines-1.3.0/src/gfx.c	2010-10-13 18:00:58.238609895 -0400
+@@ -218,7 +218,7 @@
+ 
+ void drawcounter(int n,int posx, int posy)
+ {
+-SDL_Surface *p1, *p2, *p3, *p4;
++SDL_Surface *p2, *p3, *p4;
+ int n1,n2,n3,num;
+ 
+ 
+diff -ruN trimines-1.3.0.orig/src/main.c trimines-1.3.0/src/main.c
+--- trimines-1.3.0.orig/src/main.c	2006-05-13 15:40:32.000000000 -0400
++++ trimines-1.3.0/src/main.c	2010-10-13 18:00:58.239609676 -0400
+@@ -131,14 +131,14 @@
+ int out;
+ int loadimgs = 1;
+ 
+-#include "boardinit.c"
+ #include "counters.c"
++#include "boardinit.c"
+ #include "gfx.c"
+ #include "gamestatus.c"
+ #include "uncover.c"
+ #include "menu.c"
+ 
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+     if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) {
+         fprintf(stderr, "Unable to init SDL: %s\n", SDL_GetError());
+@@ -189,7 +189,7 @@
+ SDL_Event event;
+ 
+ 
+-int x,y,x2,y2,mx,my,i,j;
++int x,y,x2,y2,mx,my;
+ 
+ x2 = -1;
+ 
+@@ -228,6 +228,7 @@
+ 					break;
+ 			case SDLK_F1: if (firstclick == 0 && gamestatus == 0) {solve();}
+ 					break;
++			default:;
+ 			}
+ 			
+ 	break; // end case SDL_KEYDOWN		
+@@ -380,11 +381,13 @@
+ 		break; // end case SDL_MOUSEBUTTONDOWN
+       
+       case SDL_QUIT: SDL_ShowCursor(SDL_ENABLE); main(0,0);
++      		break;
+       
++	default:;
+         } // end switch (event.type)
+   
+   } }// end whiles
+ 
+     atexit(SDL_Quit);
+-
++    exit(0);
+ }
+diff -ruN trimines-1.3.0.orig/src/menu.c trimines-1.3.0/src/menu.c
+--- trimines-1.3.0.orig/src/menu.c	2006-05-13 15:40:32.000000000 -0400
++++ trimines-1.3.0/src/menu.c	2010-10-13 18:00:58.239609676 -0400
+@@ -104,6 +104,7 @@
+ 						if (mode == 6) {if (mines != 1){mines--;}
+ 																												}}}
+ 					break;
++			default:;
+ 			}
+ 
+ 
+@@ -126,6 +127,7 @@
+ 		exit(0);
+ 		break;
+ 		
++	default:;
+ 	}
+ }
+ 
diff --git a/games-puzzle/trimines/trimines-1.3.0.ebuild b/games-puzzle/trimines/trimines-1.3.0.ebuild
index 30a5aecad9f5..d3b5a0355969 100644
--- a/games-puzzle/trimines/trimines-1.3.0.ebuild
+++ b/games-puzzle/trimines/trimines-1.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/trimines/trimines-1.3.0.ebuild,v 1.4 2010/10/05 12:39:32 tupone Exp $
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/trimines/trimines-1.3.0.ebuild,v 1.5 2010/10/13 22:44:05 mr_bones_ Exp $
 
-inherit eutils toolchain-funcs games
+EAPI=2
+inherit eutils games
 
 DESCRIPTION="A mine sweeper game that uses triangles instead of squares"
 HOMEPAGE="http://www.freewebs.com/trimines/"
@@ -14,14 +14,13 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
 
-RDEPEND="media-libs/libsdl"
-DEPEND="${RDEPEND}"
+DEPEND="media-libs/libsdl[video]"
 
 src_prepare() {
 	sed -i \
 		-e "s:data/:${GAMES_DATADIR}/${PN}/:" src/gfx.c \
 		|| die "sed failed"
-	echo "${PN}: ; $(tc-getCC) ${LDFLAGS} ${CFLAGS} src/main.c -o ./${PN} \`sdl-config --cflags\` \`sdl-config --libs\`" > Makefile
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_install() {