games-strategy/scorched3d: Fix building with GCC 6

Gentoo-bug: 601890
* EAPI=6
* Remove games.eclass
* Make PATCHES -p1 compliant

Package-Manager: Portage-2.3.3, Repoman-2.3.1

4 files changed, 28 insertions, 14 deletions

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-freetype.patch b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
index 93c8ca358b31..e4717972d81a 100644
--- a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
+++ b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
@@ -1,5 +1,5 @@
---- acinclude.m4.orig
-+++ acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
 @@ -437,7 +437,7 @@
     if test "$FT2_CONFIG" = "no" ; then
       no_ft=yes
@@ -9,8 +9,8 @@
       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
+--- a/src/client/GLEXT/GLFont2dFreeType.h
++++ b/src/client/GLEXT/GLFont2dFreeType.h
 @@ -23,10 +23,10 @@
  

  #include <GLEXT/GLFont2dStorage.h>

@@ -26,8 +26,8 @@
  #include <string>

  

  class GLFont2dFreeType

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

  #include <ft2build.h>

diff --git a/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch b/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
index 8255dd33f5d3..1cebf3ebd7bc 100644
--- a/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
+++ b/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
@@ -1,5 +1,5 @@
---- 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
+--- 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;

diff --git a/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch
index ef2e27a6d255..ee8b97554656 100644
--- a/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch
+++ b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch
@@ -2,8 +2,8 @@ Description: Fix to build with wxWidgets 3.0
 Author: Olly Betts <olly@survex.com>
 Last-Update: 2014-05-01
 
---- src/launcher/wxdialogs/Display.cpp
-+++ src/launcher/wxdialogs/Display.cpp
+--- 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"));
@@ -49,8 +49,8 @@ Last-Update: 2014-05-01
  	
  	keyboardKeyList.clear();
  	if (!Keyboard::instance()->loadKeyFile())
---- src/launcher/wxdialogs/SettingsDialog.cpp
-+++ src/launcher/wxdialogs/SettingsDialog.cpp
+--- 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"));
@@ -114,8 +114,8 @@ Last-Update: 2014-05-01
  	playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
  
  	for (int i=0; i<24; i++)
---- src/launcher/wxdialogs/DisplayDialog.cpp
-+++ src/launcher/wxdialogs/DisplayDialog.cpp
+--- 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));