reinit the tree, so we can have metadata

12 files changed, 525 insertions, 0 deletions

diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
new file mode 100644
index 000000000000..8ff1c608ead2
--- /dev/null
+++ b/games-strategy/scorched3d/Manifest
@@ -0,0 +1,14 @@
+AUX scorched3d-44-fix-c++14.patch 566 SHA256 f678c4d64cd6f4457e87057d73ab59f6469704dcb6ada69926950bb6baac59b9 SHA512 f74db569f471e1ac24fe6dfa15c319ac6dce52a6b35d333efb314b59156b150e7a09c843e7046d804a4768eea294671546313043c46bc38ac5e951d1daa1c23d WHIRLPOOL b0d1fc6359441e75de12c2a82fc5a9d6f78234319e8f7b9435fa5a8598e5b42472984710ef1b8287bbd32f25a7de26a4cb537823ed84284ad8508115299b3fea
+AUX scorched3d-44-fixups.patch 717 SHA256 5eb531b97c2520fb3dcd1bbec0ad684228c0d4183a9fd3641629846351f02875 SHA512 8045df51e6a09d9101d971056edc77e03694b2872819cd892d1239c04ad5c59afa8a60adc2ca04a63a5d501bbb113221408522a33159eee836e600bb2b8d40c7 WHIRLPOOL 50aa87c84e1a70fb59ef81da9c952d9b8abb05e9b9e7b5af528a560108d8c94e37aec35764302382b411e403e0402acf4c8efb096c8c39bcebaea0ad9516d258
+AUX scorched3d-44-freetype.patch 1372 SHA256 4ceb8b407575a41f2781716094a59cd1de260e69085726c9c63f78ea7be7aad4 SHA512 98688db48920b32aa87aeb9fbfb245f18ebc0f5b2a92a341ffd49ad94fc10e6bee4ee5864e15497e7617467759cc1fe809887e107d881b199965f5b22045bfc9 WHIRLPOOL bb87f40d54554297d3f1694536548ba14c1a35ecc8a58c573a60847e6aae937c3ada400a4c0f4d039056cc8bcda2bbd3d82b76f6742d6ee6ee3c2b5069b6972e
+AUX scorched3d-44-gcc43.patch 561 SHA256 7ee76b89705292ecd2ef55e416dd58a64d3bc5310bc369a26b5eb0ce469ba59e SHA512 c00bfcf2feb7d740e4fc4337a5577962a198d56296bae68a96902046f78fd29856d83b57f309ea9c61d36d4a767e76ae101639a8ed786c5451b440b5a0d908c1 WHIRLPOOL 5a5b045001e21410e66b026896d990013f22507ebe15637f1139016f8d0d61de3fc08773706ab4eb942fb6e4b7ce6fa2baede0d4c2c688a05f338da6e7db614d
+AUX scorched3d-44-jpeg9.patch 614 SHA256 7d585ef42e565c0f7aaaddd2d4b9ed4a920b2c2a001a65889df09e70c5111971 SHA512 8adb3bd124b11b006d8124e57fc506e8dc56415c89cca70440901cef7aa547f241d100c42281345fd489c95f9e8eb105d5e5de5ef18382087e203877cc8f6ca4 WHIRLPOOL 9ff421974aecf702af5c60366445b1a69a3bb4c3dfe29270f6a8f17dd27dfe0f0de32fbd456a3b575d25ca991c15e08c12599ab74cbe938ce9359e0392e3d23b
+AUX scorched3d-44-odbc.patch 503 SHA256 56d5fa2e0b59e19b74248c3a0a081e7139476305dfbfc5c905abaa1de3681d15 SHA512 8bf3e3f9a91502a7c84be73a73e0909c09b050266fb2c6847be2cca13b1a368697dd70c373b6bbce4b12ba97241b2d577cce3604640b4182b2be223d009a4f6e WHIRLPOOL b4ee72c4b69f08f7342bac21382ef279ec54a2c06c6026889c0ba611d05e4ffbd4b4ebf601f1dbba7e72aef0bb8b0f5f48c133e18402e3b345b2b72338a441ef
+AUX scorched3d-44-win32.patch 464 SHA256 325ec09315a102ebb2290007c28fe263771991a5c82908a0ef084f1f6f209b1f SHA512 992224f65f80527276c0b6e139ea44c6c29a2fbfa3a0af78e2f2366897dbd51e9988b065aa21ac95cf9b1a0efc8866e2e45646e1851f8afd195651b3c47a81dd WHIRLPOOL 888a17bba56ea17bf6961a79e6a8ad81a70baece753ff05be0549312bef712b1f743db249f3a287992586be215afe82522fdf3f757bf49c0ea6b6065767f3d57
+AUX scorched3d-44-wxgtk.patch 7001 SHA256 6e3e210addeae643f353496c47fa4cebd11e46d0bcf11c7848d51108cecaec6f SHA512 99e21ff6854bbea676c8ea0a5ef2b28a4d6020b34fbae134d9346d4febb7b6defbd39cb712f29b3dcff7ac829b2e76275a85d7d740e921835898f550c4471120 WHIRLPOOL 48fdb4f6636a6d19035236665c9256cd410adb50209ecaa2306e4084b8090ef5c3fdc9050cc6a50c7aa4828fc696ae70b2b232d74ba2aa226920843bc11af4b5
+DIST Scorched3D-44-src.tar.gz 41689613 SHA256 1c8320bb2210030be71dd713c214fbd32f7dd663ea82031383e6b3636f8a8dba SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca WHIRLPOOL 6b7c744702b86df856d8879454e7c9616e31dc3a9f539bd97c53cba4bea0e59f44e3c703f847f3cd505ba0e90386887f7134f9500421b3d58ba12a9cc1fdbc0e
+EBUILD scorched3d-44-r1.ebuild 2221 SHA256 d9fff21262ba08c74da8f057e1ba379a46deeccfc6eb88b76c0bd6524576d4a6 SHA512 1cca46096ecf2cf87a913733a1e92777a44f91bdc721a0c78b046380adda16a25f229afb0a223c3c4e945adce85610f0b1772d9a0f9042d85908828bbb2705a4 WHIRLPOOL da7a5d351e4bf19cf7d32d378d73daf75b154fd73392d557bbefa9077bc328f041c0b82850c62eac1cd832a3bbe30ac28a86bd7ae09377a92fb864ae49500fc3
+EBUILD scorched3d-44-r2.ebuild 2310 SHA256 f2279ceacb4ad8c3a4ce76aa841c07d0157ef2a87d6bc0296cc5e18bdaef4b81 SHA512 6b145b4f8f71f338a3535cedff106a4dec6119a37b99ed59b035f51ffa48bf857e6a4dd72f162455fd50d99f7e195ab3418d4f378735c1a417ded077d034a42a WHIRLPOOL e40cc2f7adb6e41eb0d7fa2cb5aa8badb50b53f8851023077fcb29e0cff55e802b4a4f8281489687b1b0d88c64786ad7e1675b78f9d244ca8c9a090c069c4da8
+MISC ChangeLog 3881 SHA256 7d78ef5132c961a884ce8ea88129b5c1bd405697787209f7c881ecef2a0786b4 SHA512 3dca1cd6b028a18e5e048492e5ba30a9a0faa554b552962229e6b000e86caf571e66c0433fc04a00751e3cf69ad7793950ef58df4ba89bd5c81fea65d54ab66d WHIRLPOOL ba081308815ca61b8aa63eb1d176d9cd38c21531b77e8cbf46ccc97d98e013e82754239955b49d982efd72c24cea548dedb854bec0d7d8cabf20847d46a376a1
+MISC ChangeLog-2015 16385 SHA256 a4bbf80de049d02acd34341baac4e19aa020e88d37f73bca668ba963951ab87a SHA512 7bcf80ac0e1b26f825e829fbb8d748de5672067f0a83ed0518d9b8e4600c9a227cdad3acbc27d5c2efb4b61898d3b30a4c20933a5004727aefecd83a4a5f52ba WHIRLPOOL b6ae93961727860e049c475ce1c590aa7ea2662d688cc54d2558e0926bb8154d6070dda837c5e77225b345591639631f93897f174727404b40635edcba527822
+MISC metadata.xml 333 SHA256 1ad69c015c8f04f5608782f77b591dcfdbfb9566b76cc2ba63b85e846811c43a SHA512 91b1e0f50ec4635e81ee904179228d25b8168bf74d00eacb734365514e43e681879c121cc2f60302b446367b8b6fb388842e28890719f6785fb5bf389f638171 WHIRLPOOL e615857beedeb663193434eea5546d01dc37f9fe2ce47b5f07067089c958dc5a69d8da4d0f0d072aadbaa25dd7b32bd1696509290f283331682ea2e8176b9666
diff --git a/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch b/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch
new file mode 100644
index 000000000000..e3cba2741405
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch
@@ -0,0 +1,14 @@
+In C++14, bool -> T* implicit conversions are not allowed anymore.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=601890
+
+--- a/src/common/weapons/AccessoryStore.cpp
++++ b/src/common/weapons/AccessoryStore.cpp
+@@ -156,7 +156,7 @@
+ 	Accessory *parent, XMLNode *currentNode)

+ {

+ 	XMLNode *typeNode = 0;

+-	if (!currentNode->getNamedParameter("type", typeNode)) return false;

++	if (!currentNode->getNamedParameter("type", typeNode)) return NULL;

+ 

+ 	AccessoryPart *accessoryPart = 

+ 		AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this);

diff --git a/games-strategy/scorched3d/files/scorched3d-44-fixups.patch b/games-strategy/scorched3d/files/scorched3d-44-fixups.patch
new file mode 100644
index 000000000000..47499d4cf307
--- /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
index 000000000000..e4717972d81a
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
@@ -0,0 +1,45 @@
+--- a/acinclude.m4
++++ b/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/'`
+--- a/src/client/GLEXT/GLFont2dFreeType.h
++++ b/src/client/GLEXT/GLFont2dFreeType.h
+@@ -23,10 +23,10 @@
+ 

+ #include <GLEXT/GLFont2dStorage.h>

+ #include <ft2build.h>

+-#include <freetype/freetype.h>

+-#include <freetype/ftglyph.h>

+-#include <freetype/ftoutln.h>

+-#include <freetype/fttrigon.h>

++#include <freetype.h>

++#include <ftglyph.h>

++#include <ftoutln.h>

++#include <fttrigon.h>

+ #include <string>

+ 

+ class GLFont2dFreeType

+--- a/src/launcher/wxdialogs/TrueTypeFont.h
++++ b/src/launcher/wxdialogs/TrueTypeFont.h
+@@ -25,10 +25,10 @@
+ #include <wx/image.h>

+ #include <ft2build.h>

+ #include <string>

+-#include <freetype/freetype.h>

+-#include <freetype/ftglyph.h>

+-#include <freetype/ftoutln.h>

+-#include <freetype/fttrigon.h>

++#include <freetype.h>

++#include <ftglyph.h>

++#include <ftoutln.h>

++#include <fttrigon.h>

+ 

+ class TrueTypeFont

+ {

diff --git a/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch
new file mode 100644
index 000000000000..79f40b70e652
--- /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()

+ {

+ 	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-44-jpeg9.patch b/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
new file mode 100644
index 000000000000..1cebf3ebd7bc
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
@@ -0,0 +1,20 @@
+--- a/src/common/image/ImageJpgFactory.cpp.old	2014-12-03 09:52:03.306552513 +0100
++++ b/src/common/image/ImageJpgFactory.cpp	2014-12-03 09:53:22.117786304 +0100
+@@ -79,7 +79,7 @@
+ 	src->next_input_byte = FakeEOI;

+ 	src->bytes_in_buffer = 2;

+ 

+-	return TRUE;

++	return (boolean)TRUE;

+ }

+ 

+ METHODDEF(void)

+@@ -166,7 +166,7 @@
+ 	src->bytes_in_buffer = buffer.getBufferUsed();

+ 	src->next_input_byte = (JOCTET *) buffer.getBuffer();

+ 

+-	jpeg_read_header(&cinfo, TRUE);

++	jpeg_read_header(&cinfo, (boolean)TRUE);

+ 	jpeg_start_decompress(&cinfo);

+ 

+ 	if ((cinfo.output_components == 3 && !readalpha) ||

diff --git a/games-strategy/scorched3d/files/scorched3d-44-odbc.patch b/games-strategy/scorched3d/files/scorched3d-44-odbc.patch
new file mode 100644
index 000000000000..e7f3833bf897
--- /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 @@
+ 

+ 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-44-win32.patch b/games-strategy/scorched3d/files/scorched3d-44-win32.patch
new file mode 100644
index 000000000000..05f9c806b1c7
--- /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>

+ #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/files/scorched3d-44-wxgtk.patch b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch
new file mode 100644
index 000000000000..ee8b97554656
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch
@@ -0,0 +1,161 @@
+Description: Fix to build with wxWidgets 3.0
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-05-01
+
+--- a/src/launcher/wxdialogs/Display.cpp
++++ b/src/launcher/wxdialogs/Display.cpp
+@@ -26,7 +26,7 @@
+ 	// Display settings
+ 	wxStaticBox *displayBox = new wxStaticBox(parent, -1, wxT("&Display"));
+ 	wxStaticBoxSizer *displaySizer = new wxStaticBoxSizer(displayBox, wxVERTICAL);
+-	wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(2, 3, 5, 5);
++	wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(0, 3, 5, 5);
+ 	wxStaticText *resText = new wxStaticText(parent, -1, wxT("&Resolution :"));
+ 	IDC_DISPLAY_CTRL = 
+ 		new wxComboBox(parent, -1,
+@@ -88,7 +88,7 @@
+ 	// Sound settings
+ 	wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound"));
+ 	wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL);
+-	wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2);
++	wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(0, 4, 2, 0);
+ 	wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :"));
+ 	wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :"));
+ 	wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :"));
+@@ -137,7 +137,7 @@
+ 		wxT("Game Detail Options"));
+ 	wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL);
+ 
+-	wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2);
++	wxGridSizer *loadSizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	IDC_LOADULTRA_CTRL = new wxButton(parent,  ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1));
+ 	IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1));
+ 	IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1));
+@@ -256,7 +256,7 @@
+ 		wxStaticBox *waterDetailBox = new wxStaticBox(parent, -1, 
+ 													  wxT("Graphics Detail"));
+ 		wxStaticBoxSizer *waterDetailSizer = new wxStaticBoxSizer(waterDetailBox, wxHORIZONTAL);
+-		wxGridSizer *waterDetailSizer2 = new wxGridSizer(3, 1, 10, 10);
++		wxGridSizer *waterDetailSizer2 = new wxGridSizer(0, 1, 10, 10);
+ 		
+ 		IDC_NOWATERREF_CTRL = 
+ 		new wxCheckBox(parent, -1, wxT("Don't draw water reflections - Large Framerate Improvement"));
+@@ -471,7 +471,7 @@
+ {
+ 	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1, 
+ 		wxDefaultPosition, wxSize(480, 250));
+-	wxSizer *sizer = new wxFlexGridSizer(5, 1);
++	wxSizer *sizer = new wxFlexGridSizer(0, 5, 1, 0);
+ 	
+ 	keyboardKeyList.clear();
+ 	if (!Keyboard::instance()->loadKeyFile())
+--- a/src/launcher/wxdialogs/SettingsDialog.cpp
++++ b/src/launcher/wxdialogs/SettingsDialog.cpp
+@@ -105,7 +105,7 @@
+ 	mainPanel_ = new wxPanel(book_, -1);
+ 	book_->AddPage(mainPanel_, wxT("Main"));
+ 	wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -166,7 +166,7 @@
+ {
+ 	moneyPanel_ = new wxPanel(book_, -1);
+ 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -215,7 +215,7 @@
+ {
+ 	scorePanel_ = new wxPanel(book_, -1);
+ 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -249,7 +249,7 @@
+ {
+ 	weaponsPanel_ = new wxPanel(book_, -1);
+ 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -286,7 +286,7 @@
+ {
+ 	envPanel_ = new wxPanel(book_, -1);
+ 	wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -337,7 +337,7 @@
+ 	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1, 
+ 		wxDefaultPosition, wxSize(225, 200));
+ 
+-	wxSizer *sizer = new wxFlexGridSizer(3, 3);
++	wxSizer *sizer = new wxFlexGridSizer(0, 3, 3, 0);
+ 	int i = 0;
+ 	std::list<LandscapeDefinitionsEntry> &defns =
+ 		landscapeDefinitions.getAllLandscapes();
+@@ -438,7 +438,7 @@
+ 		wxT("Players are persistent for game"));
+ 	playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10);
+ 		
+-	wxSizer *sizer = new wxGridSizer(3, 3);
++	wxSizer *sizer = new wxGridSizer(0, 3, 3, 0);
+ 	playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	for (int i=0; i<24; i++)
+--- a/src/launcher/wxdialogs/DisplayDialog.cpp
++++ b/src/launcher/wxdialogs/DisplayDialog.cpp
+@@ -449,15 +449,15 @@
+ 	IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness());
+ 	IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(), wxConvUTF8));
+ 	IDC_VOLUME_CTRL->SetRange(0, 128);
+-	IDC_VOLUME_CTRL->SetTickFreq(4, 0);
++	IDC_VOLUME_CTRL->SetTickFreq(4);
+ 	IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume());
+ 	IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(), wxConvUTF8));
+ 	IDC_MUSICVOLUME_CTRL->SetRange(0, 128);
+-	IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0);
++	IDC_MUSICVOLUME_CTRL->SetTickFreq(4);
+ 	IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume());
+ 	IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(), wxConvUTF8));
+ 	IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128);
+-	IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0);
++	IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4);
+ 	IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume());
+ 	IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(), wxConvUTF8));
+ 	IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(), wxConvUTF8));
+@@ -733,11 +733,7 @@
+ 		convertString(S3D::formatStringBuffer("%s.s3m", (const char *) (selection.mb_str(wxConvUTF8)))), // default filename
+ 		wxT(""), // default extension
+ 		wxT("*.s3m"),
+-#if wxCHECK_VERSION(2, 8, 0)
+ 		wxFD_SAVE);
+-#else
+-		wxSAVE);
+-#endif
+ 	if (file.empty()) return;
+ 	ModFiles files;
+ 	if (!files.loadModFiles(std::string(selection.mb_str(wxConvUTF8)), false))
+@@ -761,11 +757,7 @@
+ 		wxT(""), // default filename
+ 		wxT(""), // default extension
+ 		wxT("*.s3m"),
+-#if wxCHECK_VERSION(2, 8, 0)
+ 		wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+-#else
+-		wxOPEN | wxFILE_MUST_EXIST);
+-#endif
+ 	if (file.empty()) return;
+ 	ModFiles files;
+ 	std::string mod;
diff --git a/games-strategy/scorched3d/metadata.xml b/games-strategy/scorched3d/metadata.xml
new file mode 100644
index 000000000000..bad136330d96
--- /dev/null
+++ b/games-strategy/scorched3d/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">scorched3d</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/scorched3d/scorched3d-44-r1.ebuild b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
new file mode 100644
index 000000000000..eb5af707e189
--- /dev/null
+++ b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+WX_GTK_VER=3.0
+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 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/glew
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/freealut
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		media-libs/freetype:2
+		sci-libs/fftw:3.0
+	)
+	mysql? ( virtual/mysql )"
+DEPEND="${RDEPEND}
+	!dedicated? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/scorched
+
+src_prepare() {
+	edos2unix \
+		src/launcher/wxdialogs/SettingsDialog.cpp \
+		src/launcher/wxdialogs/DisplayDialog.cpp \
+		src/launcher/wxdialogs/Display.cpp \
+		src/launcher/wxdialogs/KeyDialog.cpp
+	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 \
+		"${FILESDIR}"/${P}-wxgtk.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
+}
diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
new file mode 100644
index 000000000000..e156ff902fda
--- /dev/null
+++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER=3.0
+
+inherit autotools eutils wxwidgets
+
+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 ~ppc64 ~x86"
+IUSE="dedicated mysql"
+
+RDEPEND="
+	dev-libs/expat
+	media-fonts/dejavu
+	media-libs/libpng:0=
+	media-libs/libsdl[video]
+	media-libs/sdl-net
+	sys-libs/zlib
+	virtual/jpeg:0
+	!dedicated? (
+		virtual/opengl
+		virtual/glu
+		media-libs/glew:0=
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/freealut
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		media-libs/freetype:2
+		sci-libs/fftw:3.0=
+	)
+	mysql? ( virtual/mysql )"
+DEPEND="${RDEPEND}
+	!dedicated? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/scorched
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fixups.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-odbc.patch
+	"${FILESDIR}"/${P}-win32.patch
+	"${FILESDIR}"/${P}-freetype.patch
+	"${FILESDIR}"/${P}-jpeg9.patch
+	"${FILESDIR}"/${P}-wxgtk.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
+)
+
+pkg_setup() {
+	setup-wxwidgets
+}
+
+src_prepare() {
+	edos2unix \
+		src/launcher/wxdialogs/SettingsDialog.cpp \
+		src/launcher/wxdialogs/DisplayDialog.cpp \
+		src/launcher/wxdialogs/Display.cpp \
+		src/launcher/wxdialogs/KeyDialog.cpp
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--datadir="${EPREFIX}"/usr/share/${PN} \
+		--with-fftw="${EPREFIX}"/usr \
+		--with-ogg="${EPREFIX}"/usr \
+		--with-vorbis="${EPREFIX}"/usr \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-wx-config="${WX_CONFIG}" \
+		--without-pgsql \
+		$(use_with mysql) \
+		$(use_enable dedicated serveronly)
+}
+
+src_install() {
+	default
+
+	# remove bundled fonts
+	rm "${ED%/}"/usr/share/${PN}/data/fonts/* || die
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf
+
+	if ! use dedicated; then
+		newicon data/images/tank-old.bmp ${PN}.bmp
+		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
+	fi
+}