gentoo resync : 14.07.2018

3 files changed, 0 insertions, 87 deletions

diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch b/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
deleted file mode 100644
index 396fd573ec90..000000000000
--- a/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- crrcsim-0.9.11/configure.ac
-+++ crrcsim-0.9.11/configure.ac
-@@ -79,8 +79,12 @@
- dnl Default is: no portaudio present
- portaudio=0
- 
-+AC_ARG_WITH([portaudio], AS_HELP_STRING([--without-portaudio], [Build without portaudio library (default: test)]))
-+
-+AS_IF([test "x$with_portaudio" != "xno"], [
- dnl Check for the Portaudio header file
- AC_CHECK_HEADER([portaudio.h])
-+])
- 
- if  (test "x$ac_cv_header_portaudio_h" = "xyes"); then 
-   dnl Check for Portaudio 18
---- crrcsim-0.9.13/src/mod_misc/filesystools.cpp
-+++ crrcsim-0.9.13/src/mod_misc/filesystools.cpp
-@@ -113,8 +113,8 @@
-   // $USERPROFILE/.crrcsim                (WIN32)
-   // $HOME/.crrcsim                       (LINUX)
-   // CRRC_DATA_PATH                       (LINUX)
--  // /usr/local/share/games/crrcsim       (LINUX)
--  // /usr/share/games/crrcsim             (LINUX)
-+  // /usr/local/share/crrcsim             (LINUX)
-+  // /usr/share/crrcsim                   (LINUX)
- 
-   // cwd
-   if (dirname != "")
-@@ -154,13 +154,13 @@
-     s.append(dirname);
-     pathlist.push_back(s);
-     #endif
--    s = "/usr/local/share/games/" + appname + "/";
-+    s = "/usr/local/share/" + appname + "/";
-     if (s != data_path)    // avoid adding this path twice
-     {
-       s.append(dirname);
-       pathlist.push_back(s);
-     }
--    s = "/usr/share/games/" + appname + "/";
-+    s = "/usr/share/" + appname + "/";
-     if (s != data_path)    // avoid adding this path twice
-     {
-       s.append(dirname);
-@@ -172,13 +172,13 @@
-     #ifdef CRRC_DATA_PATH
-     pathlist.push_back(data_path);
-     #endif
--    if (data_path != "/usr/local/share/games/" + appname)  // avoid adding this path twice
-+    if (data_path != "/usr/local/share/" + appname)  // avoid adding this path twice
-     {
--      pathlist.push_back("/usr/local/share/games/" + appname);
-+      pathlist.push_back("/usr/local/share/" + appname);
-     }
--    if (data_path != "/usr/share/games/" + appname)  // avoid adding this path twice
-+    if (data_path != "/usr/share/" + appname)  // avoid adding this path twice
-     {
--      pathlist.push_back("/usr/share/games/" + appname);
-+      pathlist.push_back("/usr/share/" + appname);
-     }
-   }
-   #endif
diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch b/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch
deleted file mode 100644
index b11550f3dff6..000000000000
--- a/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Bug: https://bugs.gentoo.org/610560
-Upstream commit: https://sourceforge.net/p/crrcsim/code/ci/28ed9ba57011371cab8b637550acc716b973c47d
-
---- a/src/mod_video/crrc_animation.cpp
-+++ b/src/mod_video/crrc_animation.cpp
-@@ -84,7 +84,7 @@
-       else
-       {
-         std::cerr << "createAnimation: unknown animation type \'"
--                  << type << "\'" << std::cerr;
-+                  << type << "\'" << std::endl;
-       }
-       
-       if (anim != NULL)
diff --git a/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch b/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch
deleted file mode 100644
index 10d6bff6b769..000000000000
--- a/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- crrcsim-0.9.11/configure.ac
-+++ crrcsim-0.9.11/configure.ac
-@@ -229,7 +229,7 @@
-       has_CGAL="yes  (found CGAL v3)"
-     fi   
-     CGAL_CFLAGS=-frounding-math
--    CGAL_LIBS=-lCGAL
-+    CGAL_LIBS="-lCGAL -lgmp"
-     AC_DEFINE([WINDDATA3D], [1], [Import code for wind data, needs CGAL, 0 to disable])
- else
-     has_CGAL="no   (CGAL not found)"