Revbump with ebuild by Fabio Rossi (bug 457830).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

8 files changed, 658 insertions, 1 deletions

diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
index 07761ba371ca..59332a6f9427 100644
--- a/media-gfx/freecad/ChangeLog
+++ b/media-gfx/freecad/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-gfx/freecad
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.17 2014/04/23 22:49:07 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.18 2014/04/24 04:48:12 xmw Exp $
+
+*freecad-0.13.1830-r1 (24 Apr 2014)
+
+  24 Apr 2014; Michael Weber <xmw@gentoo.org>
+  +files/freecad-0.13.1830-CMakefile.patch,
+  +files/freecad-0.13.1830-avoid-include-salome.patch,
+  +files/freecad-0.13.1830-cmake-2.8.12.patch,
+  +files/freecad-0.13.1830-no-machdist.patch,
+  +files/freecad-0.13.1830-occ-6.7.patch,
+  +files/freecad-0.13.1830-startpage-links.patch, +freecad-0.13.1830-r1.ebuild:
+  Revbump with ebuild by Fabio Rossi (bug 457830).
 
 *freecad-0.12.5284-r4 (23 Apr 2014)
 
diff --git a/media-gfx/freecad/files/freecad-0.13.1830-CMakefile.patch b/media-gfx/freecad/files/freecad-0.13.1830-CMakefile.patch
new file mode 100644
index 000000000000..58e99587f992
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.13.1830-CMakefile.patch
@@ -0,0 +1,21 @@
+--- CMakeLists.txt	2014-01-06 13:46:44.516313646 +0100
++++ CMakeLists.txt.new	2014-01-06 13:58:16.035280554 +0100
+@@ -69,9 +69,15 @@
+     SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ endif(WIN32)
+ 
+-SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
+-SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
+-SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
++if(NOT CMAKE_INSTALL_DATADIR)
++	SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
++endif(NOT CMAKE_INSTALL_DATADIR)
++if(NOT CMAKE_INSTALL_INCLUDEDIR)
++	SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
++endif(NOT CMAKE_INSTALL_INCLUDEDIR)
++if(NOT CMAKE_INSTALL_DOCDIR)
++	SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
++endif(NOT CMAKE_INSTALL_DOCDIR)
+ 
+ # used as compiler defines
+ SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
diff --git a/media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch b/media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch
new file mode 100644
index 000000000000..0db660948579
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch
@@ -0,0 +1,11 @@
+--- src/3rdParty/salomesmesh/CMakeLists.txt	2014-01-06 14:06:05.495258088 +0100
++++ src/3rdParty/salomesmesh/CMakeLists.txt.new	2014-01-06 15:05:53.316086394 +0100
+@@ -206,8 +206,4 @@
+             DESTINATION lib
+         )
+         # Headers are installed by default in /usr/local/include/SMESH-5.1.2.7
+-        INSTALL(DIRECTORY inc/
+-            DESTINATION include
+-            FILES_MATCHING PATTERN "*.h*"
+-        )
+ ENDIF(UNIX)
diff --git a/media-gfx/freecad/files/freecad-0.13.1830-cmake-2.8.12.patch b/media-gfx/freecad/files/freecad-0.13.1830-cmake-2.8.12.patch
new file mode 100644
index 000000000000..e0e0e9fc02a7
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.13.1830-cmake-2.8.12.patch
@@ -0,0 +1,294 @@
+commit f061b6f7ea667e1d6944590d67b9b5b6659e4ba0
+Author: wmayer <wmayer@users.sourceforge.net>
+Date:   Tue Oct 22 10:33:18 2013 +0200
+
+    0001278: No build possible with current CMake version 2.8.12
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 862cd7b..11c9b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -270,14 +270,14 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X)
+     macro(fc_wrap_cpp outfiles )
+         # get include dirs
+         QT4_GET_MOC_FLAGS(moc_flags)
+-        QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
++        QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN})
+         # fixes bug 0000585: bug with boost 1.48
+         SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+ 
+         foreach(it ${moc_files})
+             get_filename_component(it ${it} ABSOLUTE)
+             QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)
+-            QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
++            QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}")
+             set(${outfiles} ${${outfiles}} ${outfile})
+             add_file_dependencies(${it} ${outfile})
+         endforeach(it)
+diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake
+index 5fa7680..78bc0b8 100644
+--- a/cMake/FreeCadMacros.cmake
++++ b/cMake/FreeCadMacros.cmake
+@@ -168,69 +168,6 @@ endmacro(generate_from_py)
+ #endmacro(qt4_wrap_ui)

+ 

+ 

+-# This is a special version of the built in macro qt4_add_resources that generates .cpp files

+-#

+-#macro(fc_add_resources outfiles )

+-#    #QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})

+-#	set(ARGN )

+-#    foreach (it ${rcc_files})

+-#      get_filename_component(outfilename ${it} NAME_WE)

+-#      get_filename_component(infile ${it} ABSOLUTE)

+-#      get_filename_component(rc_path ${infile} PATH)

+-#      set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)

+-#      #  parse file for dependencies 

+-#      #  all files are absolute paths or relative to the location of the qrc file

+-#      file(READ "${infile}" _RC_FILE_CONTENTS)

+-#      string(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")

+-#      set(_RC_DEPENDS)

+-#      foreach(_RC_FILE ${_RC_FILES})

+-#        string(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")

+-#        string(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")

+-#        if(NOT _ABS_PATH_INDICATOR)

+-#          set(_RC_FILE "${rc_path}/${_RC_FILE}")

+-#        endif(NOT _ABS_PATH_INDICATOR)

+-#        set(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")

+-#      endforeach(_RC_FILE)

+-#      add_custom_command(OUTPUT ${outfile}

+-#        COMMAND ${QT_RCC_EXECUTABLE}

+-#        ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}

+-#        MAIN_DEPENDENCY ${infile}

+-#        DEPENDS ${_RC_DEPENDS})

+-#      set(${outfiles} ${${outfiles}} ${outfile})

+-#    endforeach (it)

+-#endmacro(fc_add_resources)

+-

+-MACRO (fc_add_resources outfiles )

+-  QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})

+-

+-  FOREACH (it ${rcc_files})

+-    GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)

+-    GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)

+-    GET_FILENAME_COMPONENT(rc_path ${infile} PATH)

+-    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)

+-    #  parse file for dependencies 

+-    #  all files are absolute paths or relative to the location of the qrc file

+-    FILE(READ "${infile}" _RC_FILE_CONTENTS)

+-    STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")

+-    SET(_RC_DEPENDS)

+-    FOREACH(_RC_FILE ${_RC_FILES})

+-      STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")

+-      STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")

+-      IF(NOT _ABS_PATH_INDICATOR)

+-        SET(_RC_FILE "${rc_path}/${_RC_FILE}")

+-      ENDIF(NOT _ABS_PATH_INDICATOR)

+-      SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")

+-    ENDFOREACH(_RC_FILE)

+-    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}

+-      COMMAND ${QT_RCC_EXECUTABLE}

+-      ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}

+-      MAIN_DEPENDENCY ${infile}

+-      DEPENDS ${_RC_DEPENDS})

+-    SET(${outfiles} ${${outfiles}} ${outfile})

+-  ENDFOREACH (it)

+-

+-ENDMACRO (fc_add_resources)

+-

+ MACRO(ADD_MSVC_PRECOMPILED_HEADER PrecompiledHeader PrecompiledSource SourcesVar)

+   IF(MSVC)

+     GET_FILENAME_COMPONENT(PrecompiledBasename ${PrecompiledHeader} NAME_WE)

+diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
+index b9f1939..124c4f8 100644
+--- a/src/Gui/CMakeLists.txt
++++ b/src/Gui/CMakeLists.txt
+@@ -608,7 +608,7 @@ SOURCE_GROUP("Widget\\iisTaskPanel\\Mocs" FILES ${iis_MOC_SRCS})
+ #SET(Resource_RCS
+ #   Icons/resource.qrc
+ #   Language/translation.qrc)
+-#fc_add_resources(Resource_SRCS ${Resource_RCS})
++#qt4_add_resources(Resource_SRCS ${Resource_RCS})
+ #SET(Resource_SRCS
+ #   ${Resource_SRCS}
+ #   Icons/resource.qrc
+diff --git a/src/Mod/Image/Gui/AppImageGui.cpp b/src/Mod/Image/Gui/AppImageGui.cpp
+index c26129e..c817860 100644
+--- a/src/Mod/Image/Gui/AppImageGui.cpp
++++ b/src/Mod/Image/Gui/AppImageGui.cpp
+@@ -20,7 +20,6 @@
+ #include <Gui/Language/Translator.h>

+ #include "Workbench.h"

+ #include "ViewProviderImagePlane.h"

+-#include "qrc_Image.cpp"

+ 

+ // use a different name to CreateCommand()

+ void CreateImageCommands(void);

+diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt
+index cc967ee..4edb462 100644
+--- a/src/Mod/Image/Gui/CMakeLists.txt
++++ b/src/Mod/Image/Gui/CMakeLists.txt
+@@ -30,8 +30,7 @@ SET(ImageGui_RES_SRCS
+     Resources/Image.qrc
+ )
+ 
+-fc_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})
+-#QT4_ADD_RESOURCES(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})
++qt4_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})
+ 
+ set(ImageGui_UIC_SRCS
+     ImageOrientationDialog.ui
+@@ -40,7 +39,7 @@ qt4_wrap_ui(ImageGui_UIC_HDRS ${ImageGui_UIC_SRCS})
+ 
+ SET(ImageGui_SRCS
+ #   ${ImageGui_MOC_SRCS}
+-#   ${ImageGui_QRC_SRCS}
++    ${ImageGui_QRC_SRCS}
+     AppImageGui.cpp
+     AppImageGuiPy.cpp
+     Command.cpp
+diff --git a/src/Mod/Mesh/Gui/AppMeshGui.cpp b/src/Mod/Mesh/Gui/AppMeshGui.cpp
+index 624d569..8fb68cf 100644
+--- a/src/Mod/Mesh/Gui/AppMeshGui.cpp
++++ b/src/Mod/Mesh/Gui/AppMeshGui.cpp
+@@ -50,7 +50,6 @@
+ #include "ViewProviderDefects.h"

+ #include "ViewProviderPython.h"

+ #include "Workbench.h"

+-#include "qrc_Mesh.cpp"

+ 

+ 

+ // use a different name to CreateCommand()

+diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt
+index cafca6c..9ef1dae 100644
+--- a/src/Mod/Mesh/Gui/CMakeLists.txt
++++ b/src/Mod/Mesh/Gui/CMakeLists.txt
+@@ -75,9 +75,9 @@ SET(Inventor_SRCS
+ )
+ SOURCE_GROUP("Inventor" FILES ${Inventor_SRCS})
+ 
+-fc_add_resources(resource_SRCS Resources/Mesh.qrc)
++qt4_add_resources(resource_SRCS Resources/Mesh.qrc)
+ SET(resource_SRCS
+-#   ${resource_SRCS}
++    ${resource_SRCS}
+     Resources/Mesh.qrc
+ )
+ SOURCE_GROUP("resource" FILES ${resource_SRCS})
+diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
+index 9c3ebb3..ae84470 100644
+--- a/src/Mod/Part/Gui/AppPartGui.cpp
++++ b/src/Mod/Part/Gui/AppPartGui.cpp
+@@ -57,7 +57,6 @@
+ #include "Workbench.h"

+ 

+ #include <Gui/Language/Translator.h>

+-#include "qrc_Part.cpp"

+ 

+ #include "Resources/icons/PartFeature.xpm"

+ #include "Resources/icons/PartFeatureImport.xpm"

+diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt
+index 375f6e4..87c4c28 100644
+--- a/src/Mod/Part/Gui/CMakeLists.txt
++++ b/src/Mod/Part/Gui/CMakeLists.txt
+@@ -50,7 +50,7 @@ set(PartGui_MOC_HDRS
+ fc_wrap_cpp(PartGui_MOC_SRCS ${PartGui_MOC_HDRS})
+ SOURCE_GROUP("Moc" FILES ${PartGui_MOC_SRCS})
+ 
+-fc_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)
++qt4_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)
+ 
+ set(PartGui_UIC_SRCS
+     CrossSections.ui
+@@ -77,7 +77,7 @@ set(PartGui_UIC_SRCS
+ qt4_wrap_ui(PartGui_UIC_HDRS ${PartGui_UIC_SRCS})
+ 
+ SET(PartGui_SRCS
+-#   ${PartGui_QRC_SRCS}
++    ${PartGui_QRC_SRCS}
+     ${PartGui_UIC_HDRS}
+     AppPartGui.cpp
+     Command.cpp
+diff --git a/src/Mod/Points/Gui/AppPointsGui.cpp b/src/Mod/Points/Gui/AppPointsGui.cpp
+index 9acd98e..953d3e2 100644
+--- a/src/Mod/Points/Gui/AppPointsGui.cpp
++++ b/src/Mod/Points/Gui/AppPointsGui.cpp
+@@ -33,7 +33,6 @@
+ 

+ #include "ViewProvider.h"

+ #include "Workbench.h"

+-#include "qrc_Points.cpp"

+ 

+ // use a different name to CreateCommand()

+ void CreatePointsCommands(void);

+diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt
+index fab12ff..7e30f0d 100644
+--- a/src/Mod/Points/Gui/CMakeLists.txt
++++ b/src/Mod/Points/Gui/CMakeLists.txt
+@@ -32,9 +32,9 @@ SET(Dialogs_SRCS
+ )
+ SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})
+ 
+-fc_add_resources(Resource_SRCS Resources/Points.qrc)
++qt4_add_resources(Resource_SRCS Resources/Points.qrc)
+ SET(Resource_SRCS
+-#   ${Resource_SRCS}
++    ${Resource_SRCS}
+     Resources/Points.qrc
+ )
+ SOURCE_GROUP("Resource" FILES ${Resource_SRCS})
+diff --git a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp
+index 156bd90..c59369a 100644
+--- a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp
++++ b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp
+@@ -32,7 +32,6 @@
+ #include "DlgSettingsRayImp.h"

+ #include "ViewProvider.h"

+ #include "Workbench.h"

+-#include "qrc_Raytracing.cpp"

+ 

+ 

+ using namespace RaytracingGui;

+diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt
+index 38aa739..1da30c9 100644
+--- a/src/Mod/Raytracing/Gui/CMakeLists.txt
++++ b/src/Mod/Raytracing/Gui/CMakeLists.txt
+@@ -43,8 +43,9 @@ set(RaytracingGui_MOC_HDRS
+ fc_wrap_cpp(RaytracingGui_MOC_SRCS ${RaytracingGui_MOC_HDRS})
+ SOURCE_GROUP("Moc" FILES ${RaytracingGui_MOC_SRCS})
+ 
+-fc_add_resources(Resource_SRCS Resources/Raytracing.qrc)
++qt4_add_resources(Resource_SRCS Resources/Raytracing.qrc)
+ SET(Resource_SRCS
++    ${Resource_SRCS}
+     Resources/Raytracing.qrc
+ )
+ SOURCE_GROUP("Resource" FILES ${Resource_SRCS})
+diff --git a/src/Mod/Test/Gui/AppTestGui.cpp b/src/Mod/Test/Gui/AppTestGui.cpp
+index a027d9d..7c2ef21 100644
+--- a/src/Mod/Test/Gui/AppTestGui.cpp
++++ b/src/Mod/Test/Gui/AppTestGui.cpp
+@@ -28,7 +28,6 @@
+ 

+ #include "UnitTestPy.h"

+ #include "UnitTestImp.h"

+-#include "qrc_Test.cpp"

+ 

+ #include <Gui/Language/Translator.h>

+ #include <Base/Console.h>

+diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt
+index 9b8b672..eaa0dcd 100644
+--- a/src/Mod/Test/Gui/CMakeLists.txt
++++ b/src/Mod/Test/Gui/CMakeLists.txt
+@@ -30,9 +30,9 @@ SET(Dialogs_SRCS
+ )
+ SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})
+ 
+-fc_add_resources(Resource_SRCS Resources/Test.qrc)
++qt4_add_resources(Resource_SRCS Resources/Test.qrc)
+ SET(Resource_SRCS
+-#   ${Resource_SRCS}
++    ${Resource_SRCS}
+     Resources/Test.qrc
+ )
+ SOURCE_GROUP("Resource" FILES ${Resource_SRCS})
diff --git a/media-gfx/freecad/files/freecad-0.13.1830-no-machdist.patch b/media-gfx/freecad/files/freecad-0.13.1830-no-machdist.patch
new file mode 100644
index 000000000000..9e02f1b8b37d
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.13.1830-no-machdist.patch
@@ -0,0 +1,11 @@
+--- src/Mod/CMakeLists.txt	2013-02-02 18:09:17.000000000 +0100
++++ src/Mod/CMakeLists.txt.new	2014-01-19 18:00:27.215825143 +0100
+@@ -18,7 +18,7 @@
+     MESSAGE("Due to the missing Eigen3 library the Sketcher module won't be built")
+     MESSAGE("Due to the missing Eigen3 library the Robot module won't be built")
+ ENDIF(EIGEN3_FOUND)
+-add_subdirectory(Machining_Distortion)
++#add_subdirectory(Machining_Distortion)
+ 
+ add_subdirectory(ReverseEngineering)
+ add_subdirectory(MeshPart)
diff --git a/media-gfx/freecad/files/freecad-0.13.1830-occ-6.7.patch b/media-gfx/freecad/files/freecad-0.13.1830-occ-6.7.patch
new file mode 100644
index 000000000000..410929bec851
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.13.1830-occ-6.7.patch
@@ -0,0 +1,63 @@
+commit c1d14eab3c3f9f1141dc0b7fca7cc4441431b50b
+Author: wmayer <wmayer@users.sourceforge.net>
+Date:   Sat Dec 28 12:22:31 2013 +0100
+
+    + Fix OCC 6.7 build failure
+
+diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp
+index 578f5be..bdc91c3 100644
+--- a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp
++++ b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp
+@@ -29,6 +29,7 @@
+ # include <TopoDS.hxx>
+ # include <TopoDS_Wire.hxx>
+ # include <BRepOffsetAPI_MakePipeShell.hxx>
++# include <Standard_Version.hxx>
+ # include <TopTools_ListIteratorOfListOfShape.hxx>
+ #endif
+ 
+@@ -111,6 +112,36 @@ PyObject* BRepOffsetAPI_MakePipeShellPy::setSpineSupport(PyObject *args)
+ 
+ PyObject* BRepOffsetAPI_MakePipeShellPy::setAuxiliarySpine(PyObject *args)
+ {
++#if OCC_VERSION_HEX >= 0x060700
++    PyObject *spine, *curv, *keep;
++    if (!PyArg_ParseTuple(args, "O!O!O!",&Part::TopoShapePy::Type,&spine
++                                        ,&PyBool_Type,&curv
++                                        ,&PyInt_Type,&keep))
++        return 0;
++    const TopoDS_Shape& s = static_cast<Part::TopoShapePy*>(spine)->getTopoShapePtr()->_Shape;
++    if (s.IsNull() || s.ShapeType() != TopAbs_WIRE) {
++        PyErr_SetString(PyExc_TypeError, "spine is not a wire");
++        return 0;
++    }
++
++    BRepFill_TypeOfContact typeOfCantact;
++    switch (PyLong_AsLong(keep)) {
++    case 1:
++        typeOfCantact = BRepFill_Contact;
++        break;
++    case 2:
++        typeOfCantact = BRepFill_ContactOnBorder;
++        break;
++    default:
++        typeOfCantact = BRepFill_NoContact;
++        break;
++    }
++    this->getBRepOffsetAPI_MakePipeShellPtr()->SetMode(
++        TopoDS::Wire(s),
++        PyObject_IsTrue(curv) ? Standard_True : Standard_False,
++        typeOfCantact);
++    Py_Return;
++#else
+     PyObject *spine, *curv, *keep;
+     if (!PyArg_ParseTuple(args, "O!O!O!",&Part::TopoShapePy::Type,&spine
+                                         ,&PyBool_Type,&curv
+@@ -127,6 +158,7 @@ PyObject* BRepOffsetAPI_MakePipeShellPy::setAuxiliarySpine(PyObject *args)
+         PyObject_IsTrue(curv) ? Standard_True : Standard_False,
+         PyObject_IsTrue(keep) ? Standard_True : Standard_False);
+     Py_Return;
++#endif
+ }
+ 
+ PyObject* BRepOffsetAPI_MakePipeShellPy::add(PyObject *args)
diff --git a/media-gfx/freecad/files/freecad-0.13.1830-startpage-links.patch b/media-gfx/freecad/files/freecad-0.13.1830-startpage-links.patch
new file mode 100644
index 000000000000..f8af21c2b3e3
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.13.1830-startpage-links.patch
@@ -0,0 +1,97 @@
+commit dbdff257966c65feed6dd9360bc3d50549d9c4c9
+Author: Yorik van Havre <yorik@uncreated.net>
+Date:   Thu Sep 12 00:30:59 2013 -0300
+
+    Startpage: Fixed links
+
+diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py
+index 478bf40..43985f3 100644
+--- a/src/Mod/Start/StartPage/StartPage.py
++++ b/src/Mod/Start/StartPage/StartPage.py
+@@ -84,7 +84,7 @@ text34 = translate("StartPage","creation time:")
+ text35 = translate("StartPage","last modified:")

+ text36 = translate("StartPage","location:")

+ text37 = translate("StartPage","User manual")

+-text38 = translate("StartPage","http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Online_Help_Toc")

++text38 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Online_Help_Toc")

+ text39 = translate("StartPage","Tutorials")

+ text40 = translate("StartPage","Python resources")

+ text41 = translate("StartPage","File not found")

+@@ -97,7 +97,7 @@ text47 = translate("StartPage","The section of the FreeCAd website dedicate dto
+ text48 = translate("StartPage","A blog dedicated to teaching FreeCAD, maintained by members of the FreeCAD community")

+ text49 = translate("StartPage","Getting started")

+ text50 = translate("StartPage","The FreeCAD interface is divided in workbenches, which are sets of tools suited for a specific task. You can start with one of the workbenches in this list, or with the complete workbench, which presents you with some of the most used tools gathered from other workbenches. Click to read more about workbenches on the FreeCAD website.")

+-text51 = translate("StartPage","http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Workbench_Concept")

++text51 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Workbench_Concept")

+ text52 = translate("StartPage","Ship Design")

+ text53 = translate("StartPage","Designing and calculating ships")

+ text54 = translate("StartPage","The <b>Ship Design</b> module offers several tools to help ship designers to view, model and calculate profiles and other specific properties of ship hulls.")

+@@ -159,7 +159,7 @@ page = """
+             ddiv.innerHTML = "Done fetching";

+             ddiv = document.getElementById("news");

+             ddiv.innerHTML = "Fetching data from the web...";

+-            var tobj=new JSONscriptRequest('http://twitter.com/status/user_timeline/FreeCADNews.json?count=10&callback=showTweets');

++            var tobj=new JSONscriptRequest('http://pipes.yahoo.com/pipes/pipe.run?_id=da8b612e97a6bb4588b1ce27db30efd9&_render=json&_callback=showTweets');

+             tobj.buildScriptTag(); // Build the script tag

+             tobj.addScriptTag(); // Execute (add) the script tag

+             ddiv.innerHTML = "Done fetching";

+@@ -182,19 +182,13 @@ page = """
+             ddiv = document.getElementById('news');

+             ddiv.innerHTML = "Received";

+             var html = ['<ul>'];

+-            for (var i = 0; i < Math.min(5,data.length); i++) {

+-                tf = placeLinks(data[i].text);

+-                html.push('<li>',tf,'</li>');

++            for (var i = 0; i < 8; i++) {

++                html.push('<li><a href="', data.value.items[i].link, '">', data.value.items[i].title, '</a></li>');

+             }

+             html.push('</ul>');

+             ddiv.innerHTML = html.join('');

+         }

+ 

+-        function placeLinks(text) {

+-            result=text.replace(/(https?:\/\/([-\w\.]+)+(:\d+)?(\/([\w\/_\.]*(\?\S+)?)?)?)/g,'<a href="$1">$1</a>');

+-            return result;

+-        }

+-

+     </script>

+ 

+     <style type="text/css">

+@@ -286,12 +280,12 @@ page = """
+       </div>

+ 

+       <div class="block">

+-        <h2>""" + text04 + """ <span class="from">""" + text44 + """</span></h2>

++        <h2>""" + text04 + """</h2>

+         <div id="youtube">youtube videos</div>

+       </div>

+ 

+       <div class="block">

+-        <h2>""" + text05 + """ <span class="from">""" + text42 + """</span></h2>

++        <h2>""" + text05 + """</h2>

+         <div id="news">news feed</div>

+       </div>

+ 

+@@ -354,7 +348,7 @@ def getLinks():
+         <li><img src="web.png">&nbsp;

+             <a onMouseover="show('<p>""" + text07 + """</p>')" 

+                 onMouseout="show('')"

+-                href="http://free-cad.sf.net/">""" + text08 + """</a></li>

++                href="http://www.freecadweb.org/">""" + text08 + """</a></li>

+         <li><img src="web.png">&nbsp;

+             <a onMouseover="show('<p>""" + text45 + """</p>')" 

+                 onMouseout="show('')"

+@@ -362,11 +356,11 @@ def getLinks():
+         <li><img src="web.png">&nbsp;

+             <a onMouseover="show('<p>""" + text46 + """</p>')" 

+                 onMouseout="show('')"

+-                href="http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Tutorials">""" + text39 + """</a></li>

++                href="http://www.freecadweb.org/wiki/index.php?title=Tutorials">""" + text39 + """</a></li>

+         <li><img src="web.png">&nbsp;

+             <a onMouseover="show('<p>""" + text47 + """</p>')" 

+                 onMouseout="show('')"

+-                href="http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Power_users_hub">""" + text40 + """</a></li>

++                href="http://www.freecadweb.org/wiki/index.php?title=Power_users_hub">""" + text40 + """</a></li>

+         <li><img src="web.png">&nbsp;

+             <a onMouseover="show('<p>""" + text48 + """</p>')" 

+                 onMouseout="show('')"

diff --git a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
new file mode 100644
index 000000000000..3e648613f660
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.1 2014/04/24 04:48:11 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit cmake-utils eutils fortran-2 multilib python-single-r1
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="http://www.freecadweb.org/"
+SRC_URI="mirror://sourceforge/free-cad/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+COMMON_DEPEND="dev-cpp/eigen:3
+	dev-games/ode
+	dev-libs/boost
+	dev-libs/libf2c
+	dev-libs/libspnav[X]
+	dev-libs/xerces-c[icu]
+	dev-python/matplotlib
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
+	dev-qt/qtxmlpatterns:4
+	media-libs/SoQt
+	media-libs/coin[doc]
+	sci-libs/gts
+	sci-libs/opencascade
+	sys-libs/zlib
+	virtual/glu
+	${PYTHON_DEPS}"
+RDEPEND="${COMMON_DEPEND}
+	dev-qt/assistant:4
+	dev-python/pycollada
+	dev-python/pivy
+	dev-python/PyQt4[svg]
+	dev-python/pyopencl
+	dev-python/numpy"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/swig-2.0.4-r1:0"
+
+# http://bugs.gentoo.org/show_bug.cgi?id=352435
+# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+RESTRICT="bindist mirror"
+
+# TODO:
+#   DEPEND and RDEPEND:
+#		salome-smesh - science overlay
+#		zipio++ - not in portage yet
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	einfo remove bundled libs
+	rm -rf src/3rdParty/{boost,Pivy*}
+
+	epatch "${FILESDIR}"/${P}-remove-qt3-support.patch
+	epatch "${FILESDIR}"/${P}-cmake-2.8.12.patch
+	epatch "${FILESDIR}"/${P}-CMakefile.patch
+	epatch "${FILESDIR}"/${P}-avoid-include-salome.patch
+	epatch "${FILESDIR}"/${P}-startpage-links.patch
+	#epatch "${FILESDIR}"/startpage.patch
+
+	# disable Machining Distortion workbench because FEM will be disabled in src_configure()
+	# and also because the same module has been removed upstream (commit c0e2c9)
+	epatch "${FILESDIR}"/${P}-no-machdist.patch
+
+	local my_cas_version=$(eselect opencascade show 2>/dev/null || echo 6.5)
+	if [ "${my_cas_version}" \> "6.5.0" ] ; then
+		epatch  "${FILESDIR}"/${PN}-0.12.5284-occ-6.6.patch
+		epatch  "${FILESDIR}"/${P}-occ-6.7.patch
+	fi
+
+	einfo "Patching cMake/FindCoin3DDoc.cmake ..."
+	local my_coin_version=$(best_version media-libs/coin)
+	local my_coin_path="${EROOT}"usr/share/doc/${my_coin_version##*/}/html
+	sed -e "s:/usr/share/doc/libcoin60-doc/html:${my_coin_path}:" \
+		-i cMake/FindCoin3DDoc.cmake || die
+}
+
+src_configure() {
+	local my_occ_env=${EROOT}etc/env.d/50opencascade
+	if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then
+		my_occ_env=${EROOT}etc/env.d/51opencascade
+	fi
+	export CASROOT=$(sed -ne '/^CASROOT=/{s:.*=:: ; p}' $my_occ_env)
+
+	local mycmakeargs=(
+		-DOCC_INCLUDE_DIR="${CASROOT}"/inc
+		-DOCC_INCLUDE_PATH="${CASROOT}"/inc
+		-DOCC_LIBRARY="${CASROOT}"/lib/libTKernel.so
+		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
+		-DOCC_LIB_PATH="${CASROOT}"/lib
+		-DCOIN3D_INCLUDE_DIR="${EROOT}"usr/include/coin
+		-DCOIN3D_LIBRARY="${EROOT}"usr/$(get_libdir)/libCoin.so
+		-DSOQT_LIBRARY="${EROOT}"usr/$(get_libdir)/libSoQt.so
+		-DSOQT_INCLUDE_PATH="${EROOT}"usr/include/coin
+		-DCMAKE_INSTALL_PREFIX="${EROOT}"usr/$(get_libdir)/${P}
+		-DCMAKE_INSTALL_DATADIR="${EROOT}"usr/share/${P}/
+		-DCMAKE_INSTALL_DOCDIR="${EROOT}"usr/share/doc/${P}/
+		-DCMAKE_INSTALL_INCLUDEDIR="${EROOT}"usr/include/${P}/
+		-DFREECAD_USE_EXTERNAL_PIVY="ON"
+		-DFREECAD_BUILD_FEM="OFF"
+	)
+
+	# TODO to remove embedded dependencies:
+	#
+	#	-DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++ 
+	#                (under src/zipios++) will be used 
+	#	salomesmesh is in 3rdparty but upstream's find_package function is not complete yet to compile against external version
+	#                (external salomesmesh is available in "science" overlay)
+
+	cmake-utils_src_configure
+	ewarn "${P} will be built against opencascade version ${CASROOT}"
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	prune_libtool_files
+
+	make_wrapper FreeCAD \
+		"${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCAD \
+		"" "${EROOT}"usr/$(get_libdir)/${P}/lib
+	make_wrapper FreeCADCmd \
+		"${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCADCmd \
+		"" "${EROOT}"usr/$(get_libdir)/${P}/lib
+
+	newicon src/Main/icon.ico ${PN}.ico
+	make_desktop_entry FreeCAD
+
+	dodoc README.Linux ChangeLog.txt
+
+	# disable compression of QT assistant help files
+	>> "${ED}"usr/share/doc/${P}/freecad.qhc.ecompress.skip
+	>> "${ED}"usr/share/doc/${P}/freecad.qch.ecompress.skip
+
+	python_optimize "${ED}"usr/{$(get_libdir),share}/${P}/Mod/
+}