tidy

(Portage version: 2.1.10.49/cvs/Linux x86_64)

13 files changed, 169 insertions, 40 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index da93b7e1ac14..c17bef140518 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-strategy/scorched3d
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.83 2012/05/12 14:41:22 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.84 2012/05/13 19:32:09 mr_bones_ Exp $
+
+  13 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/scorched3d-43.3d-gcc43.patch, +files/scorched3d-43.3d-odbc.patch,
+  +files/scorched3d-43.3d-png15.patch, +files/scorched3d-43.3d-win32.patch,
+  files/scorched3d-43.2a-fixups.patch, files/scorched3d-43.2a-gcc43.patch,
+  files/scorched3d-43.2a-odbc.patch, files/scorched3d-43.2a-png15.patch,
+  files/scorched3d-43.2a-win32.patch, files/scorched3d-43.3d-fixups.patch,
+  scorched3d-43.2a.ebuild, scorched3d-43.3d.ebuild:
+  tidy
 
 *scorched3d-43.3d (12 May 2012)
 
diff --git a/games-strategy/scorched3d/files/scorched3d-43.2a-fixups.patch b/games-strategy/scorched3d/files/scorched3d-43.2a-fixups.patch
index 36a027cb60cc..d53c3446f604 100644
--- a/games-strategy/scorched3d/files/scorched3d-43.2a-fixups.patch
+++ b/games-strategy/scorched3d/files/scorched3d-43.2a-fixups.patch
@@ -1,6 +1,5 @@
-diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4
---- scorched.orig/configure-al.m4	2008-03-03 16:17:18.000000000 -0500
-+++ scorched/configure-al.m4	2009-02-15 20:43:35.000000000 -0500
+--- scorched.orig/configure-al.m4
++++ scorched/configure-al.m4
 @@ -7,25 +7,9 @@
  	[  --disable-openaltest    Do not try to compile and run a test OpenAL program],
  		    , enable_openaltest=yes)
@@ -30,9 +29,8 @@ diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4
  
  AC_MSG_CHECKING(for Freealut support)
  AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
-diff -ru scorched.orig/configure.ac scorched/configure.ac
---- scorched.orig/configure.ac	2008-03-03 16:17:18.000000000 -0500
-+++ scorched/configure.ac	2009-02-15 20:40:30.000000000 -0500
+--- scorched.orig/configure.ac
++++ scorched/configure.ac
 @@ -13,22 +13,6 @@
  AC_PROG_INSTALL
  AC_PROG_RANLIB
diff --git a/games-strategy/scorched3d/files/scorched3d-43.2a-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-43.2a-gcc43.patch
index b235f07c585f..79f40b70e652 100644
--- a/games-strategy/scorched3d/files/scorched3d-43.2a-gcc43.patch
+++ b/games-strategy/scorched3d/files/scorched3d-43.2a-gcc43.patch
@@ -1,6 +1,5 @@
-diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h
---- scorched.old/src/common/common/main.h	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/common/main.h	2009-02-18 20:07:18.000000000 +0200
+--- scorched.old/src/common/common/main.h
++++ scorched/src/common/common/main.h
 @@ -40,7 +40,7 @@
  void _no_storage()

  {

@@ -10,9 +9,8 @@ diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h
  }

  

  void run_main(int argc, char *argv[], OptionsParameters &params)

-diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h
---- scorched.old/src/common/porting/windows.h	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/porting/windows.h	2009-02-18 20:06:46.000000000 +0200
+--- scorched.old/src/common/porting/windows.h
++++ scorched/src/common/porting/windows.h
 @@ -20,7 +20,7 @@
  typedef unsigned short  WORD;

  typedef unsigned char   BYTE;

diff --git a/games-strategy/scorched3d/files/scorched3d-43.2a-odbc.patch b/games-strategy/scorched3d/files/scorched3d-43.2a-odbc.patch
index 355755e7cdb0..e7f3833bf897 100644
--- a/games-strategy/scorched3d/files/scorched3d-43.2a-odbc.patch
+++ b/games-strategy/scorched3d/files/scorched3d-43.2a-odbc.patch
@@ -1,9 +1,8 @@
 When x11-libs/wxGTK is built with the odbc use flag, scorched3d fails to build.
 bug #285384 - patch from Bob Johnson
 
-diff -urN scorched/src/common/porting/windows.h fix_scorched/src/common/porting/windows.h
---- scorched/src/common/porting/windows.h	2009-09-21 10:21:16.000000000 -0700
-+++ fix_scorched/src/common/porting/windows.h	2009-09-21 10:39:02.000000000 -0700
+--- scorched/src/common/porting/windows.h
++++ fix_scorched/src/common/porting/windows.h
 @@ -11,8 +11,8 @@
  

  typedef char * 		LPSTR;

diff --git a/games-strategy/scorched3d/files/scorched3d-43.2a-png15.patch b/games-strategy/scorched3d/files/scorched3d-43.2a-png15.patch
index 4e8f003b8dde..d349532a35d8 100644
--- a/games-strategy/scorched3d/files/scorched3d-43.2a-png15.patch
+++ b/games-strategy/scorched3d/files/scorched3d-43.2a-png15.patch
@@ -1,5 +1,5 @@
---- ./src/common/image/ImagePngFactory.cpp.old	2011-09-12 12:34:30.114461019 +0200
-+++ ./src/common/image/ImagePngFactory.cpp	2011-09-12 12:39:28.566425593 +0200
+--- ./src/common/image/ImagePngFactory.cpp.old
++++ ./src/common/image/ImagePngFactory.cpp
 @@ -104,7 +104,7 @@
  

  static void user_png_error(png_structp png_ptr, png_const_charp msg) 

@@ -9,8 +9,8 @@
  }

  

  static void user_png_warning(png_structp png_ptr, png_const_charp msg) 

---- ./src/client/client/LoadPNG.cpp.old	2011-09-12 12:45:49.167380419 +0200
-+++ ./src/client/client/LoadPNG.cpp	2011-09-12 14:11:14.961772024 +0200
+--- ./src/client/client/LoadPNG.cpp.old
++++ ./src/client/client/LoadPNG.cpp
 @@ -28,6 +28,8 @@
  	int row, i;
  	volatile int ckey = -1;
diff --git a/games-strategy/scorched3d/files/scorched3d-43.2a-win32.patch b/games-strategy/scorched3d/files/scorched3d-43.2a-win32.patch
index 8b63d509147c..05f9c806b1c7 100644
--- a/games-strategy/scorched3d/files/scorched3d-43.2a-win32.patch
+++ b/games-strategy/scorched3d/files/scorched3d-43.2a-win32.patch
@@ -1,6 +1,5 @@
-diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h
---- scorched.old/src/common/porting/windows.h	2009-12-17 15:18:41.000000000 +0200
-+++ scorched/src/common/porting/windows.h	2009-12-17 15:22:20.000000000 +0200
+--- scorched.old/src/common/porting/windows.h
++++ scorched/src/common/porting/windows.h
 @@ -9,6 +9,7 @@
  #include <ctype.h>

  #include <common/Defines.h>

diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch
index c054829546e6..f7a835fd8df2 100644
--- a/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch
+++ b/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch
@@ -1,6 +1,5 @@
-diff -ru scorched.orig/configure.ac scorched/configure.ac
---- scorched.orig/configure.ac	2008-03-03 16:17:18.000000000 -0500
-+++ scorched/configure.ac	2009-02-15 20:40:30.000000000 -0500
+--- scorched.orig/configure.ac
++++ scorched/configure.ac
 @@ -13,22 +13,6 @@
  AC_PROG_INSTALL
  AC_PROG_RANLIB
diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-gcc43.patch
new file mode 100644
index 000000000000..79f40b70e652
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-43.3d-gcc43.patch
@@ -0,0 +1,22 @@
+--- scorched.old/src/common/common/main.h
++++ scorched/src/common/common/main.h
+@@ -40,7 +40,7 @@
+ void _no_storage()

+ {

+ 	printf("Failed to allocate memory!!");

+-	std::exit(1);

++	exit(1);

+ }

+ 

+ void run_main(int argc, char *argv[], OptionsParameters &params)

+--- scorched.old/src/common/porting/windows.h
++++ scorched/src/common/porting/windows.h
+@@ -20,7 +20,7 @@
+ typedef unsigned short  WORD;

+ typedef unsigned char   BYTE;

+ 

+-typedef int 	HWND;

++// typedef int 	HWND;

+ typedef void * 	HINSTANCE;

+ typedef int 	WPARAM;

+ typedef int 	LPARAM;

diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-odbc.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-odbc.patch
new file mode 100644
index 000000000000..e7f3833bf897
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-43.3d-odbc.patch
@@ -0,0 +1,16 @@
+When x11-libs/wxGTK is built with the odbc use flag, scorched3d fails to build.
+bug #285384 - patch from Bob Johnson
+
+--- scorched/src/common/porting/windows.h
++++ fix_scorched/src/common/porting/windows.h
+@@ -11,8 +11,8 @@
+ 

+ typedef char * 		LPSTR;

+ typedef const char *	LPCTSTR;

+-typedef unsigned int 	DWORD;

+-typedef unsigned int *  LPDWORD;

++typedef unsigned long 	DWORD;

++typedef DWORD *         LPDWORD;

+ typedef unsigned char * LPBYTE;

+ typedef int 		INT;

+ typedef long         	LONG;

diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-png15.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-png15.patch
new file mode 100644
index 000000000000..d349532a35d8
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-43.3d-png15.patch
@@ -0,0 +1,74 @@
+--- ./src/common/image/ImagePngFactory.cpp.old
++++ ./src/common/image/ImagePngFactory.cpp
+@@ -104,7 +104,7 @@
+ 

+ static void user_png_error(png_structp png_ptr, png_const_charp msg) 

+ {

+-	longjmp(png_ptr->jmpbuf,1);

++	longjmp(png_jmpbuf(png_ptr),1);

+ }

+ 

+ static void user_png_warning(png_structp png_ptr, png_const_charp msg) 

+--- ./src/client/client/LoadPNG.cpp.old
++++ ./src/client/client/LoadPNG.cpp
+@@ -28,6 +28,8 @@
+ 	int row, i;
+ 	volatile int ckey = -1;
+ 	png_color_16 *transv;
++	png_colorp  png_palette;
++	int         num_palette;
+ 
+ 	if ( !src ) {
+ 		/* The error message has been set in SDL_RWFromFile */
+@@ -58,7 +60,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in png_create_read_struct() earlier.
+ 	 */
+-	if ( setjmp(png_ptr->jmpbuf) ) {
++	if ( setjmp(png_jmpbuf(png_ptr)) ) {
+ 		error = "Error reading the PNG file.";
+ 		goto done;
+ 	}
+@@ -127,9 +129,9 @@
+ 			Rmask = 0x000000FF;
+ 			Gmask = 0x0000FF00;
+ 			Bmask = 0x00FF0000;
+-			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
+ 		} else {
+-		        int s = (info_ptr->channels == 4) ? 0 : 8;
++		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+ 			Rmask = 0xFF000000 >> s;
+ 			Gmask = 0x00FF0000 >> s;
+ 			Bmask = 0x0000FF00 >> s;
+@@ -137,7 +139,7 @@
+ 		}
+ 	}
+ 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+-			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
++			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
+ 	if ( surface == NULL ) {
+ 		error = "Out of memory";
+ 		goto done;
+@@ -185,12 +187,15 @@
+ 		    palette->colors[i].g = i;
+ 		    palette->colors[i].b = i;
+ 		}
+-	    } else if (info_ptr->num_palette > 0 ) {
+-		palette->ncolors = info_ptr->num_palette; 
+-		for( i=0; i<info_ptr->num_palette; ++i ) {
+-		    palette->colors[i].b = info_ptr->palette[i].blue;
+-		    palette->colors[i].g = info_ptr->palette[i].green;
+-		    palette->colors[i].r = info_ptr->palette[i].red;
++	    } else {
++	    	png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
++	    	if (num_palette > 0 ) {
++			palette->ncolors = num_palette; 
++			for( i=0; i<num_palette; ++i ) {
++			    palette->colors[i].b = png_palette[i].blue;
++			    palette->colors[i].g = png_palette[i].green;
++			    palette->colors[i].r = png_palette[i].red;
++			}
+ 		}
+ 	    }
+ 	}
diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-win32.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-win32.patch
new file mode 100644
index 000000000000..05f9c806b1c7
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-43.3d-win32.patch
@@ -0,0 +1,18 @@
+--- scorched.old/src/common/porting/windows.h
++++ scorched/src/common/porting/windows.h
+@@ -9,6 +9,7 @@
+ #include <ctype.h>

+ #include <common/Defines.h>

+ 

++#ifdef _WIN32

+ typedef char * 		LPSTR;

+ typedef const char *	LPCTSTR;

+ typedef unsigned int 	DWORD;

+@@ -27,6 +28,7 @@
+ typedef int 	LRESULT;

+ typedef void *	HDC;

+ typedef void *  HGLRC;

++#endif  /* _WIN32 */

+ 

+ #define _strnicmp(a,b,c)	strncasecmp(a,b,c)

+ #define stricmp(a,b)		strcasecmp(a,b)

diff --git a/games-strategy/scorched3d/scorched3d-43.2a.ebuild b/games-strategy/scorched3d/scorched3d-43.2a.ebuild
index 4c45dc40d9d8..85762b449c9b 100644
--- a/games-strategy/scorched3d/scorched3d-43.2a.ebuild
+++ b/games-strategy/scorched3d/scorched3d-43.2a.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-strategy/scorched3d/scorched3d-43.2a.ebuild,v 1.7 2012/05/12 14:41:22 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.2a.ebuild,v 1.8 2012/05/13 19:32:09 mr_bones_ Exp $
 
 EAPI=2
 WX_GTK_VER=2.8
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="dedicated mysql"
 
-RDEPEND="media-libs/libsdl[video]
+DEPEND="media-libs/libsdl[video]
 	media-libs/sdl-net
 	media-libs/libpng
 	virtual/jpeg:0
@@ -33,8 +33,6 @@ RDEPEND="media-libs/libsdl[video]
 	)
 	mysql? ( virtual/mysql )"
 
-DEPEND="$RDEPEND"
-
 S=${WORKDIR}/scorched
 
 src_prepare() {
diff --git a/games-strategy/scorched3d/scorched3d-43.3d.ebuild b/games-strategy/scorched3d/scorched3d-43.3d.ebuild
index c24f2d8fdc65..66a393ebca90 100644
--- a/games-strategy/scorched3d/scorched3d-43.3d.ebuild
+++ b/games-strategy/scorched3d/scorched3d-43.3d.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-strategy/scorched3d/scorched3d-43.3d.ebuild,v 1.1 2012/05/12 14:41:22 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.3d.ebuild,v 1.2 2012/05/13 19:32:09 mr_bones_ Exp $
 
 EAPI=2
 WX_GTK_VER=2.8
@@ -8,14 +8,14 @@ inherit autotools eutils wxwidgets games
 
 DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
 HOMEPAGE="http://www.scorched3d.co.uk/"
-SRC_URI="mirror://sourceforge/${PN}/Scorched3D-${PV}-src.tar.gz"
+SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="dedicated mysql"
 
-RDEPEND="media-libs/libsdl[video]
+DEPEND="media-libs/libsdl[video]
 	media-libs/sdl-net
 	media-libs/libpng
 	virtual/jpeg:0
@@ -33,16 +33,15 @@ RDEPEND="media-libs/libsdl[video]
 	)
 	mysql? ( virtual/mysql )"
 
-DEPEND="$RDEPEND"
-
 S=${WORKDIR}/scorched
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fixups.patch
-	epatch "${FILESDIR}"/${PN}-43.2a-gcc43.patch
-	epatch "${FILESDIR}"/${PN}-43.2a-odbc.patch
-	epatch "${FILESDIR}"/${PN}-43.2a-png15.patch
-	epatch "${FILESDIR}"/${PN}-43.2a-win32.patch
+	epatch \
+		"${FILESDIR}"/${P}-fixups.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-odbc.patch \
+		"${FILESDIR}"/${P}-png15.patch \
+		"${FILESDIR}"/${P}-win32.patch
 	eautoreconf
 }