summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gmail.com>2014-03-04 04:44:45 +0400
committerAndrew Savchenko <bircoph@gmail.com>2014-03-04 04:44:45 +0400
commit8437758223c0f29cda83a5657c91ad60a31be1de (patch)
tree13f87e3a71777ff71a141e1a8476101a4eb9c463 /media-gfx
parentnip2: version bump (diff)
downloadbircoph-8437758223c0f29cda83a5657c91ad60a31be1de.tar.gz
bircoph-8437758223c0f29cda83a5657c91ad60a31be1de.tar.bz2
bircoph-8437758223c0f29cda83a5657c91ad60a31be1de.zip
Add new version of freecad and deps
See bugs 457830, 498592.
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/freecad/ChangeLog81
-rw-r--r--media-gfx/freecad/Manifest12
-rw-r--r--media-gfx/freecad/files/freecad-0.12.5284-occ-6.6.patch68
-rw-r--r--media-gfx/freecad/files/freecad-0.13.1830-CMakefile.patch21
-rw-r--r--media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch15
-rw-r--r--media-gfx/freecad/files/freecad-0.13.1830-cmake-2.8.12.patch294
-rw-r--r--media-gfx/freecad/files/freecad-0.13.1830-no-machdist.patch11
-rw-r--r--media-gfx/freecad/files/freecad-0.13.1830-occ-6.7.patch63
-rw-r--r--media-gfx/freecad/files/freecad-0.13.1830-remove-qt3-support.patch33
-rw-r--r--media-gfx/freecad/files/freecad-0.13.1830-startpage-links.patch97
-rw-r--r--media-gfx/freecad/freecad-0.13.1830.ebuild145
-rw-r--r--media-gfx/freecad/metadata.xml9
12 files changed, 849 insertions, 0 deletions
diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
new file mode 100644
index 0000000..049ea39
--- /dev/null
+++ b/media-gfx/freecad/ChangeLog
@@ -0,0 +1,81 @@
+# ChangeLog for media-gfx/freecad
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.16 2013/05/09 08:36:38 xmw Exp $
+
+ 09 May 2013; Michael Weber <xmw@gentoo.org> freecad-0.13.1830.ebuild:
+ Fix S (thanks Alessio De Marchi, bug 469064)
+
+*freecad-0.13.1830 (27 Apr 2013)
+*freecad-0.12.5284-r3 (27 Apr 2013)
+
+ 27 Apr 2013; Michael Weber <xmw@gentoo.org> +freecad-0.12.5284-r3.ebuild,
+ +files/freecad-0.12.5284-no-3rdParty.patch,
+ +files/freecad-0.12.5284-no-permissive.patch,
+ +files/freecad-0.12.5284-occ-6.5.5.patch, +freecad-0.13.1830.ebuild,
+ +files/freecad-0.13.1830-remove-qt3-support.patch, metadata.xml:
+ Taking main, revbump to fix automagic dep on libspnav[x] (bug 454150), add
+ launcher icon (bug 416327), remove bundled libs (bug 467482), fix install
+ path (bug 464854)
+
+ 07 Mar 2013; Ian Stakenvicius <axs@gentoo.org> freecad-0.12.5284-r2.ebuild:
+ adjust dependency of xerces-c, re-fixing bug 295849
+
+ 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
+ freecad-0.12.5284-r2.ebuild:
+ Move Qt dependencies to the new category
+
+ 19 Oct 2012; Justin Lecher <jlec@gentoo.org> freecad-0.12.5284-r2.ebuild,
+ metadata.xml:
+ Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+ updated fortran-2.eclass
+
+ 16 Sep 2012; Pacho Ramos <pacho@gentoo.org> freecad-0.12.5284-r2.ebuild:
+ Add missing virtual/glu dependency, bug #434428 by Andreas Sturmlechner.
+
+ 24 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
+ Drop maintainership
+
+ 06 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ freecad-0.12.5284-r2.ebuild, +files/freecad-0.12.5284-boost148.patch:
+ Add upstream patch to fix build with boost-1.48, bug 406261
+
+ 07 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ -freecad-0.11.3729.ebuild, -files/freecad-0.11.3729-asneeded.patch:
+ Remove old
+
+ 07 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ freecad-0.12.5284-r2.ebuild, +files/freecad-0.12.5284-qt3support.patch:
+ Remove last remnants of qt3support, thanks to Tyrok and Rafał Mużyło, bug
+ 394099
+
+*freecad-0.12.5284-r2 (07 Jan 2012)
+
+ 07 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ +freecad-0.12.5284-r2.ebuild, +files/freecad-0.12.5284-gcc46.patch,
+ +files/freecad-0.12.5284-glu.patch, +files/freecad-0.12.5284-nodir.patch,
+ +files/freecad-0.12.5284-nopivy.patch,
+ +files/freecad-0.12.5284-removeoldswig.patch:
+ Version bump. Thanks to Maciej Szmigiero for patches.
+
+ 13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ freecad-0.11.3729.ebuild:
+ This version of freecad requires OCC-6.3
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> freecad-0.11.3729.ebuild:
+ Add dependency on virtual/fortran
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> freecad-0.11.3729.ebuild:
+ Added fortran-2.eclass support
+
+ 10 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ freecad-0.11.3729.ebuild:
+ Needs PyQt4[svg], bug 362679
+
+*freecad-0.11.3729 (06 Mar 2011)
+
+ 06 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +freecad-0.11.3729.ebuild, +files/freecad-0.11.3729-asneeded.patch,
+ +metadata.xml:
+ New application, fixes bug 291161; imported from the sci overlay with
+ cleanups. Thanks to Roelof Wobben, Derk W. te Bokkel, cornicx, and all the
+ other contributors from the bug report and the overlay.
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
new file mode 100644
index 0000000..50b691b
--- /dev/null
+++ b/media-gfx/freecad/Manifest
@@ -0,0 +1,12 @@
+AUX freecad-0.12.5284-occ-6.6.patch 2391 SHA256 80567a10fe854c86f7767e4f2dcc255f4a135098d280ed1fecff25dbf7b564af SHA512 7123e9ea9a7327ba2590b8bc0160804558a6c3b5cb30fffbab354777bef8cfb08e8f9d9bab3c8b99f5efe2d274c0a4f2392cae1bd59defed51be48053835d27b WHIRLPOOL ae24640d9af494f51407d4ebcdc1a6765b98d94715459984dd78379dea786de827a48e9067880e6d718c281e326091be08d2ceeaa85b072d7d9488e4c48c821e
+AUX freecad-0.13.1830-CMakefile.patch 1028 SHA256 57e5d5ac39a8ff9cfdbaaeb723a6bd8eff4556575bc3ff1384e79fe136b7274b SHA512 8bb0effd1094a860aa527a04fd88d104a380faa178e3aaf07b722feb0378a01e09864f9f2b6d0706bbb19c8217c80b37de46a5e5094ca19924c10d2418944dec WHIRLPOOL 28de8725f048dfe182a2df2346b19a64cd4d4dc061c1d07710076d4e9f277dcb9b46a1e38b000e5184040d615c7c7350d9815702023c5ca75e8905ca3b39d68e
+AUX freecad-0.13.1830-avoid-include-salome.patch 561 SHA256 560e467c6ecb4f21cfce7524714d5091657834a6c3ff12fb9d8e6e953efd1da8 SHA512 d895e1df5832a561db6959aca0137ff66b392cd56cd396dec50c7d3ceef9ffe0d222c335135caee3500860195b0171f74d077038b5aa484eb5a6057d44e84cb5 WHIRLPOOL 3d89481717ba28e6f10183ee68c94152a4981121ebd938f964c2260d01524d4c4ce091ad3f773704f8d632c6e25ae8c6faf15622e74e9fd29d3db59b0a3bde69
+AUX freecad-0.13.1830-cmake-2.8.12.patch 10945 SHA256 d0670c1087d0e665cf06c06a0af317556bebe4545ec250ed54cca2ba336e7ab5 SHA512 5f4b6c266be5ad41751c84498c75789f7c966e25af8be2e6ff38b8fa4f064d31f45c6cfcb9359dcdf67f6e2314d3d389634a4f0ac5f0a7195d81c994d8aa353c WHIRLPOOL 172c38e8a5c80f232be84dfa42791c4babc3f8c67a781c3d68bf597f0fd8baa664b4763631f570ed0d784c21a6448861b60bb11a25de04a304b7b4c246f9fd11
+AUX freecad-0.13.1830-no-machdist.patch 485 SHA256 342a8e337b9506851afab664644ef2043aa42611b23832234e1653f2de126358 SHA512 082a9af89fee5ce6d1012cbcf22bec2b13e7a79b3c7b1a13d65f56b846d5ddb6e835d4093c436173902cbaeb6975648a0c136ed3bddc0e1bd35937bedee94dad WHIRLPOOL 0b08c958e619e1f66b9e8c6778e44a8d81e9fce5a8553631c599e1be8507e0ff6d78f2afa1d2e7dbed81a9c2fa9744584c4df6fb1b600e9e8a413708f3e38102
+AUX freecad-0.13.1830-occ-6.7.patch 2354 SHA256 3c5ce4fdb5af8c39309ccb50ee4f8244c388907b90d92b9cad873992cf3d8bad SHA512 b3cbcdfec41a1504801b64aeffb9f3b95a0ced141fab0e8a72aba038209b956ab6204ee63d815a8d4361ef98e10d5c86cb01538f9489eabe5fe4615ed24bfcb3 WHIRLPOOL 2836fc785dd3a08572bb318cb254360b07e6246b32f72434e159ca3f130886677c07cc283812ac86040362efbed3e0996e5d627d5b0a5d02d7c950197584a902
+AUX freecad-0.13.1830-remove-qt3-support.patch 1165 SHA256 dab93f53d16aa2b22a4c97203efb3dbe87562c7afeb6d3a3bef3f26492344f59 SHA512 479d2b5f1e5e8a1d0ffac6eb0ae3ef913530a700cabbee160471c131b1a898063be9feebb38e8870691da9d81e66924784e157a524339103713a2691ce3e6ae5 WHIRLPOOL 28c78c61de550964d6e12033bcf53876eeff2e474af67f6274f6eb0734ede7d00adb4bcd7e0a16556a1a90660c1a15d9ebf1e1b245da5bb377ccb7824d26224b
+AUX freecad-0.13.1830-startpage-links.patch 5549 SHA256 14913231fd7f0314bc4c4c7be0c3b9ee689aea98ded2269a40b8e855c15da225 SHA512 1365d2099121a4aa186f6efbb9ff2345d8cec698226ea04ca81ee5b4da6759fb9944382eccafadc622969910c410f3afc07e8387287ad765518c49130fc75f9e WHIRLPOOL f26f73b76ce1734b5cc973f726a723dd23f0e6968b7a246b3ae3fbadcaf6e08d087c45aa99e472597bb5b9e8a297b36dcfc8e0ff6e33a56408b467216bdacffe
+DIST freecad-0.13.1830.tar.gz 70168706 SHA256 550ed16225e4cd67a463ae9b826f3a64edf7d2819cc8d235b15a89e10be72f13 SHA512 3e8d4eed8cace38da9615965f79a2b0da21d31a6df793ceaf3f732e0abd5666e9715ec9eb162e6ff998718e8d609a7dff2d0993b28f493200b734318a2322160 WHIRLPOOL 6d41565423edf8a0c67901a8559600ff1088f645c3ecb4aad8d7597490522f80d6475af3e7f5a623fc30b4d1571187bf6e6a132e6c480825798b957bea90bb83
+EBUILD freecad-0.13.1830.ebuild 4454 SHA256 0feff831f666f107a900b0d47fc18cfe6f13568375278f91805ad6c30a41b111 SHA512 d0b8f2e1a0103716b9e5cb227009eff83953090a5cf6e99fa977331fdb5c9005f5f9fcae4d7b82fcf3cce0a88868a6bcbf0f7756d093d0b56d306f6ba8750f34 WHIRLPOOL 69ea4f04de05f3726076871a81f437ee8e5f45b539aea5ea7af777c4fcdb7ebb197f23df7525aa51a08421a438ee32ab1b66f25da389f0810cfa12ff9e477446
+MISC ChangeLog 3368 SHA256 1cdc3ef549cc1ef5e4a0f6f225adafcf37aa4d820eaf2a44d111d5e08f88f424 SHA512 f5e4106780f812acacc18d5249cb3e1e7689f729ca5d4b8808b805bf327879d83a8482200b51fdc0272d23ac2284907b3a67b64b5182fe02568ea098ff4ee87b WHIRLPOOL 7e473c085d3ad73aa2afe9ae50f4b3ed7053d46d108ed0e227e9703637e996c0ad95e498a4b60b82cf9d403e5ae2dacffa6ce44a397e78e58f347c16550a3d2b
+MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
diff --git a/media-gfx/freecad/files/freecad-0.12.5284-occ-6.6.patch b/media-gfx/freecad/files/freecad-0.12.5284-occ-6.6.patch
new file mode 100644
index 0000000..ef04309
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.12.5284-occ-6.6.patch
@@ -0,0 +1,68 @@
+--- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp 2014-01-05 10:38:36.000000000 +0100
++++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp 2014-01-05 10:39:33.000000000 +0100
+@@ -42,10 +42,14 @@
+
+ #include "utilities.h"
+
++#include <Standard_Version.hxx>
+ #include <BRepAdaptor_Curve.hxx>
+ #include <BRepBuilderAPI_MakeEdge.hxx>
+ #include <BRepTools.hxx>
+ #include <BRep_Tool.hxx>
++#if OCC_VERSION_HEX >= 0x060600
++#include <BRepClass3d.hxx>
++#endif
+ #include <TopExp_Explorer.hxx>
+ #include <TopoDS.hxx>
+ #include <TopoDS_Shell.hxx>
+@@ -161,7 +165,11 @@ bool StdMeshers_RadialPrism_3D::Compute(
+
+ // get 2 shells
+ TopoDS_Solid solid = TopoDS::Solid( aShape );
++#if OCC_VERSION_HEX >= 0x060600
++ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
++#else
+ TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
++#endif
+ TopoDS_Shape innerShell;
+ int nbShells = 0;
+ for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
+@@ -401,7 +409,11 @@ bool StdMeshers_RadialPrism_3D::Evaluate
+ {
+ // get 2 shells
+ TopoDS_Solid solid = TopoDS::Solid( aShape );
++#if OCC_VERSION_HEX >= 0x060600
++ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
++#else
+ TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
++#endif
+ TopoDS_Shape innerShell;
+ int nbShells = 0;
+ for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
+--- a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp 2014-01-05 10:38:49.000000000 +0100
++++ b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp 2014-01-05 10:39:20.000000000 +0100
+@@ -23,8 +23,12 @@
+
+ #include "PreCompiled.h"
+
++#include <Standard_Version.hxx>
+ #include <BRepGProp.hxx>
+ #include <BRepTools.hxx>
++#if OCC_VERSION_HEX >= 0x060600
++#include <BRepClass3d.hxx>
++#endif
+ #include <GProp_GProps.hxx>
+ #include <BRepBuilderAPI_MakeSolid.hxx>
+ #include <TopExp_Explorer.hxx>
+@@ -104,7 +108,11 @@ Py::Object TopoShapeSolidPy::getOuterShe
+ TopoDS_Shell shell;
+ const TopoDS_Shape& shape = getTopoShapePtr()->_Shape;
+ if (!shape.IsNull() && shape.ShapeType() == TopAbs_SOLID)
++#if OCC_VERSION_HEX >= 0x060600
++ shell = BRepClass3d::OuterShell(TopoDS::Solid(shape));
++#else
+ shell = BRepTools::OuterShell(TopoDS::Solid(shape));
++#endif
+ return Py::Object(new TopoShapeShellPy(new TopoShape(shell)),true);
+ }
+
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 0000000..58e9958
--- /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 0000000..351b0d2
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch
@@ -0,0 +1,15 @@
+--- 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,8 @@
+ 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*"
+- )
++ # 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 0000000..e0e0e9f
--- /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 0000000..9e02f1b
--- /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 0000000..410929b
--- /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-remove-qt3-support.patch b/media-gfx/freecad/files/freecad-0.13.1830-remove-qt3-support.patch
new file mode 100644
index 0000000..8f761d8
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.13.1830-remove-qt3-support.patch
@@ -0,0 +1,33 @@
+--- freecad-0.13.1830/src/Mod/Arch/Resources/ui/archprefs-base.ui
++++ freecad-0.13.1830/src/Mod/Arch/Resources/ui/archprefs-base.ui
+@@ -309,7 +309,7 @@
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
++ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>Gui::ColorButton</class>
+--- freecad-0.13.1830/src/Mod/Draft/Resources/ui/userprefs-base.ui
++++ freecad-0.13.1830/src/Mod/Draft/Resources/ui/userprefs-base.ui
+@@ -1185,7 +1185,7 @@
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
++ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>Gui::FileChooser</class>
+--- freecad-0.13.1830/src/Mod/Draft/Resources/ui/userprefs-import.ui
++++ freecad-0.13.1830/src/Mod/Draft/Resources/ui/userprefs-import.ui
+@@ -536,7 +536,7 @@
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
++ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>Gui::FileChooser</class>
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 0000000..f8af21c
--- /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.ebuild b/media-gfx/freecad/freecad-0.13.1830.ebuild
new file mode 100644
index 0000000..e0138e0
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.13.1830.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2013 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.ebuild,v 1.2 2013/05/09 08:36:38 xmw Exp $
+
+EAPI=5
+
+PYTHON_DEPEND=2
+
+inherit eutils multilib fortran-2 python cmake-utils
+
+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="~amd64"
+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"
+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_set_active_version 2
+}
+
+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
+
+ # 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
+}
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
new file mode 100644
index 0000000..59acc2c
--- /dev/null
+++ b/media-gfx/freecad/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+