old

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

7 files changed, 8 insertions, 253 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 42afb560a938..38db4fc43c62 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,12 @@
 # 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.89 2012/08/08 19:53:17 ranger Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.90 2013/01/20 01:18:42 mr_bones_ Exp $
+
+  20 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -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, -scorched3d-43.2a.ebuild:
+  old
 
   08 Aug 2012; Brent Baude <ranger@gentoo.org> scorched3d-43.3d.ebuild:
   Marking scorched3d-43.3d ppc for bug 424243
@@ -402,4 +408,3 @@
 
   06 Aug 2003; Michael Sterrett <msterret@gentoo.org> scorched3d-35.ebuild:
   initial commit (bug 25846)
-
diff --git a/games-strategy/scorched3d/files/scorched3d-43.2a-fixups.patch b/games-strategy/scorched3d/files/scorched3d-43.2a-fixups.patch
deleted file mode 100644
index d53c3446f604..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-43.2a-fixups.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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)
- AC_MSG_CHECKING(for OpenAL support)
--AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
--if test x$OPENAL_CONFIG = xno; then
--	echo "*** The openal-config script installed by OpenAL could not be found"
--	echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG"
--	echo "*** environment variable to the full path to openal-config."
--
--	AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/])
--else
--
--	if test x"$use_static_openal" = x"yes"; then
--		AL_LIBS="/usr/local/lib/libopenal.a"
--	else
--		AL_LIBS="`$OPENAL_CONFIG --libs`"
--	fi
--	
--	AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
--
--	AC_MSG_RESULT(yes)
--fi
-+AL_LIBS="-lopenal"
-+AL_CFLAGS="-I/usr/include/AL"
-+AC_MSG_RESULT(yes)
- 
- AC_MSG_CHECKING(for Freealut support)
- AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
---- scorched.orig/configure.ac
-+++ scorched/configure.ac
-@@ -13,22 +13,6 @@
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- 
--LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6"
--CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6"
--
--if test `uname` == Darwin; then
--LDFLAGS="$LDFLAGS -lmx"
--CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
--else
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
--CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--fi
--
--AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
--	echo "Warning: No beer found in fridge!";
--	echo "We highly suggest that you rectify this situation immediately."
--])
--
- AC_ARG_ENABLE(serveronly, 
- 	[  --enable-serveronly Enable server only compilation],
- 		    , enable_serveronly=no,
diff --git a/games-strategy/scorched3d/files/scorched3d-43.2a-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-43.2a-gcc43.patch
deleted file mode 100644
index 79f40b70e652..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-43.2a-gcc43.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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.2a-odbc.patch b/games-strategy/scorched3d/files/scorched3d-43.2a-odbc.patch
deleted file mode 100644
index e7f3833bf897..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-43.2a-odbc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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.2a-png15.patch b/games-strategy/scorched3d/files/scorched3d-43.2a-png15.patch
deleted file mode 100644
index d349532a35d8..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-43.2a-png15.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- ./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.2a-win32.patch b/games-strategy/scorched3d/files/scorched3d-43.2a-win32.patch
deleted file mode 100644
index 05f9c806b1c7..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-43.2a-win32.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index 85762b449c9b..000000000000
--- a/games-strategy/scorched3d/scorched3d-43.2a.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.8 2012/05/13 19:32:09 mr_bones_ Exp $
-
-EAPI=2
-WX_GTK_VER=2.8
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="dedicated mysql"
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-net
-	media-libs/libpng
-	virtual/jpeg:0
-	dev-libs/expat
-	!dedicated? (
-		virtual/opengl
-		virtual/glu
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/openal
-		media-libs/freealut
-		x11-libs/wxGTK:2.8[X]
-		media-libs/freetype:2
-		sci-libs/fftw:3.0
-	)
-	mysql? ( virtual/mysql )"
-
-S=${WORKDIR}/scorched
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-*.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--disable-dependency-tracking \
-		--with-fftw=/usr \
-		--with-ogg=/usr \
-		--with-vorbis=/usr \
-		--datadir="${GAMES_DATADIR}/${PN}" \
-		--with-docdir="/usr/share/doc/${PF}" \
-		--with-wx-config="${WX_CONFIG}" \
-		--without-pgsql \
-		$(use_with mysql) \
-		$(use_enable dedicated serveronly)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if ! use dedicated ; then
-		newicon data/images/tank-old.bmp ${PN}.bmp || die
-		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
-	fi
-	prepgamesdirs
-}