old
authorMichael Sterrett <mr_bones_@gentoo.org>
Fri, 7 May 2010 21:17:18 +0000 (21:17 +0000)
committerMichael Sterrett <mr_bones_@gentoo.org>
Fri, 7 May 2010 21:17:18 +0000 (21:17 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux i686

games-strategy/scorched3d/Manifest
games-strategy/scorched3d/files/scorched3d-43.1b-fixups.patch [deleted file]
games-strategy/scorched3d/files/scorched3d-43.1b-gcc43.patch [deleted file]
games-strategy/scorched3d/files/scorched3d-43.1b-libpng14.patch [deleted file]
games-strategy/scorched3d/files/scorched3d-43.1b-odbc.patch [deleted file]
games-strategy/scorched3d/files/scorched3d-43.1b-win32.patch [deleted file]
games-strategy/scorched3d/scorched3d-43.1b.ebuild [deleted file]

index 119cf013c87dec28df096456a6909b71ba3bad1b..1f591cea24b770836c25285279561982dcb2c6ad 100644 (file)
@@ -3,21 +3,14 @@ AUX scorched3d-42.1-gcc43.patch 875 RMD160 b52c37c3210c5ea0629f5f00283a4a63fa5c3
 AUX scorched3d-42.1-libpng14.patch 1381 RMD160 3f167ed7f5438f86cd338247e445fcb52e86542e SHA1 00bf971ef71f082cff58462b8d0a71a533f9068a SHA256 7b259663f640c19189cc5b845bb4cf27389cc56cb1c9f55300e14ff3738e1846
 AUX scorched3d-42.1-odbc.patch 665 RMD160 00d9966808a9b61a45223cce0ba50116774f243e SHA1 71b0f9308e743dd1630977467c12b3caf89bb446 SHA256 27e8af602e38579f87b83bc67afc7c3fde012e058f73dab7b5e63f22752bb1be
 AUX scorched3d-42.1-win32.patch 625 RMD160 6170762627bb1094479eece1e07591e6e9703abf SHA1 9622d3d756999780da4385bd48a2cd12290d7aab SHA256 50c8cadae0476071f580983f8287e95ac15c45e865e4837b567493a97fcd4c5f
-AUX scorched3d-43.1b-fixups.patch 1967 RMD160 d06d0c20c5e65907a680ba39ebbbc57ee14a25cb SHA1 d13d821bca8c342bf04d5de0f5925649890c18c4 SHA256 7487d6708bfe250925cd7b425e200e5f566920c4fbb0376e3a5922bd60828934
-AUX scorched3d-43.1b-gcc43.patch 875 RMD160 b52c37c3210c5ea0629f5f00283a4a63fa5c3561 SHA1 6be351b7b56206d8540c0938e06759cc6ee0c0e2 SHA256 f139415a4deca70dc0ad087ce6714359d4076df89228e7ea1e61aa100e0558c8
-AUX scorched3d-43.1b-libpng14.patch 1381 RMD160 3f167ed7f5438f86cd338247e445fcb52e86542e SHA1 00bf971ef71f082cff58462b8d0a71a533f9068a SHA256 7b259663f640c19189cc5b845bb4cf27389cc56cb1c9f55300e14ff3738e1846
-AUX scorched3d-43.1b-odbc.patch 665 RMD160 00d9966808a9b61a45223cce0ba50116774f243e SHA1 71b0f9308e743dd1630977467c12b3caf89bb446 SHA256 27e8af602e38579f87b83bc67afc7c3fde012e058f73dab7b5e63f22752bb1be
-AUX scorched3d-43.1b-win32.patch 625 RMD160 6170762627bb1094479eece1e07591e6e9703abf SHA1 9622d3d756999780da4385bd48a2cd12290d7aab SHA256 50c8cadae0476071f580983f8287e95ac15c45e865e4837b567493a97fcd4c5f
 AUX scorched3d-43.1c-fixups.patch 1967 RMD160 d06d0c20c5e65907a680ba39ebbbc57ee14a25cb SHA1 d13d821bca8c342bf04d5de0f5925649890c18c4 SHA256 7487d6708bfe250925cd7b425e200e5f566920c4fbb0376e3a5922bd60828934
 AUX scorched3d-43.1c-gcc43.patch 875 RMD160 b52c37c3210c5ea0629f5f00283a4a63fa5c3561 SHA1 6be351b7b56206d8540c0938e06759cc6ee0c0e2 SHA256 f139415a4deca70dc0ad087ce6714359d4076df89228e7ea1e61aa100e0558c8
 AUX scorched3d-43.1c-libpng14.patch 1381 RMD160 3f167ed7f5438f86cd338247e445fcb52e86542e SHA1 00bf971ef71f082cff58462b8d0a71a533f9068a SHA256 7b259663f640c19189cc5b845bb4cf27389cc56cb1c9f55300e14ff3738e1846
 AUX scorched3d-43.1c-odbc.patch 665 RMD160 00d9966808a9b61a45223cce0ba50116774f243e SHA1 71b0f9308e743dd1630977467c12b3caf89bb446 SHA256 27e8af602e38579f87b83bc67afc7c3fde012e058f73dab7b5e63f22752bb1be
 AUX scorched3d-43.1c-win32.patch 625 RMD160 6170762627bb1094479eece1e07591e6e9703abf SHA1 9622d3d756999780da4385bd48a2cd12290d7aab SHA256 50c8cadae0476071f580983f8287e95ac15c45e865e4837b567493a97fcd4c5f
 DIST Scorched3D-42.1-src.tar.gz 64491145 RMD160 ed8a621875d19eb4d7314293439f4c2a0b5a5276 SHA1 041e3b3dd47a7881738eb5d66885d7f339eb01ce SHA256 884eccfed5fda58c140c4a593806c0c366a695660c47cdd4ea8d96189189106e
-DIST Scorched3D-43.1b-src.tar.gz 64682530 RMD160 979323cea64fc64cd1bbacbf09c44ab8b4ad027e SHA1 4a5efb5d995d792eae6c56ef63e6f57e37a0e43b SHA256 4134555aeda5bc61b3fd9248ba3566e1cdc0b4b40f3d1720296ca06145f989df
 DIST Scorched3D-43.1c-src.tar.gz 64826904 RMD160 bc811571d983b3cdf9c5adb97b54b85f409073fe SHA1 5ba8dd0af0f167c08d24206e534c5574b0eb2c4a SHA256 ad5ce91e404f5a0286482feeca4aa5b175fb51a9d1f15a26bd3779b2059285bb
 EBUILD scorched3d-42.1.ebuild 1523 RMD160 dfd44428061a03bea6ce65443d8b09917d572fc8 SHA1 dbaec2007aa3f673ee9f407697ce46b10070dd48 SHA256 391ae1dd9998a3e24a8fd31cc40463099ae27d570cf3c7b8609b968a49c944e8
-EBUILD scorched3d-43.1b.ebuild 1533 RMD160 c80f7c7e881a091881f5c46a5f0812ebc3820909 SHA1 521561fb371721a3fd82f39c31a8dc61d0849cb9 SHA256 a8b38f2f43a550341bf7e91c234ff43c522076d98341cc2ccafc5e476334b1f9
 EBUILD scorched3d-43.1c.ebuild 1533 RMD160 5f477f212882cd2af546ade72f73dc527d4176b0 SHA1 8d9ed04fa0ff40c063ef677b06c7b53a34e22b30 SHA256 4b380f20114c21e0aaa1cd82df87eec17d0908684b867450488accf2815a00b4
 MISC ChangeLog 11154 RMD160 e1187ce97f07eadbab16fdbf28a6bb238aa62891 SHA1 63debe50e297ae5afc68cd64275f89ea25092168 SHA256 0b238d87a77f78a12d1865d6a1d709a97d05875846b12b744ae419f8a64de5ae
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/scorched3d/files/scorched3d-43.1b-fixups.patch b/games-strategy/scorched3d/files/scorched3d-43.1b-fixups.patch
deleted file mode 100644 (file)
index 36a027c..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-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
-@@ -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)
-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
-@@ -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.1b-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-43.1b-gcc43.patch
deleted file mode 100644 (file)
index b235f07..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-@@ -40,7 +40,7 @@
- void _no_storage()\r
- {\r
-       printf("Failed to allocate memory!!");\r
--      std::exit(1);\r
-+      exit(1);\r
- }\r
- \r
- void run_main(int argc, char *argv[], OptionsParameters &params)\r
-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
-@@ -20,7 +20,7 @@
- typedef unsigned short  WORD;\r
- typedef unsigned char   BYTE;\r
- \r
--typedef int   HWND;\r
-+// typedef int        HWND;\r
- typedef void *        HINSTANCE;\r
- typedef int   WPARAM;\r
- typedef int   LPARAM;\r
diff --git a/games-strategy/scorched3d/files/scorched3d-43.1b-libpng14.patch b/games-strategy/scorched3d/files/scorched3d-43.1b-libpng14.patch
deleted file mode 100644 (file)
index d61a2b6..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=308867
-
---- src/common/image/ImagePng.cpp
-+++ src/common/image/ImagePng.cpp
-@@ -189,7 +189,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
-       info_ptr = png_create_info_struct(png_ptr);\r
-       if (info_ptr == NULL)\r
-       {\r
--        png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);\r
-+        png_destroy_read_struct(&png_ptr, NULL, NULL);\r
-         return false;\r
-       }\r
- \r
-@@ -200,7 +200,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
-       if (setjmp(png_jmpbuf(png_ptr)))\r
-       {\r
-         /* Free all of the memory associated with the png_ptr and info_ptr */\r
--        png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);\r
-+        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);\r
-         /* If we get here, we had a problem reading the file */\r
-         return false;\r
-       }\r
-@@ -258,7 +258,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
-       }\r
-       else\r
-       {\r
--              png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);\r
-+              png_destroy_read_struct(&png_ptr, &info_ptr, NULL);\r
- \r
-               Logger::log(S3D::formatStringBuffer(\r
-                       "Invalid PNG format.\n"\r
-@@ -272,7 +272,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
-       // END NEW CODE\r
- \r
-       /* clean up after the read, and free any memory allocated - REQUIRED */\r
--      png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);\r
-+      png_destroy_read_struct(&png_ptr, &info_ptr, NULL);\r
- \r
-       /* that's it */\r
-       return true;\r
diff --git a/games-strategy/scorched3d/files/scorched3d-43.1b-odbc.patch b/games-strategy/scorched3d/files/scorched3d-43.1b-odbc.patch
deleted file mode 100644 (file)
index 355755e..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-@@ -11,8 +11,8 @@
- \r
- typedef char *                LPSTR;\r
- typedef const char *  LPCTSTR;\r
--typedef unsigned int  DWORD;\r
--typedef unsigned int *  LPDWORD;\r
-+typedef unsigned long         DWORD;\r
-+typedef DWORD *         LPDWORD;\r
- typedef unsigned char * LPBYTE;\r
- typedef int           INT;\r
- typedef long          LONG;\r
diff --git a/games-strategy/scorched3d/files/scorched3d-43.1b-win32.patch b/games-strategy/scorched3d/files/scorched3d-43.1b-win32.patch
deleted file mode 100644 (file)
index 8b63d50..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-@@ -9,6 +9,7 @@
- #include <ctype.h>\r
- #include <common/Defines.h>\r
- \r
-+#ifdef _WIN32\r
- typedef char *                LPSTR;\r
- typedef const char *  LPCTSTR;\r
- typedef unsigned int  DWORD;\r
-@@ -27,6 +28,7 @@
- typedef int   LRESULT;\r
- typedef void *        HDC;\r
- typedef void *  HGLRC;\r
-+#endif  /* _WIN32 */\r
- \r
- #define _strnicmp(a,b,c)      strncasecmp(a,b,c)\r
- #define stricmp(a,b)          strcasecmp(a,b)\r
diff --git a/games-strategy/scorched3d/scorched3d-43.1b.ebuild b/games-strategy/scorched3d/scorched3d-43.1b.ebuild
deleted file mode 100644 (file)
index 055e574..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.1b.ebuild,v 1.1 2010/04/07 20:07:45 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
-       media-libs/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.bmp ${PN}.bmp
-               make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
-       fi
-       prepgamesdirs
-}