New ebuild for Mantid-3.3.0

3 files changed, 116 insertions, 0 deletions

diff --git a/sci-visualization/mantid/files/mantid-3.3.0-FindOpenCascade.patch b/sci-visualization/mantid/files/mantid-3.3.0-FindOpenCascade.patch
new file mode 100644
index 000000000..2c8f78dab
--- /dev/null
+++ b/sci-visualization/mantid/files/mantid-3.3.0-FindOpenCascade.patch
@@ -0,0 +1,84 @@
+diff --git a/Build/CMake/FindOpenCascade.cmake b/Build/CMake/FindOpenCascade.cmake
+index aefa011..346678d 100644
+--- a/Build/CMake/FindOpenCascade.cmake
++++ b/Build/CMake/FindOpenCascade.cmake
+@@ -4,13 +4,6 @@
+ # OPENCASCADE_FOUND If false, do not try to use OPENCASCADE
+ 
+ find_path ( OPENCASCADE_INCLUDE_DIR Standard.hxx PATHS
+-                /usr/include/opencascade
+-                /usr/include/oce
+-                /usr/local/include/opencascade
+-                /usr/local/include/oce
+-                /usr/local/inc
+-                /opt/OpenCASCADE/inc
+-                ${CMAKE_INCLUDE_PATH}/OpenCascade
+                 $ENV{CASROOT}/inc
+ )
+ 
+@@ -18,50 +11,56 @@ if ( WIN32 )
+   add_definitions ( -DWNT )
+ endif ( WIN32 )
+ 
+-set ( OC_REDHAT_RPM /opt/OpenCASCADE/lib64 )
++find_path ( OPENCASCADE_LIBRARY_DIR libTKernel.so PATHS
++               $ENV{CASROOT}/lib64
++)
++
+ find_library ( OPENCASCADE_LIB_TKERNEL
+                  NAMES TKernel
+-                 PATHS ${OC_REDHAT_RPM}         
++                 PATHS ${OPENCASCADE_LIBRARY_DIR}
+ )
+ find_library ( OPENCASCADE_LIB_TKBO
+                  NAMES TKBO
+-                 PATHS ${OC_REDHAT_RPM}         
++                 PATHS ${OPENCASCADE_LIBRARY_DIR}
+ )
+ find_library ( OPENCASCADE_LIB_TKPRIM
+                  NAMES TKPrim
+-                 PATHS ${OC_REDHAT_RPM}         
++                 PATHS ${OPENCASCADE_LIBRARY_DIR}
+ )
+ find_library ( OPENCASCADE_LIB_TKMESH
+                  NAMES TKMesh
+-                 PATHS ${OC_REDHAT_RPM}         
++                 PATHS ${OPENCASCADE_LIBRARY_DIR}
+ )
+ find_library ( OPENCASCADE_LIB_TKBREP
+                  NAMES TKBRep
+-                 PATHS ${OC_REDHAT_RPM}         
++                 PATHS ${OPENCASCADE_LIBRARY_DIR}
+ )
+ find_library ( OPENCASCADE_LIB_TKTOPALGO
+                  NAMES TKTopAlgo
+-                 PATHS ${OC_REDHAT_RPM}         
++                 PATHS ${OPENCASCADE_LIBRARY_DIR}
+ )
+ find_library ( OPENCASCADE_LIB_TKMATH
+                  NAMES TKMath
+-                 PATHS ${OC_REDHAT_RPM}         
++                 PATHS ${OPENCASCADE_LIBRARY_DIR}
+ )
+ find_library ( OPENCASCADE_LIB_TKG2D
+                  NAMES TKG2d
+-                 PATHS ${OC_REDHAT_RPM}         
++                 PATHS ${OPENCASCADE_LIBRARY_DIR}
+ )
+ 
+ find_library ( OPENCASCADE_LIB_TKG3D
+                  NAMES TKG3d
++                 PATHS ${OPENCASCADE_LIBRARY_DIR}
+ )
+ 
+ find_library ( OPENCASCADE_LIB_TKGEOMBASE
+                  NAMES TKGeomBase
++                 PATHS ${OPENCASCADE_LIBRARY_DIR}
+ )
+ 
+ find_library ( OPENCASCADE_LIB_TKGEOMAlgo
+                  NAMES TKGeomAlgo
++                 PATHS ${OPENCASCADE_LIBRARY_DIR}
+ )
+ 
+ set ( OPENCASCADE_LIBRARIES
diff --git a/sci-visualization/mantid/files/mantid-3.3.0-HAVE_IOSTREAM.patch b/sci-visualization/mantid/files/mantid-3.3.0-HAVE_IOSTREAM.patch
new file mode 100644
index 000000000..905a70171
--- /dev/null
+++ b/sci-visualization/mantid/files/mantid-3.3.0-HAVE_IOSTREAM.patch
@@ -0,0 +1,17 @@
+diff --git a/Framework/Geometry/CMakeLists.txt b/Framework/Geometry/CMakeLists.txt
+index bb1d146..466b072 100644
+--- a/Framework/Geometry/CMakeLists.txt
++++ b/Framework/Geometry/CMakeLists.txt
+@@ -351,10 +351,8 @@ else ()
+   add_definitions ( -DNO_OPENCASCADE )
+ endif ()
+ 
+-# A few defines needed for OpenCascade on the Mac
+-if ( APPLE )
+-  add_definitions ( -DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP )
+-endif ()
++# A few defines needed for OpenCascade
++add_definitions ( -DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP )
+ 
+ include_directories ( ${OPENGL_INCLUDE_DIR} )
+ include_directories ( ${GSL_INCLUDE_DIR} )
diff --git a/sci-visualization/mantid/files/mantid-3.3.0-minigzip-OF.patch b/sci-visualization/mantid/files/mantid-3.3.0-minigzip-OF.patch
new file mode 100644
index 000000000..485777458
--- /dev/null
+++ b/sci-visualization/mantid/files/mantid-3.3.0-minigzip-OF.patch
@@ -0,0 +1,15 @@
+diff --git a/MantidPlot/src/zlib123/minigzip.c b/MantidPlot/src/zlib123/minigzip.c
+index 97fbae1..5f4612f 100644
+--- a/MantidPlot/src/zlib123/minigzip.c
++++ b/MantidPlot/src/zlib123/minigzip.c
+@@ -50,6 +50,10 @@
+ #  include <unix.h> /* for fileno */
+ #endif
+ 
++#ifndef OF
++#  define OF(args) args
++#endif
++
+ #ifndef WIN32 /* unlink already in stdio.h for WIN32 */
+   extern int unlink OF((const char *));
+ #else