version bump

Package-Manager: portage-2.2.14/cvs/Linux x86_64

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index f47c0ffa17489159d285edbd8abef5562b3115b5..1aa649d592cd288d861d6ce243b882ded257d4a5 100644 (file)
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-strategy/scorched3d
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.92 2014/12/04 07:27:06 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.93 2014/12/09 22:08:49 mr_bones_ Exp $
+
+*scorched3d-44 (09 Dec 2014)
+
+  09 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/scorched3d-44-fixups.patch, +files/scorched3d-44-freetype.patch,
+  +files/scorched3d-44-gcc43.patch, +files/scorched3d-44-jpeg9.patch,
+  +files/scorched3d-44-odbc.patch, +files/scorched3d-44-win32.patch,
+  +scorched3d-44.ebuild:
+  version bump
 
   04 Dec 2014; Alfredo Tupone <tupone@gentoo.org> scorched3d-43.3d.ebuild,
   +files/scorched3d-43.3d-jpeg9.patch:

diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index d163841751cd489a6291310df1e0437d243a7705..45ccb30f121f7d65cbbf541c102b8323e4a65894 100644 (file)
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX scorched3d-43.3d-fixups.patch 698 SHA256 bbcfb87334913ff96db76aded98665203ddb44903c2846e03fbe2fed0b2b2429 SHA512 70a324e197d02ec385cdc399be9b39a202930507f4efeb913330cdbf1caaa8fbfe8e408b07f8fafb67e6418d53190e53c045ab24859449629ea8ed86474910ee WHIRLPOOL 84a362998bc35df1c4450cdcd86ea5f468b5645690f6a171c1c96a25f2cf81d8816e77bf269b04530dd8084e6930286772a8f266d495c338cc3007f677a969c0
 AUX scorched3d-43.3d-freetype.patch 1375 SHA256 8cc61f9065b9472e201fe1f565226663e5431e1b874f3618da7cc5f9b1bca817 SHA512 2bed88489bef318b6003384de678c633ea5df97087c2d71e3c10fde13330282a810c26c7d69d705a71a56a65b65f3660664c9feb0a628370f87025b4b2321074 WHIRLPOOL 531314a2b34bf14d95b58ed5b03f02f5920fd663dc5ab2624aa7686cfbf47f9dc72dc5b6740c4e85349c84860785969afa66d208693e456781ffecf382ea8f56
 AUX scorched3d-43.3d-gcc43.patch 561 SHA256 7ee76b89705292ecd2ef55e416dd58a64d3bc5310bc369a26b5eb0ce469ba59e SHA512 c00bfcf2feb7d740e4fc4337a5577962a198d56296bae68a96902046f78fd29856d83b57f309ea9c61d36d4a767e76ae101639a8ed786c5451b440b5a0d908c1 WHIRLPOOL 5a5b045001e21410e66b026896d990013f22507ebe15637f1139016f8d0d61de3fc08773706ab4eb942fb6e4b7ce6fa2baede0d4c2c688a05f338da6e7db614d
@@ -9,14 +6,15 @@ AUX scorched3d-43.3d-jpeg9.patch 610 SHA256 66b3bc4a22dbc54df011d26e4aa416249f51
 AUX scorched3d-43.3d-odbc.patch 503 SHA256 56d5fa2e0b59e19b74248c3a0a081e7139476305dfbfc5c905abaa1de3681d15 SHA512 8bf3e3f9a91502a7c84be73a73e0909c09b050266fb2c6847be2cca13b1a368697dd70c373b6bbce4b12ba97241b2d577cce3604640b4182b2be223d009a4f6e WHIRLPOOL b4ee72c4b69f08f7342bac21382ef279ec54a2c06c6026889c0ba611d05e4ffbd4b4ebf601f1dbba7e72aef0bb8b0f5f48c133e18402e3b345b2b72338a441ef
 AUX scorched3d-43.3d-png15.patch 2438 SHA256 104fec74e6617581444b73f4076e288773d7d7bf469221d0cf51dae09a61f53f SHA512 eea949c649c6067f6d6856fd3b5976d375327adca1e7c5771bad1c82fb562c8e9627d0ed2052604f5f33982e4e82303329163b5da74a7b8c0459435037199b8f WHIRLPOOL bd87f05f19babb2d37dea6a0ef1309c15acb006bdd8a0bf56e1ab3afe32b541f65eb38111c22214911649587c3b926ab0d69a5a4483adf27c4a03cdda119ed65
 AUX scorched3d-43.3d-win32.patch 464 SHA256 325ec09315a102ebb2290007c28fe263771991a5c82908a0ef084f1f6f209b1f SHA512 992224f65f80527276c0b6e139ea44c6c29a2fbfa3a0af78e2f2366897dbd51e9988b065aa21ac95cf9b1a0efc8866e2e45646e1851f8afd195651b3c47a81dd WHIRLPOOL 888a17bba56ea17bf6961a79e6a8ad81a70baece753ff05be0549312bef712b1f743db249f3a287992586be215afe82522fdf3f757bf49c0ea6b6065767f3d57
+AUX scorched3d-44-fixups.patch 717 SHA256 5eb531b97c2520fb3dcd1bbec0ad684228c0d4183a9fd3641629846351f02875 SHA512 8045df51e6a09d9101d971056edc77e03694b2872819cd892d1239c04ad5c59afa8a60adc2ca04a63a5d501bbb113221408522a33159eee836e600bb2b8d40c7 WHIRLPOOL 50aa87c84e1a70fb59ef81da9c952d9b8abb05e9b9e7b5af528a560108d8c94e37aec35764302382b411e403e0402acf4c8efb096c8c39bcebaea0ad9516d258
+AUX scorched3d-44-freetype.patch 1375 SHA256 8cc61f9065b9472e201fe1f565226663e5431e1b874f3618da7cc5f9b1bca817 SHA512 2bed88489bef318b6003384de678c633ea5df97087c2d71e3c10fde13330282a810c26c7d69d705a71a56a65b65f3660664c9feb0a628370f87025b4b2321074 WHIRLPOOL 531314a2b34bf14d95b58ed5b03f02f5920fd663dc5ab2624aa7686cfbf47f9dc72dc5b6740c4e85349c84860785969afa66d208693e456781ffecf382ea8f56
+AUX scorched3d-44-gcc43.patch 561 SHA256 7ee76b89705292ecd2ef55e416dd58a64d3bc5310bc369a26b5eb0ce469ba59e SHA512 c00bfcf2feb7d740e4fc4337a5577962a198d56296bae68a96902046f78fd29856d83b57f309ea9c61d36d4a767e76ae101639a8ed786c5451b440b5a0d908c1 WHIRLPOOL 5a5b045001e21410e66b026896d990013f22507ebe15637f1139016f8d0d61de3fc08773706ab4eb942fb6e4b7ce6fa2baede0d4c2c688a05f338da6e7db614d
+AUX scorched3d-44-jpeg9.patch 610 SHA256 66b3bc4a22dbc54df011d26e4aa416249f510f4c53d892b7cedf55787ad4036b SHA512 03f6ded93ff28351672a30b75f4837bbc750187d8cc6cb168df0b52fe75c9a21eec7ae89421aed3559e75990bd151493965cd843cca17508effbeed01eca91a7 WHIRLPOOL 59eae6f92029eb64e6079ca348d2848b65a372a5b2186035880afd86049f76daa116ed3488c1abdf81e208023643d243efc934d4143c9daf7bb575856c750f50
+AUX scorched3d-44-odbc.patch 503 SHA256 56d5fa2e0b59e19b74248c3a0a081e7139476305dfbfc5c905abaa1de3681d15 SHA512 8bf3e3f9a91502a7c84be73a73e0909c09b050266fb2c6847be2cca13b1a368697dd70c373b6bbce4b12ba97241b2d577cce3604640b4182b2be223d009a4f6e WHIRLPOOL b4ee72c4b69f08f7342bac21382ef279ec54a2c06c6026889c0ba611d05e4ffbd4b4ebf601f1dbba7e72aef0bb8b0f5f48c133e18402e3b345b2b72338a441ef
+AUX scorched3d-44-win32.patch 464 SHA256 325ec09315a102ebb2290007c28fe263771991a5c82908a0ef084f1f6f209b1f SHA512 992224f65f80527276c0b6e139ea44c6c29a2fbfa3a0af78e2f2366897dbd51e9988b065aa21ac95cf9b1a0efc8866e2e45646e1851f8afd195651b3c47a81dd WHIRLPOOL 888a17bba56ea17bf6961a79e6a8ad81a70baece753ff05be0549312bef712b1f743db249f3a287992586be215afe82522fdf3f757bf49c0ea6b6065767f3d57
 DIST Scorched3D-43.3d-src.tar.gz 93245939 SHA256 a5e7bdc3810517ab142cfcb43951ca55d03c81252d00bc323f0f204deb62ef1c SHA512 292cc1c8cabc981c5de9b0df5058be59f4264b803df7b1c34d79e5eee195dc6c3ba34a542bd909410fef64d9fa8f49b340f1e660669526753c19c3e3c71900a9 WHIRLPOOL 5ea176b756b4833e62d1e8a5835a53bcd1fec750e445589f64ee9c73cc48fb8e41a0666f3b85b8d4fb0e8226c95b966194a5512e07dd56c3f203e45b45ba79b8
+DIST Scorched3D-44-src.tar.gz 41689613 SHA256 1c8320bb2210030be71dd713c214fbd32f7dd663ea82031383e6b3636f8a8dba SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca WHIRLPOOL 6b7c744702b86df856d8879454e7c9616e31dc3a9f539bd97c53cba4bea0e59f44e3c703f847f3cd505ba0e90386887f7134f9500421b3d58ba12a9cc1fdbc0e
 EBUILD scorched3d-43.3d.ebuild 1724 SHA256 266eabe3dcef3f8ff883b989d2afd199d57fd51fa5fef2090d9fff0ffb20b28b SHA512 ed4837aa8ddff3ee40ededc6387e9bed5e8c397a2c96f58b197ceb2f19da6a07899c44a75d70db2a56da1222d024f8f4a862bf8bd9f5f68001a8447f18738093 WHIRLPOOL 8c58260515b96cabda59d52af2b6d0c1ccb1df478a501aa4e02c29003c1ea159d900dde97002feee6306e9459b8bb41afa3c9d39d67b0c2d857f6685bb7cff4e
-MISC ChangeLog 15008 SHA256 cb6281c2d957a766f0a75e809d71e6d632d2639b76365ee208123c4e3008df34 SHA512 4f177dd78f7e42ec61e706196e1cb0c1317376479fbdf4915c9b088d66132040b23c9bec0e2cb35d5d712b9fae046bf3bb79bcc1d08ba51172080a2a0a217f12 WHIRLPOOL ac00a4fbf40f51b527a7fed35bdd0ddcc83aa638fd61a342ddbd3ff008c44b9584c4396aeecc4d8c14f707db556c21f298191d8b3bb8fc3e48099c287ec38085
+EBUILD scorched3d-44.ebuild 2109 SHA256 670afb656721959997de85a7e83a30e9bc3b07beefdb67b1ce6156584a6c4a05 SHA512 6bccce62e1dae5acb314a3a115f660f44f773088e9a9664a4427417be462f2f0199dcce5a9cc5b8011cba24893b99b49cddfb8477bbcf9459c08968c13bd11db WHIRLPOOL beacc5d0792258f2f64155f1cc5ae54c97872b49c3df93245b1a72a21d1aa4630c86e0b9ac462618ee2249ce8d582672cdb87af1aece2f232ad0794681b65e1a
+MISC ChangeLog 15350 SHA256 61cc443914c2faa2e65f97641ab16424e13fa08bd0053d886cf54c2b5e506881 SHA512 9583ba6492c6d98284164c5e067207a0a5ce708573e2e1ca431ba539cfa038ff34d29d9d02747c8d0ee584f6207a9dfc78739971f21181df04f30b62b70d8920 WHIRLPOOL 6fd06d860689c5da1981df26a2dab18496f637a28235719aa7569d8005781464593e486c76bbbd95871802d475bbceb0667027ea3699ac483c135ce399dc2f5e
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlSADM8ACgkQIY77eQFFFC1A4QCfYPGJlpk3qoevtiGb8BqHT/Rh
-tOoAn0R+0xiIxryUyyhF81XLZ1e+gAar
-=T2a3
------END PGP SIGNATURE-----

diff --git a/games-strategy/scorched3d/files/scorched3d-44-fixups.patch b/games-strategy/scorched3d/files/scorched3d-44-fixups.patch
new file mode 100644 (file)
index 0000000..47499d4
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-fixups.patch
@@ -0,0 +1,25 @@
+--- scorched.orig/configure.ac
++++ scorched/configure.ac
+@@ -13,22 +13,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ 
+-LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/usr/X11R6"
+-CPPFLAGS="$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-44-freetype.patch b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
new file mode 100644 (file)
index 0000000..93c8ca3
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
@@ -0,0 +1,45 @@
+--- acinclude.m4.orig
++++ acinclude.m4
+@@ -437,7 +437,7 @@
+    if test "$FT2_CONFIG" = "no" ; then
+      no_ft=yes
+    else
+-     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
++     FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG $ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`"
+      FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+      ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+--- src.orig/client/GLEXT/GLFont2dFreeType.h
++++ src/client/GLEXT/GLFont2dFreeType.h
+@@ -23,10 +23,10 @@
+ \r
+ #include <GLEXT/GLFont2dStorage.h>\r
+ #include <ft2build.h>\r
+-#include <freetype/freetype.h>\r
+-#include <freetype/ftglyph.h>\r
+-#include <freetype/ftoutln.h>\r
+-#include <freetype/fttrigon.h>\r
++#include <freetype.h>\r
++#include <ftglyph.h>\r
++#include <ftoutln.h>\r
++#include <fttrigon.h>\r
+ #include <string>\r
+ \r
+ class GLFont2dFreeType\r
+--- src.orig/launcher/wxdialogs/TrueTypeFont.h
++++ src/launcher/wxdialogs/TrueTypeFont.h
+@@ -25,10 +25,10 @@
+ #include <wx/image.h>\r
+ #include <ft2build.h>\r
+ #include <string>\r
+-#include <freetype/freetype.h>\r
+-#include <freetype/ftglyph.h>\r
+-#include <freetype/ftoutln.h>\r
+-#include <freetype/fttrigon.h>\r
++#include <freetype.h>\r
++#include <ftglyph.h>\r
++#include <ftoutln.h>\r
++#include <fttrigon.h>\r
+ \r
+ class TrueTypeFont\r
+ {\r

diff --git a/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch
new file mode 100644 (file)
index 0000000..79f40b7
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-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()\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
+--- scorched.old/src/common/porting/windows.h
++++ scorched/src/common/porting/windows.h
+@@ -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-44-jpeg9.patch b/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
new file mode 100644 (file)
index 0000000..8255dd3
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
@@ -0,0 +1,20 @@
+--- src/common/image/ImageJpgFactory.cpp.old   2014-12-03 09:52:03.306552513 +0100
++++ src/common/image/ImageJpgFactory.cpp       2014-12-03 09:53:22.117786304 +0100
+@@ -79,7 +79,7 @@
+       src->next_input_byte = FakeEOI;\r
+       src->bytes_in_buffer = 2;\r
+ \r
+-      return TRUE;\r
++      return (boolean)TRUE;\r
+ }\r
+ \r
+ METHODDEF(void)\r
+@@ -166,7 +166,7 @@
+       src->bytes_in_buffer = buffer.getBufferUsed();\r
+       src->next_input_byte = (JOCTET *) buffer.getBuffer();\r
+ \r
+-      jpeg_read_header(&cinfo, TRUE);\r
++      jpeg_read_header(&cinfo, (boolean)TRUE);\r
+       jpeg_start_decompress(&cinfo);\r
+ \r
+       if ((cinfo.output_components == 3 && !readalpha) ||\r

diff --git a/games-strategy/scorched3d/files/scorched3d-44-odbc.patch b/games-strategy/scorched3d/files/scorched3d-44-odbc.patch
new file mode 100644 (file)
index 0000000..e7f3833
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-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 @@
+ \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-44-win32.patch b/games-strategy/scorched3d/files/scorched3d-44-win32.patch
new file mode 100644 (file)
index 0000000..05f9c80
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-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>\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-44.ebuild b/games-strategy/scorched3d/scorched3d-44.ebuild
new file mode 100644 (file)
index 0000000..6d82e7b
--- /dev/null
+++ b/games-strategy/scorched3d/scorched3d-44.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-44.ebuild,v 1.1 2014/12/09 22:08:49 mr_bones_ Exp $
+
+EAPI=5
+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/scorched3d/Scorched3D-${PV}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dedicated mysql"
+
+RDEPEND="media-libs/libsdl[video]
+       media-libs/sdl-net
+       media-libs/libpng:0
+       sys-libs/zlib
+       virtual/jpeg:0
+       dev-libs/expat
+       media-fonts/dejavu
+       !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 )"
+DEPEND="${RDEPEND}
+       !dedicated? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/scorched
+
+src_prepare() {
+       epatch \
+               "${FILESDIR}"/${P}-fixups.patch \
+               "${FILESDIR}"/${P}-gcc43.patch \
+               "${FILESDIR}"/${P}-odbc.patch \
+               "${FILESDIR}"/${P}-win32.patch \
+               "${FILESDIR}"/${P}-freetype.patch \
+               "${FILESDIR}"/${P}-jpeg9.patch 
+       eautoreconf
+}
+
+src_configure() {
+       egamesconf \
+               --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() {
+       default
+       rm "${ED}${GAMES_DATADIR}"/${PN}/data/fonts/* || die
+       dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusans.ttf"
+       dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusconbd.ttf"
+       dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusmobd.ttf"
+       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
+}