subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-gfx\/freecad\/"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

2024-06-03 Thread Andrew Ammerlaan

commit: 08ebd7d12caf2b39beec97a97a3f7253477b46b1
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Jun  3 14:50:21 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jun  3 14:50:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ebd7d1

media-gfx/freecad: backport various qt6 fixes

enable py3.12 for qt6 builds

Bug: https://bugs.gentoo.org/933439
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../freecad/files/freecad-0.21.2-navcube-qt6.patch |  29 
 .../freecad/files/freecad-0.21.2-py312-qt6.patch   | 186 +
 .../freecad/files/freecad-0.21.2-qtsvg-qt6.patch   | 148 
 ...d-0.21.2-r2.ebuild => freecad-0.21.2-r3.ebuild} |  18 +-
 media-gfx/freecad/freecad-.ebuild  |   8 +-
 5 files changed, 380 insertions(+), 9 deletions(-)

diff --git a/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch 
b/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch
new file mode 100644
index ..0ab999771068
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch
@@ -0,0 +1,29 @@
+From ccaee18917432fd02e4371a7847bdfaf0692edd1 Mon Sep 17 00:00:00 2001
+From: Martin Rodriguez Reboredo 
+Date: Sun, 19 May 2024 23:23:45 -0300
+Subject: [PATCH] Gui: Fix NaviCube for Qt6
+
+---
+ src/Gui/NaviCube.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp
+index 2d164f196b3c..9e3a62d66c81 100644
+--- a/src/Gui/NaviCube.cpp
 b/src/Gui/NaviCube.cpp
+@@ -926,6 +926,7 @@ NaviCubeImplementation::PickId 
NaviCubeImplementation::pickFace(short x, short y
+ GLubyte pixels[4] = {0};
+ if (m_PickingFramebuffer && std::abs(x) <= m_CubeWidgetSize / 2 &&
+ std::abs(y) <= m_CubeWidgetSize / 2) {
++
static_cast(m_View3DInventorViewer->viewport())->makeCurrent();
+ m_PickingFramebuffer->bind();
+ 
+ glViewport(0, 0, m_CubeWidgetSize * 2, m_CubeWidgetSize * 2);
+@@ -936,6 +937,7 @@ NaviCubeImplementation::PickId 
NaviCubeImplementation::pickFace(short x, short y
+ glReadPixels(2 * x + m_CubeWidgetSize, 2 * y + m_CubeWidgetSize, 1, 1,
+  GL_RGBA, GL_UNSIGNED_BYTE, );
+ m_PickingFramebuffer->release();
++
static_cast(m_View3DInventorViewer->viewport())->doneCurrent();
+ }
+ return pixels[3] == 255 ? static_cast(pixels[0]) : PickId::None;
+ }

diff --git a/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch 
b/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch
new file mode 100644
index ..c1fe31ab05ad
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch
@@ -0,0 +1,186 @@
+From 6043c90462e85fbf15e30ea4c7da7d9a22d570f2 Mon Sep 17 00:00:00 2001
+From: wmayer 
+Date: Wed, 7 Feb 2024 15:25:13 +0100
+Subject: [PATCH] Py3.12: harmonize with upstream of PyCXX
+
+---
+ src/CXX/IndirectPythonInterface.cxx | 36 +++--
+ src/CXX/Python3/IndirectPythonInterface.hxx |  6 ++--
+ src/CXX/Python3/cxx_extensions.cxx  |  2 +-
+ src/CXX/Python3/cxxextensions.c | 10 ++
+ src/CXX/Version.hxx |  2 +-
+ 5 files changed, 42 insertions(+), 14 deletions(-)
+
+diff --git a/src/CXX/IndirectPythonInterface.cxx 
b/src/CXX/IndirectPythonInterface.cxx
+index 3d810cea88a5..fc9e45cbd64f 100644
+--- a/src/CXX/IndirectPythonInterface.cxx
 b/src/CXX/IndirectPythonInterface.cxx
+@@ -122,17 +122,21 @@ static PyTypeObject *ptr__Bytes_Type = NULL;
+ #  endif
+ 
+ #  if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API )
++#if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION 
<= 11)
+ static int *ptr_Py_DebugFlag = NULL;
+ static int *ptr_Py_InteractiveFlag = NULL;
+ static int *ptr_Py_OptimizeFlag = NULL;
+ static int *ptr_Py_NoSiteFlag = NULL;
+ static int *ptr_Py_VerboseFlag = NULL;
++#endif
+ 
+-#   if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
++#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11
++#  if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
+ static const char **ptr__Py_PackageContext = NULL;
+-#   else
++#  else
+ static char **ptr__Py_PackageContext = NULL;
+-#   endif
++#  endif
++#endif
+ #  endif
+ 
+ #  ifdef Py_REF_DEBUG
+@@ -242,17 +246,21 @@ bool InitialisePythonIndirectInterface()
+ ptr_Py_RefTotal = GetInt_as_IntPointer( "_Py_RefTotal" );
+ #  endif
+ #  if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API )
++#if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION 
<= 11)
+ ptr_Py_DebugFlag= GetInt_as_IntPointer( "Py_DebugFlag" );
+ ptr_Py_InteractiveFlag  = GetInt_as_IntPointer( "Py_InteractiveFlag" 
);
+ ptr_Py_OptimizeFlag = GetInt_as_IntPointer( "Py_OptimizeFlag" );
+ ptr_Py_NoSiteFlag   = GetInt_as_IntPointer( "Py_NoSiteFlag" );
+ ptr_Py_VerboseFlag  = GetInt_as_IntPointer( "Py_VerboseFlag" );
++#endif
+ 
+-#

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

2024-05-29 Thread Andrew Ammerlaan

commit: 4f8dbb6345ae081b5bb65af4ea20c0c8eb09e92e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed May 29 17:06:56 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed May 29 17:07:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8dbb63

media-gfx/freecad: fix build with boost 1.75

and properly pass through arguments in wrapper

Closes: https://bugs.gentoo.org/932454
Closes: https://bugs.gentoo.org/932818
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../freecad/files/freecad-0.21.2-boost-175-1.patch | 22 +++
 .../freecad/files/freecad-0.21.2-boost-175-2.patch | 22 +++
 .../freecad/files/freecad-0.21.2-boost-175-3.patch | 25 ++
 media-gfx/freecad/freecad-0.21.2-r2.ebuild |  5 -
 media-gfx/freecad/freecad-.ebuild  |  2 +-
 5 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch 
b/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch
new file mode 100644
index ..cbb78d5bdc94
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch
@@ -0,0 +1,22 @@
+From f555a25f9e67e628e8075fc8599d7c11807eaddd Mon Sep 17 00:00:00 2001
+From: wmayer 
+Date: Sun, 21 Apr 2024 08:36:16 +0200
+Subject: [PATCH] Fixes #13549: smesh doesn't compile with boost 1.85
+
+---
+ src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp 
b/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp
+index d72ff2363f39..f108cbbcb2cf 100644
+--- a/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp
 b/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp
+@@ -55,7 +55,7 @@ namespace DriverGMF
+ 
+   bool isExtensionCorrect( const std::string& fileName )
+   {
+-std::string ext  = boost::filesystem::extension(fileName);
++std::string ext = boost::filesystem::path(fileName).extension().string();
+ switch ( ext.size() ) {
+ case 5: return ( ext == ".mesh" || ext == ".solb" );
+ case 6: return ( ext == ".meshb" );

diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch 
b/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch
new file mode 100644
index ..5f0807028859
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch
@@ -0,0 +1,22 @@
+From aa54ba73df4d42878130c99688be35acf10725a0 Mon Sep 17 00:00:00 2001
+From: ppphp 
+Date: Sat, 30 Mar 2024 13:52:32 +0800
+Subject: [PATCH] fix: c++20 deprecate copy_option
+
+---
+ src/Gui/PreferencePackManager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Gui/PreferencePackManager.cpp 
b/src/Gui/PreferencePackManager.cpp
+index e0e6184a3147..e1773a436852 100644
+--- a/src/Gui/PreferencePackManager.cpp
 b/src/Gui/PreferencePackManager.cpp
+@@ -224,7 +224,7 @@ void Gui::PreferencePackManager::importConfig(const 
std::string& packName,
+ auto savedPreferencePacksDirectory =
+ fs::path(App::Application::getUserAppDataDir()) / 
"SavedPreferencePacks";
+ auto cfgFilename = savedPreferencePacksDirectory / packName / (packName + 
".cfg");
+-fs::copy_file(path, cfgFilename, fs::copy_option::overwrite_if_exists);
++fs::copy_file(path, cfgFilename, fs::copy_options::overwrite_existing);
+ rescan();
+ }
+ 

diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch 
b/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch
new file mode 100644
index ..c4c8039dab49
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch
@@ -0,0 +1,25 @@
+From 91457bbdee2422c7f0372688cf72d021cf222073 Mon Sep 17 00:00:00 2001
+From: ppphp 
+Date: Sat, 30 Mar 2024 19:17:56 +0800
+Subject: [PATCH] add version check macro for compatibility
+
+---
+ src/Gui/PreferencePackManager.cpp | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/Gui/PreferencePackManager.cpp 
b/src/Gui/PreferencePackManager.cpp
+index e1773a436852..dfc54240c00c 100644
+--- a/src/Gui/PreferencePackManager.cpp
 b/src/Gui/PreferencePackManager.cpp
+@@ -224,7 +224,11 @@ void Gui::PreferencePackManager::importConfig(const 
std::string& packName,
+ auto savedPreferencePacksDirectory =
+ fs::path(App::Application::getUserAppDataDir()) / 
"SavedPreferencePacks";
+ auto cfgFilename = savedPreferencePacksDirectory / packName / (packName + 
".cfg");
++#if BOOST_VERSION >= 107400
+ fs::copy_file(path, cfgFilename, fs::copy_options::overwrite_existing);
++#else
++fs::copy_file(path, cfgFilename, fs::copy_option::overwrite_if_exists);
++#endif
+ rescan();
+ }
+ 

diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild 
b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
index b0f1d3fac470..b65ac07c0858 100644
--- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
@@ -165,6 +165,9 @@ PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2024-05-07 Thread Andrew Ammerlaan

commit: 9161542718b9840ff37f5c27b22b7c3a8e3fd214
Author: Yehoshua Pesach Wallach  gmail  com>
AuthorDate: Sun Apr  7 15:51:09 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue May  7 12:52:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91615427

media-gfx/freecad: adds upstream patch for compiling with VTK-9.3

Closes: https://bugs.gentoo.org/928879
Signed-off-by: Yehoshua Pesach Wallach  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36153
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../freecad/files/freecad-0.21.2-vtk9.3-fix.patch  | 33 ++
 media-gfx/freecad/freecad-0.21.2-r2.ebuild |  5 ++--
 media-gfx/freecad/freecad-.ebuild  |  4 +--
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch 
b/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch
new file mode 100644
index ..b41e3618f55f
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch
@@ -0,0 +1,33 @@
+# fix for compiling with VTK 9.3
+https://github.com/FreeCAD/FreeCAD/pull/11496/commits/68d380a64e033c40fcb9a6dc322d9e0178de52ee
+Bug: https://forum.freecad.org/viewtopic.php?t=82814
+patch by adrianinsaval (commited in 68d380a64e033c40fcb9a6dc322d9e0178de52ee)
+
+--- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
 b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
+@@ -39,10 +39,6 @@
+  #define SMDS_EXPORT
+ #endif
+ 
+-#ifdef VTK_HAS_MTIME_TYPE
+ #define VTK_MTIME_TYPE vtkMTimeType
+-#else
+-#define VTK_MTIME_TYPE unsigned long
+-#endif
+ 
+ #endif
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
 b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks()
+   GetLinks()->Allocate(this->GetNumberOfPoints());
+   GetLinks()->Register(this);
+ //FIXME: vtk9
++#if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0)
+   GetLinks()->BuildLinks(this);
++#else
++  GetLinks()->SetDataSet(this);
++  GetLinks()->BuildLinks();
++#endif
+   GetLinks()->Delete();
+ #else
+   this->links = smds_celllinks::new();

diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild 
b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
index 9d461dec5d65..b0f1d3fac470 100644
--- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
@@ -73,8 +73,8 @@ RDEPEND="
net-misc/curl
)
fem? (
-   !qt6? ( =media-libs/coin-4.0.0
@@ -164,6 +164,7 @@ REQUIRED_USE="
 PATCHES=(

"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
"${FILESDIR}"/${PN}-0.21.1-Gentoo-specific-don-t-check-vcs.patch
+   "${FILESDIR}"/${PN}-0.21.2-vtk9.3-fix.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md README.md )

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 76f8dae4592e..ad9a9580164b 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -74,8 +74,8 @@ RDEPEND="
net-misc/curl
)
fem? (
-   !qt6? ( =media-libs/coin-4.0.0

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/

2024-04-18 Thread Conrad Kostecki

commit: bf464abcf4c1b867f3894abe0f5f5a17708a0987
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Apr 18 18:09:06 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Apr 18 19:31:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf464abc

media-gfx/freecad: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...-0001-Gentoo-specific-Remove-ccache-usage.patch | 23 --
 ...ad-0.19.4-Gentoo-specific-don-t-check-vcs.patch | 20 -
 ...FreeCAD-segfaults-being-run-with-paramete.patch | 22 -
 ...tgen-add-headers-to-support-recent-Netgen.patch | 93 --
 ...20.2-libE57Format-fix-compile-using-gcc13.patch | 24 --
 5 files changed, 182 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
deleted file mode 100644
index 8e875c1811f5..
--- 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 74664bf8c9142320be335ab91dca53cb1a1187a2 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Fri, 12 Mar 2021 23:55:09 +0100
-Subject: [PATCH] [Gentoo specific] Remove ccache usage
-
-Signed-off-by: Bernd Waibel 
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,11 +8,6 @@ if (POLICY CMP0072)
- cmake_policy(SET CMP0072 OLD)
- endif(POLICY CMP0072)
- 
--find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
--if(CCACHE_PROGRAM)
--set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
--endif()
--
- project(FreeCAD)
- 
- set(PACKAGE_VERSION_NAME "Vulcan")
--- 
-2.30.1
-

diff --git 
a/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch 
b/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch
deleted file mode 100644
index 62ae92392adf..
--- 
a/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 60ba533d21302b8a4c11ac06adb53b4041754b02 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Tue, 1 Mar 2022 18:22:00 +0100
-Subject: [PATCH] [Gentoo specific] don't check vcs
-
-Signed-off-by: Bernd Waibel 
 a/src/Tools/SubWCRev.py
-+++ b/src/Tools/SubWCRev.py
-@@ -455,7 +455,7 @@ def main():
- if o in ("-b", "--bindir"):
- bindir = a
- 
--vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), 
MercurialControl(), DebianChangelog(), UnknownControl()]
-+vcs=[UnknownControl()]
- for i in vcs:
- if i.extractInfo(srcdir, bindir):
- # Open the template file and the version file
--- 
-2.35.1
-

diff --git 
a/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
 
b/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
deleted file mode 100644
index 44d49ca3bf94..
--- 
a/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/FreeCAD/FreeCAD/commit/c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476
-
-From c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476 Mon Sep 17 00:00:00 2001
-From: wmayer 
-Date: Sat, 11 Feb 2023 17:47:49 +0100
-Subject: [PATCH 02/51] Fixes #8206: FreeCAD segfaults being run with
- parameters (e.g .desktop file has /usr/bin/freecad --single-instance)
-
 a/src/Base/Interpreter.cpp
-+++ b/src/Base/Interpreter.cpp
-@@ -563,7 +563,7 @@ void initInterpreter(int argc,char *argv[])
- {
- PyStatus status;
- PyConfig config;
--PyConfig_InitPythonConfig();
-+PyConfig_InitIsolatedConfig();
- 
- status = PyConfig_SetBytesArgv(, argc, argv);
- if (PyStatus_Exception(status)) {
--- 
-2.39.1
-

diff --git 
a/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
 
b/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
deleted file mode 100644
index 402c84ee4d28..
--- 
a/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://github.com/FreeCAD/FreeCAD/commit/8b056f156fd087b3df36a5223fc5ca6900649a83
-
-From 8b056f156fd087b3df36a5223fc5ca6900649a83 Mon Sep 17 00:00:00 2001
-From: Uwe 
-Date: Wed, 17 Aug 2022 12:32:02 +0200
-Subject: [PATCH 0008/1678] [Netgen] add headers to support recent Netgen
-
-- as reported here: https://forum.freecadweb.org/viewtopic.php?p=618174#p618174
-- also fix compiler warnings about unsafe bool handling
 a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
-+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
-@@ -50,7 +50,9 @@
- 
- #include 
- 
-+#include 
- #include 
-+#include 
- #include

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2024-04-15 Thread Andrew Ammerlaan

commit: 0eedd9b5a7ec4102b47f3925cfcb61ac204ddd53
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Apr 15 09:34:10 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Apr 15 09:34:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eedd9b5

media-gfx/freecad: drop 0.20.2, 0.20.2-r1, 0.20.2-r2

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/Manifest |   1 -
 media-gfx/freecad/freecad-0.20.2-r1.ebuild | 330 -
 media-gfx/freecad/freecad-0.20.2-r2.ebuild | 329 
 media-gfx/freecad/freecad-0.20.2.ebuild| 307 ---
 4 files changed, 967 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index fa2b9363a973..9f6735199db5 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1 @@
-DIST freecad-0.20.2.tar.gz 7561 BLAKE2B 
278b05a3fe3bdccb46da62926aee46f066cb073f034b273dc4d8b27975724b754a6822b7eb0b673500db4592237690decb830cc7a30e8da689c6b067c256d4f8
 SHA512 
c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d
 DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 
84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78
 SHA512 
bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5

diff --git a/media-gfx/freecad/freecad-0.20.2-r1.ebuild 
b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
deleted file mode 100644
index 90b88e029c9b..
--- a/media-gfx/freecad/freecad-0.20.2-r1.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit check-reqs cmake flag-o-matic optfeature python-single-r1 xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
-
-MY_PN=FreeCAD
-
-if [[ ${PV} = * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
-   S="${WORKDIR}/freecad-${PV}"
-else
-   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64"
-   S="${WORKDIR}/FreeCAD-${PV}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="debug designer +gui test"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
-FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
-   openscad part-design path points raytracing robot show surface
-   techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
-   IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-   IUSE="${IUSE} ${module}"
-done
-unset module
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-libs/OpenNI2[opengl(+)]
-   dev-libs/boost:=
-   dev-libs/libspnav[X]
-   dev-libs/xerces-c[icu]
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
-   media-libs/freetype
-   media-libs/qhull:=
-   sci-libs/flann[openmp]
-   sci-libs/hdf5:=[fortran,zlib]
-   >=sci-libs/med-4.0.0-r1
-   =media-libs/coin-4.0.0
-   virtual/glu
-   virtual/opengl
-   $(python_gen_cond_dep '
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-   
dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
-   dev-python/shiboken2[${PYTHON_USEDEP}]
-   ')
-   )
-   netgen? ( media-gfx/netgen[opencascade] )
-   openscad? ( media-gfx/openscad )
-   pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] )
-   $(python_gen_cond_dep '
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/pybind11[${PYTHON_USEDEP}]
-   addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
-   fem? ( dev-python/ply[${PYTHON_USEDEP}] )
-   ')
-"
-DEPEND="
-   ${RDEPEND}
-   >=dev-cpp/eigen-3.3.1:3
-   test? (
-   $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-   dev-qt/qttest:5
-   )
-"
-BDEPEND="
-   app-text/dos2unix
-   dev-lang/swig
-   test? (
-   $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-   dev-qt/qttest:5
-   )
-"
-
-# To get required dependencies:
-# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-# We set the following requirements by default:
-# arch, draft, drawing,

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2024-04-15 Thread Joonas Niilola

commit: 2d57c7592bfd79795fbebaae588f8a86e2450d0b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Apr 15 08:38:08 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Apr 15 08:38:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d57c759

media-gfx/freecad: Stabilize 0.21.2-r2 amd64, #928344

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-0.21.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild 
b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
index 33eb615da690..9d461dec5d65 100644
--- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = * ]]; then
S="${WORKDIR}/freecad-${PV}"
 else

SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
S="${WORKDIR}/FreeCAD-${PV}"
 fi

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

2024-04-14 Thread Andrew Ammerlaan

commit: 91f702aa09d2fd99e78bb974ae80440daf8dc74b
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Apr 14 08:53:53 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Apr 14 08:53:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f702aa

media-gfx/freecad: add patch for build with shiboken 6.7.0

patch is added conditional because not sure what this does with older shiboken

and block against opencascade[inspector] which breaks qt6 configure

Bug: https://bugs.gentoo.org/929973
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch | 8 
 media-gfx/freecad/freecad-0.21.2-r2.ebuild  | 6 ++
 2 files changed, 14 insertions(+)

diff --git a/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch 
b/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch
new file mode 100644
index ..8efd55121ee7
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/929973
+--- a/src/Gui/PythonWrapper.cpp
 b/src/Gui/PythonWrapper.cpp
+@@ -480,3 +480,3 @@
+ return false;
+-types = Shiboken::Module::getTypes(requiredModule);
++types = reinterpret_cast(Shiboken::Module::getTypes(requiredModule));
+ }

diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild 
b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
index f0c0f0c47bbb..33eb615da690 100644
--- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
@@ -98,6 +98,7 @@ RDEPEND="
' python3_{10..11} )
)
qt6? (
+   sci-libs/opencascade[-inspector(-)]
designer? ( dev-qt/qttools:6[designer] )
dev-qt/qt5compat:6
dev-qt/qttools:6[widgets]
@@ -181,6 +182,11 @@ src_prepare() {
 
find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert 
to unix line endings"
 
+   if has_version ">=dev-python/shiboken6-6.7.0"; then
+   # https://bugs.gentoo.org/929973
+   eapply "${FILESDIR}/${PN}-0.21.2-shiboken-6.7.0.patch"
+   fi
+
cmake_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2024-03-26 Thread Sam James

commit: 6c824d8c17318aa42970dde16ab6ab616eca38db
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Mar 27 00:49:33 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 27 02:56:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c824d8c

media-gfx/freecad: mark as LTO-unsafe

Closes: https://bugs.gentoo.org/875221
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-0.20.2-r1.ebuild | 7 ++-
 media-gfx/freecad/freecad-0.20.2-r2.ebuild | 7 ++-
 media-gfx/freecad/freecad-0.21.2-r2.ebuild | 7 ++-
 media-gfx/freecad/freecad-.ebuild  | 7 ++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.20.2-r1.ebuild 
b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
index 56776f593336..90b88e029c9b 100644
--- a/media-gfx/freecad/freecad-0.20.2-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit check-reqs cmake optfeature python-single-r1 xdg
+inherit check-reqs cmake flag-o-matic optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
@@ -162,6 +162,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr, -Werror=lto-type-mismatch
+   # https://bugs.gentoo.org/875221
+   # https://github.com/FreeCAD/FreeCAD/issues/13173
+   filter-lto
+
local mycmakeargs=(
-DBUILD_ADDONMGR=$(usex addonmgr)
-DBUILD_ARCH=ON

diff --git a/media-gfx/freecad/freecad-0.20.2-r2.ebuild 
b/media-gfx/freecad/freecad-0.20.2-r2.ebuild
index 4e0963bd788f..986a290c62ea 100644
--- a/media-gfx/freecad/freecad-0.20.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit check-reqs cmake optfeature python-single-r1 xdg
+inherit check-reqs cmake flag-o-matic optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
@@ -161,6 +161,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr, -Werror=lto-type-mismatch
+   # https://bugs.gentoo.org/875221
+   # https://github.com/FreeCAD/FreeCAD/issues/13173
+   filter-lto
+
local mycmakeargs=(
-DBUILD_ADDONMGR=$(usex addonmgr)
-DBUILD_ARCH=ON

diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild 
b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
index 0186a45ed151..f0c0f0c47bbb 100644
--- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit check-reqs cmake optfeature python-single-r1 qmake-utils xdg
+inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils 
xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
@@ -185,6 +185,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr, -Werror=lto-type-mismatch
+   # https://bugs.gentoo.org/875221
+   # https://github.com/FreeCAD/FreeCAD/issues/13173
+   filter-lto
+
local mycmakeargs=(
-DBUILD_ADDONMGR=$(usex addonmgr)
-DBUILD_ARCH=ON

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 804b83dc404f..76f8dae4592e 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit check-reqs cmake optfeature python-single-r1 qmake-utils xdg
+inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils 
xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
@@ -189,6 +189,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr, -Werror=lto-type-mismatch
+   # https://bugs.gentoo.org/875221
+   # https://github.com/FreeCAD/FreeCAD/issues/13173
+   filter-lto
+
local mycmakeargs=(
-DBUILD_ADDONMGR=$(usex addonmgr)
-DBUILD_ARCH=ON

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2024-03-24 Thread Andrew Ammerlaan

commit: 8d139bd5e62466ce9156fd2f015331c85ff90c06
Author: Huang Rui  gmail  com>
AuthorDate: Sun Mar 24 07:49:34 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Mar 24 13:52:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d139bd5

media-gfx/freecad: add depend https://bugs.gentoo.org/927660
Signed-off-by: Huang Rui  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35896
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/freecad-0.21.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild 
b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
index f92180406ef2..0186a45ed151 100644
--- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
@@ -64,7 +64,7 @@ RDEPEND="
media-libs/qhull:=
sci-libs/hdf5:=[fortran,zlib]
>=sci-libs/med-4.0.0-r1
-   sci-libs/opencascade:=[json,vtk]
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2024-03-23 Thread Andrew Ammerlaan

commit: aec924cd3c64f2c349cea2ef26acc2fe1757c546
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Mar 23 11:20:26 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Mar 23 11:20:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec924cd

media-gfx/freecad: update vtk dependency

Bug: https://bugs.gentoo.org/927222
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/freecad-0.20.2-r1.ebuild | 4 ++--
 media-gfx/freecad/freecad-0.20.2-r2.ebuild | 4 ++--
 media-gfx/freecad/freecad-0.20.2.ebuild| 4 ++--
 media-gfx/freecad/freecad-0.21.2-r2.ebuild | 4 ++--
 media-gfx/freecad/freecad-.ebuild  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.20.2-r1.ebuild 
b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
index a0b180e9df32..56776f593336 100644
--- a/media-gfx/freecad/freecad-0.20.2-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -67,7 +67,7 @@ RDEPEND="
dev-libs/openssl:=
net-misc/curl
)
-   fem? ( sci-libs/vtk:=[qt5,rendering] )
+   fem? ( =media-libs/coin-4.0.0

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2024-03-09 Thread Andrew Ammerlaan

commit: c83045924d872c14c684ea0bae88a49bec3cdcac
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Mar  9 10:04:03 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Mar  9 10:16:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8304592

media-gfx/freecad: fix build with qt6

- Drawing module is unmaintained and not ported to qt6.

- With the shiboken6 fix from b6bfb7ce52d2f05ed2deda2aa94bf46e51d56844 it
now compiles successfully.

- Sync the  ebuild

- Add yaml-cpp dep to  ebuild

Closes: https://bugs.gentoo.org/920579
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../{freecad-0.21.2-r1.ebuild => freecad-0.21.2-r2.ebuild}| 11 ++-
 media-gfx/freecad/freecad-.ebuild | 11 ---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.21.2-r1.ebuild 
b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
similarity index 98%
rename from media-gfx/freecad/freecad-0.21.2-r1.ebuild
rename to media-gfx/freecad/freecad-0.21.2-r2.ebuild
index 3df16ee39b5c..6f67542fe86c 100644
--- a/media-gfx/freecad/freecad-0.21.2-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit check-reqs cmake optfeature python-single-r1 qmake-utils xdg
 
@@ -59,7 +59,6 @@ RDEPEND="
)
qt6? (
dev-qt/qtbase:6[concurrent,network,xml]
-   dev-qt/qt5compat:6
)
media-libs/freetype
media-libs/qhull:=
@@ -100,6 +99,7 @@ RDEPEND="
)
qt6? (
designer? ( dev-qt/qttools:6[designer] )
+   dev-qt/qt5compat:6
dev-qt/qttools:6[widgets]
dev-qt/qtbase:6[gui,opengl,widgets]
dev-qt/qtsvg:6
@@ -158,9 +158,7 @@ REQUIRED_USE="
designer? ( gui )
inspection? ( points )
path? ( robot )
-   python_single_target_python3_12? ( gui? ( qt6 ) )
 "
-# There is no py3.12 support planned for pyside2
 
 PATCHES=(

"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
@@ -195,7 +193,6 @@ src_configure() {
-DBUILD_COMPLETE=OFF# 
deprecated
-DBUILD_DRAFT=ON
-DBUILD_DESIGNER_PLUGIN=$(usex designer)
-   -DBUILD_DRAWING=ON
-DBUILD_ENABLE_CXX_STD:STRING="C++17"   # needed for 
>=boost-1.77.0
-DBUILD_FEM=$(usex fem)
-DBUILD_FEM_NETGEN=$(usex netgen)
@@ -280,6 +277,8 @@ src_configure() {
-DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc"
-DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc"
-DBUILD_QT5=OFF
+   # Drawing module unmaintained and not ported to qt6
+   -DBUILD_DRAWING=OFF
)
else
mycmakeargs+=(
@@ -289,6 +288,8 @@ src_configure() {
-DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc"
-DBUILD_QT5=ON
+   # Drawing module unmaintained and not ported to qt6
+   -DBUILD_DRAWING=ON
)
fi
 

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index e9f4f85bd609..05acf4426854 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -45,6 +45,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
${PYTHON_DEPS}
+   dev-cpp/yaml-cpp
dev-libs/OpenNI2[opengl(+)]
dev-libs/boost:=
dev-libs/libfmt:=
@@ -59,7 +60,6 @@ RDEPEND="
)
qt6? (
dev-qt/qtbase:6[concurrent,network,xml]
-   dev-qt/qt5compat:6
)
media-libs/freetype
media-libs/qhull:=
@@ -99,7 +99,9 @@ RDEPEND="
' python3_{10..11} )
)
qt6? (
-   dev-qt/qttools:6[designer]
+   designer? ( dev-qt/qttools:6[designer] )
+   dev-qt/qt5compat:6
+   dev-qt/qttools:6[widgets]
dev-qt/qtbase:6[gui,opengl,widgets]
dev-qt/qtsvg:6
dev-qt/qtwebengine:6[widgets]
@@ -195,7 +197,6 @@ src_configure() {
-DBUILD_COMPLETE=OFF# 
deprecated
-DBUILD_DRAFT=ON
-DBUILD_DESIGNER_PLUGIN=$(usex designer)
-   -DBUILD_DRAWING=ON
-DBUILD_ENABLE_CXX_STD:STRING="C++17"   # needed for current 
git master
-DBUILD_FEM=$(usex fem)
-DBUILD_FEM_NETGEN=$(usex netgen)
@@ -280,6

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2024-03-08 Thread Andrew Ammerlaan

commit: ab7ba7c063d9d8e22c5eb76f08da5daff5949640
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Mar  9 07:23:12 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Mar  9 07:23:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7ba7c0

media-gfx/freecad: add dep on qt5compat for qt6

Closes: https://bugs.gentoo.org/923958
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/freecad-0.21.2-r1.ebuild | 1 +
 media-gfx/freecad/freecad-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-gfx/freecad/freecad-0.21.2-r1.ebuild 
b/media-gfx/freecad/freecad-0.21.2-r1.ebuild
index a2c42145c9aa..3df16ee39b5c 100644
--- a/media-gfx/freecad/freecad-0.21.2-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r1.ebuild
@@ -59,6 +59,7 @@ RDEPEND="
)
qt6? (
dev-qt/qtbase:6[concurrent,network,xml]
+   dev-qt/qt5compat:6
)
media-libs/freetype
media-libs/qhull:=

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index afcff7e93e63..e9f4f85bd609 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -59,6 +59,7 @@ RDEPEND="
)
qt6? (
dev-qt/qtbase:6[concurrent,network,xml]
+   dev-qt/qt5compat:6
)
media-libs/freetype
media-libs/qhull:=

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2024-01-05 Thread Andrew Ammerlaan

commit: 88fa919633c4a2289bf6ff08b9f53dfa334d2634
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan  5 13:10:35 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan  5 13:11:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88fa9196

media-gfx/freecad: fix uitools dep for qt6

no revbump because qt6 flag is masked anyway

Bug: https://bugs.gentoo.org/921298
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/freecad-0.21.2-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-0.21.2-r1.ebuild 
b/media-gfx/freecad/freecad-0.21.2-r1.ebuild
index 6b5043dde5d2..a2c42145c9aa 100644
--- a/media-gfx/freecad/freecad-0.21.2-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r1.ebuild
@@ -98,7 +98,8 @@ RDEPEND="
' python3_{10..11} )
)
qt6? (
-   dev-qt/qttools:6[designer]
+   designer? ( dev-qt/qttools:6[designer] )
+   dev-qt/qttools:6[widgets]
dev-qt/qtbase:6[gui,opengl,widgets]
dev-qt/qtsvg:6
dev-qt/qtwebengine:6[widgets]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2024-01-05 Thread Andrew Ammerlaan

commit: a0c575c52de9730980683c2f458bceda127be3eb
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan  5 10:22:53 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan  5 10:23:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0c575c5

media-gfx/freecad: fix qt5 build, fix designer dep

Closes: https://bugs.gentoo.org/919492
Closes: https://bugs.gentoo.org/921298
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...{freecad-0.21.2.ebuild => freecad-0.21.2-r1.ebuild} | 18 +-
 media-gfx/freecad/freecad-.ebuild  | 18 +-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.21.2.ebuild 
b/media-gfx/freecad/freecad-0.21.2-r1.ebuild
similarity index 95%
rename from media-gfx/freecad/freecad-0.21.2.ebuild
rename to media-gfx/freecad/freecad-0.21.2-r1.ebuild
index 1932b59458c1..6b5043dde5d2 100644
--- a/media-gfx/freecad/freecad-0.21.2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit check-reqs cmake optfeature python-single-r1 xdg
+inherit check-reqs cmake optfeature python-single-r1 qmake-utils xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
@@ -81,7 +81,7 @@ RDEPEND="
virtual/glu
virtual/opengl
!qt6? (
-   designer? ( dev-qt/designer:5 )
+   dev-qt/designer:5
dev-qt/qtgui:5
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
@@ -89,6 +89,7 @@ RDEPEND="
dev-qt/qtwebengine:5[widgets]
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
+   pcl? ( sci-libs/pcl[qt5] )
$(python_gen_cond_dep '
dev-python/matplotlib[${PYTHON_USEDEP}]
>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
@@ -97,10 +98,11 @@ RDEPEND="
' python3_{10..11} )
)
qt6? (
-   designer? ( dev-qt/qttools:6[designer] )
+   dev-qt/qttools:6[designer]
dev-qt/qtbase:6[gui,opengl,widgets]
dev-qt/qtsvg:6
dev-qt/qtwebengine:6[widgets]
+   pcl? ( sci-libs/pcl[-qt5,qt6(-)] )
$(python_gen_cond_dep '
dev-python/matplotlib[${PYTHON_USEDEP}]
>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
@@ -111,7 +113,7 @@ RDEPEND="
)
netgen? ( media-gfx/netgen[opencascade] )
openscad? ( media-gfx/openscad )
-   pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] )
+   pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] )
$(python_gen_cond_dep '
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pybind11[${PYTHON_USEDEP}]
@@ -270,14 +272,20 @@ src_configure() {
 
if use qt6; then
mycmakeargs+=(
+   -DFREECAD_QT_MAJOR_VERSION=6
-DFREECAD_QT_VERSION=6
-DQT_DEFAULT_MAJOR_VERSION=6
+   -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc"
+   -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc"
-DBUILD_QT5=OFF
)
else
mycmakeargs+=(
+   -DFREECAD_QT_MAJOR_VERSION=5
-DFREECAD_QT_VERSION=5
-DQT_DEFAULT_MAJOR_VERSION=5
+   -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+   -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc"
-DBUILD_QT5=ON
)
fi

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 37978aa661a6..afcff7e93e63 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit check-reqs cmake optfeature python-single-r1 xdg
+inherit check-reqs cmake optfeature python-single-r1 qmake-utils xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
@@ -81,7 +81,7 @@ RDEPEND="
virtual/glu
virtual/opengl
!qt6? (
-   designer? (

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2023-11-25 Thread Miroslav Šulc

commit: 8f8a611a99e48aceed2593fbf7ff10679364e371
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Nov 25 09:11:38 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Nov 25 09:11:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8a611a

media-gfx/freecad: org.freecadweb.FreeCAD.desktop renamed to 
org.freecad.FreeCAD.desktop in live ebuild

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/freecad/freecad-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 3865d158c785..37978aa661a6 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -176,7 +176,7 @@ pkg_setup() {
 
 src_prepare() {
# Fix desktop file
-   sed -e 's/Exec=FreeCAD/Exec=freecad/' -i 
src/XDGData/org.freecadweb.FreeCAD.desktop || die
+   sed -e 's/Exec=FreeCAD/Exec=freecad/' -i 
src/XDGData/org.freecad.FreeCAD.desktop || die
 
find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert 
to unix line endings"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2023-11-20 Thread Andrew Ammerlaan

commit: 56e9e13f30ff75b96635b73dce92a0a3ab67e565
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Nov 20 19:36:39 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Nov 20 19:42:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e9e13f

media-gfx/freecad: depend on vtk[-qt5] if USE=qt6

This fixes the configure phase, however it still fails to compile for qt6
so the use.mask stays in place for now

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/freecad-0.21.2.ebuild | 2 +-
 media-gfx/freecad/freecad-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.21.2.ebuild 
b/media-gfx/freecad/freecad-0.21.2.ebuild
index c99cbce11039..1932b59458c1 100644
--- a/media-gfx/freecad/freecad-0.21.2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
)
fem? (
!qt6? ( sci-libs/vtk:=[qt5,rendering] )
-   qt6? ( sci-libs/vtk:=[qt6,rendering] )
+   qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
)
gui? (
>=media-libs/coin-4.0.0

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index d174541cdb9c..3865d158c785 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
)
fem? (
!qt6? ( sci-libs/vtk:=[qt5,rendering] )
-   qt6? ( sci-libs/vtk:=[qt6,rendering] )
+   qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
)
gui? (
>=media-libs/coin-4.0.0

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, profiles/base/, media-gfx/freecad/files/

2023-11-20 Thread Andrew Ammerlaan

commit: 59d9b399367d52b2ff249acaf1445ab4c098795e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Nov 20 15:00:41 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Nov 20 15:06:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d9b399

media-gfx/freecad: bump to 0.21.2

- /usr/bin/freecad is no longer a symlink, instead it is a wrapper
that ensure freecad is executed in xwayland. It still crashes in
native wayland mode.

- dropped opencascade dependency restriction

- adjusted configure phase for qt6 compatibility. The qt6 flag is still
masked for now as there is still some problem when building for qt6

- added python3.12: this requires qt6 since there will likely be no
further python compatibility updates for shiboken2/pyside2

- only depend on qtdesigner if USE=designer

Bug: https://bugs.gentoo.org/869686
Closes: https://bugs.gentoo.org/916386
Closes: https://bugs.gentoo.org/917262
Co-authored-by: Jörg Habenicht  gmx.de>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/Manifest |   1 +
 ...ad-0.21.1-Gentoo-specific-don-t-check-vcs.patch |  16 
 .../{freecad-.ebuild => freecad-0.21.2.ebuild} | 104 ++---
 media-gfx/freecad/freecad-.ebuild  |  99 ++--
 profiles/base/package.use.mask |   7 ++
 5 files changed, 166 insertions(+), 61 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 0973d9d48798..fa2b9363a973 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1 +1,2 @@
 DIST freecad-0.20.2.tar.gz 7561 BLAKE2B 
278b05a3fe3bdccb46da62926aee46f066cb073f034b273dc4d8b27975724b754a6822b7eb0b673500db4592237690decb830cc7a30e8da689c6b067c256d4f8
 SHA512 
c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d
+DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 
84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78
 SHA512 
bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5

diff --git 
a/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch 
b/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index ..3d851c341e2e
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,16 @@
+Signed-off-by: Jörg Habenicht 
+--- a/src/Tools/SubWCRev.py
 b/src/Tools/SubWCRev.py
+@@ -509,12 +509,6 @@
+ bindir = a
+ 
+ vcs = [
+-GitControl(),
+-DebianGitHub(),
+-BazaarControl(),
+-Subversion(),
+-MercurialControl(),
+-DebianChangelog(),
+ UnknownControl(),
+ ]
+ for i in vcs:

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-0.21.2.ebuild
similarity index 82%
copy from media-gfx/freecad/freecad-.ebuild
copy to media-gfx/freecad/freecad-0.21.2.ebuild
index 73fd4eaff9a1..c99cbce11039 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit check-reqs cmake optfeature python-single-r1 xdg
 
@@ -26,7 +26,7 @@ fi
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="debug designer +gui test"
+IUSE="debug designer +gui qt6 test"
 
 FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
@@ -50,11 +50,16 @@ RDEPEND="
dev-libs/libfmt:=
dev-libs/libspnav[X]
dev-libs/xerces-c[icu]
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
+   !qt6? (
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtxml:5
+   dev-qt/qtxmlpatterns:5
+   )
+   qt6? (
+   dev-qt/qtbase:6[concurrent,network,xml]
+   )
media-libs/freetype
media-libs/qhull:=
sci-libs/hdf5:=[fortran,zlib]
@@ -67,25 +72,42 @@ RDEPEND="
dev-libs/openssl:=
net-misc/curl
)
-   fem? ( sci-libs/vtk:=[qt5,rendering] )
+   fem? (
+   !qt6? ( sci-libs/vtk:=[qt5,rendering] )
+   qt6? ( sci-libs/vtk:=[qt6,rendering] )
+   )
gui? (
-   dev-qt/designer:5
-   dev-qt/qtgui:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

2023-08-19 Thread Miroslav Šulc

commit: 4226f432c5291af081cde0ca9bfb662a5ab4b4f3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Aug 19 09:05:02 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Aug 19 09:05:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4226f432

media-gfx/freecad: updated live ebuild

* updated qt test patch
* updated desktop file name

Signed-off-by: Miroslav Šulc  gentoo.org>

 ...s-src-Qt-only-build-test-for-BUILD_GUI-ON.patch | 36 ++
 media-gfx/freecad/freecad-.ebuild  |  2 +-
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
 
b/media-gfx/freecad/files/freecad--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
index 5455c0ee2992..3eb2e79c4c3d 100644
--- 
a/media-gfx/freecad/files/freecad--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
+++ 
b/media-gfx/freecad/files/freecad--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
@@ -1,24 +1,20 @@
-From cb77c7d937c259224699273fee1ba5907588fa4c Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Sun, 12 Feb 2023 19:54:13 +0100
-Subject: [PATCH] tests/src/Qt: only build test for BUILD_GUI=ON
-
-Signed-off-by: Bernd Waibel 
 a/tests/src/Qt/CMakeLists.txt
-+++ b/tests/src/Qt/CMakeLists.txt
-@@ -30,6 +30,7 @@ endfunction()
- set(CMAKE_AUTOMOC ON)
+--- a/tests/src/Base/CMakeLists.txt
 b/tests/src/Base/CMakeLists.txt
+@@ -11,4 +11,6 @@ target_sources(
+ ${CMAKE_CURRENT_SOURCE_DIR}/tst_Tools.cpp
+ )
  
- # Qt Test
+-setup_qt_test(InventorBuilder)
 +if(BUILD_GUI)
- include_directories(
- ${QtGui_INCLUDE_DIRS}
- ${QtTest_INCLUDE_DIRS}
-@@ -46,3 +47,4 @@ set (InventorBuilder_LIBS
- SETUP_TESTS(
- InventorBuilder
++setup_qt_test(InventorBuilder)
++endif()
+--- a/tests/src/Gui/CMakeLists.txt
 b/tests/src/Gui/CMakeLists.txt
+@@ -6,4 +6,6 @@ target_sources(
  )
+ 
+ # Qt tests
+-setup_qt_test(QuantitySpinBox)
++if(BUILD_GUI)
++setup_qt_test(QuantitySpinBox)
 +endif()
--- 
-2.39.1
-

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 3c44e3745979..73fd4eaff9a1 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -152,7 +152,7 @@ pkg_setup() {
 
 src_prepare() {
# Fix desktop file
-   sed -e 's/Exec=FreeCAD/Exec=freecad/' -i 
src/XDGData/org.freecadweb.FreeCAD.desktop || die
+   sed -e 's/Exec=FreeCAD/Exec=freecad/' -i 
src/XDGData/org.freecad.FreeCAD.desktop || die
 
find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert 
to unix line endings"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2023-08-09 Thread Miroslav Šulc

commit: 92bc45e1fa8f2992404520d5b4d06c1d6752c94f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Aug  9 08:34:19 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Aug  9 08:34:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92bc45e1

media-gfx/freecad: updated ccache patch in live ebuild

Closes: https://bugs.gentoo.org/911409
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...cad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch | 11 +++
 media-gfx/freecad/freecad-.ebuild |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git 
a/media-gfx/freecad/files/freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
 
b/media-gfx/freecad/files/freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
new file mode 100644
index ..dddacfb289ef
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -16,7 +16,7 @@ else()
+ option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" 
ON)
+ endif()
+ 
+-if(FREECAD_USE_CCACHE)
++if(OFF)
+ find_program(CCACHE_PROGRAM ccache)  #This check should occur before 
project()
+ if(CCACHE_PROGRAM)
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index ce6c3efe2731..3c44e3745979 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -136,7 +136,7 @@ REQUIRED_USE="
 
 PATCHES=(
"${FILESDIR}"/${PN}--Gentoo-specific-don-t-check-vcs.patch
-   
"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+   
"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch

"${FILESDIR}"/${PN}--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
 )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2023-05-08 Thread Joonas Niilola

commit: 4392befa43bba1a82bd89ecb8fd9d46f3580dd4c
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue May  2 06:28:06 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May  8 08:19:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4392befa

media-gfx/freecad: drop dependency for sci-libs/flann on v0.20.2

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30847
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-0.20.2-r2.ebuild | 324 +
 1 file changed, 324 insertions(+)

diff --git a/media-gfx/freecad/freecad-0.20.2-r2.ebuild 
b/media-gfx/freecad/freecad-0.20.2-r2.ebuild
new file mode 100644
index ..f7c6b0fa93f8
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.20.2-r2.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit check-reqs cmake optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
+
+MY_PN=FreeCAD
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
+   S="${WORKDIR}/freecad-${PV}"
+else
+   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/FreeCAD-${PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug designer +gui test"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
+FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
+   openscad part-design path points raytracing robot show surface
+   techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+   IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+   IUSE="${IUSE} ${module}"
+done
+unset module
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/OpenNI2[opengl(+)]
+   dev-libs/boost:=
+   dev-libs/libspnav[X]
+   dev-libs/xerces-c[icu]
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtxml:5
+   dev-qt/qtxmlpatterns:5
+   media-libs/freetype
+   media-libs/qhull:=
+   sci-libs/hdf5:=[fortran,zlib]
+   >=sci-libs/med-4.0.0-r1
+   =media-libs/coin-4.0.0
+   virtual/glu
+   virtual/opengl
+   $(python_gen_cond_dep '
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+   
dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+   dev-python/shiboken2[${PYTHON_USEDEP}]
+   ')
+   )
+   netgen? ( media-gfx/netgen[opencascade] )
+   openscad? ( media-gfx/openscad )
+   pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] )
+   $(python_gen_cond_dep '
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
+   fem? ( dev-python/ply[${PYTHON_USEDEP}] )
+   ')
+"
+DEPEND="
+   ${RDEPEND}
+   >=dev-cpp/eigen-3.3.1:3
+   test? (
+   $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+   dev-qt/qttest:5
+   )
+"
+BDEPEND="
+   app-text/dos2unix
+   dev-lang/swig
+   test? (
+   $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+   dev-qt/qttest:5
+   )
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, 
web.
+#
+# Additionally, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we 
enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency 
isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+#
+# The increase in auto-enabled workbenches is due to their need in parts of the
+# test suite when compiled with a minimal set of USE flags.
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+   designer? ( gui )
+   inspection? ( points )
+   path? ( robot )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch
+   
"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+   
"${FILESDIR}"/${PN}-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2023-05-08 Thread Joonas Niilola

commit: e1032afd04a7fadaeca0c82549d207b5f043da08
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Apr 28 09:52:04 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May  8 08:19:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1032afd

media-gfx/freecad: drop dependency for sci-libs/flann on v

Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 47fbacf3eba4..ce6c3efe2731 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit check-reqs cmake optfeature python-single-r1 xdg
 
@@ -57,7 +57,6 @@ RDEPEND="
dev-qt/qtxmlpatterns:5
media-libs/freetype
media-libs/qhull:=
-   sci-libs/flann[openmp]
sci-libs/hdf5:=[fortran,zlib]
>=sci-libs/med-4.0.0-r1
sci-libs/opencascade:=[json,vtk]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2023-05-07 Thread Joonas Niilola

commit: 17a66837b53ad90c947f254cd158e44a2e48577d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun May  7 08:44:25 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun May  7 08:44:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a66837

media-gfx/freecad: Stabilize 0.20.2-r1 amd64, #905616

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-0.20.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-0.20.2-r1.ebuild 
b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
index 117cfb16b291..a0b180e9df32 100644
--- a/media-gfx/freecad/freecad-0.20.2-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = * ]]; then
S="${WORKDIR}/freecad-${PV}"
 else

SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
S="${WORKDIR}/FreeCAD-${PV}"
 fi

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2023-05-05 Thread Sam James

commit: f6aef9a48475f4cb7f3df463687dc9e78a6d2d50
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri May  5 08:42:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  5 09:04:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6aef9a4

media-gfx/freecad: fix build with gcc-13

Closes: https://bugs.gentoo.org/905451
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30879
Signed-off-by: Sam James  gentoo.org>

 ...20.2-libE57Format-fix-compile-using-gcc13.patch | 24 ++
 media-gfx/freecad/freecad-0.20.2-r1.ebuild |  1 +
 2 files changed, 25 insertions(+)

diff --git 
a/media-gfx/freecad/files/freecad-0.20.2-libE57Format-fix-compile-using-gcc13.patch
 
b/media-gfx/freecad/files/freecad-0.20.2-libE57Format-fix-compile-using-gcc13.patch
new file mode 100644
index ..c26c8db4e867
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.20.2-libE57Format-fix-compile-using-gcc13.patch
@@ -0,0 +1,24 @@
+https://github.com/FreeCAD/FreeCAD/commit/f91ad00ed23e92c81fff2bd0073c662291efad32
+https://bugs.gentoo.org/905451
+
+From f91ad00ed23e92c81fff2bd0073c662291efad32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= 
+Date: Mon, 27 Mar 2023 11:45:20 +0200
+Subject: [PATCH 011/420] libE57Format: fix compile using gcc13
+
+Adding missing header file. Also submitted this upstream here:
+
+https://github.com/asmaloney/libE57Format/pull/243
+--- a/src/3rdParty/libE57Format/include/E57Format.h
 b/src/3rdParty/libE57Format/include/E57Format.h
+@@ -33,6 +33,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "E57Exception.h"
+-- 
+2.40.1
+

diff --git a/media-gfx/freecad/freecad-0.20.2-r1.ebuild 
b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
index 4099ed239e45..117cfb16b291 100644
--- a/media-gfx/freecad/freecad-0.20.2-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
@@ -139,6 +139,7 @@ PATCHES=(

"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch

"${FILESDIR}"/${PN}-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch

"${FILESDIR}"/${PN}-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
+   "${FILESDIR}"/${PN}-0.20.2-libE57Format-fix-compile-using-gcc13.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2023-04-25 Thread Miroslav Šulc

commit: 5f1ddf94909ca9733f067c26eef71965d5371314
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Apr 25 14:01:24 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr 25 14:01:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f1ddf94

media-gfx/freecad: updated patch for 

Closes: https://bugs.gentoo.org/905004
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch |  6 --
 .../freecad--Gentoo-specific-don-t-check-vcs.patch| 15 +++
 media-gfx/freecad/freecad-.ebuild |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
index c8772febdee8..8e875c1811f5 100644
--- 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+++ 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
@@ -4,12 +4,6 @@ Date: Fri, 12 Mar 2021 23:55:09 +0100
 Subject: [PATCH] [Gentoo specific] Remove ccache usage
 
 Signed-off-by: Bernd Waibel 

- CMakeLists.txt | 5 -
- 1 file changed, 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b17736..38e482a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -8,11 +8,6 @@ if (POLICY CMP0072)

diff --git 
a/media-gfx/freecad/files/freecad--Gentoo-specific-don-t-check-vcs.patch 
b/media-gfx/freecad/files/freecad--Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index ..3c8b61ab56a4
--- /dev/null
+++ b/media-gfx/freecad/files/freecad--Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,15 @@
+--- a/src/Tools/SubWCRev.py
 b/src/Tools/SubWCRev.py
+@@ -509,12 +509,6 @@ def main():
+ bindir = a
+ 
+ vcs = [
+-GitControl(),
+-DebianGitHub(),
+-BazaarControl(),
+-Subversion(),
+-MercurialControl(),
+-DebianChangelog(),
+ UnknownControl(),
+ ]
+ for i in vcs:

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index b9d1e7ae4206..47fbacf3eba4 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -136,7 +136,7 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch
+   "${FILESDIR}"/${PN}--Gentoo-specific-don-t-check-vcs.patch

"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch

"${FILESDIR}"/${PN}--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
 )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2023-02-23 Thread Miroslav Šulc

commit: d57cf04d640532e3dcef251f68f31f2c2d832d07
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Feb 23 17:29:42 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Feb 23 17:30:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57cf04d

media-gfx/freecad: fixed dying in install phase in live ebuild when tests are 
not enabled

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/freecad/freecad-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index a006497fe1bd..b9d1e7ae4206 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -281,7 +281,7 @@ src_install() {
dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed 
to drop unneeded include directory E57Format"
-   use test && rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die
+   use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die)
 
python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage 
"${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
# compile main package in python site-packages as well

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2023-02-23 Thread Andrew Ammerlaan

commit: 14cf2836cf700e656a01d2d09b8c0aed9095262b
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Feb 14 11:07:12 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Feb 23 11:25:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14cf2836

media-gfx/freecad: enable suport for netgen for 0.20.2

Backports from live ebuild
- add py3.11 support
- better organize dependencies
- fix REQUIRED_USE for the designer plugin

Closes: https://bugs.gentoo.org/895660
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29583
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...FreeCAD-segfaults-being-run-with-paramete.patch |  22 ++
 ...tgen-add-headers-to-support-recent-Netgen.patch |  93 ++
 media-gfx/freecad/freecad-0.20.2-r1.ebuild | 324 +
 3 files changed, 439 insertions(+)

diff --git 
a/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
 
b/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
new file mode 100644
index ..44d49ca3bf94
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
@@ -0,0 +1,22 @@
+https://github.com/FreeCAD/FreeCAD/commit/c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476
+
+From c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476 Mon Sep 17 00:00:00 2001
+From: wmayer 
+Date: Sat, 11 Feb 2023 17:47:49 +0100
+Subject: [PATCH 02/51] Fixes #8206: FreeCAD segfaults being run with
+ parameters (e.g .desktop file has /usr/bin/freecad --single-instance)
+
+--- a/src/Base/Interpreter.cpp
 b/src/Base/Interpreter.cpp
+@@ -563,7 +563,7 @@ void initInterpreter(int argc,char *argv[])
+ {
+ PyStatus status;
+ PyConfig config;
+-PyConfig_InitPythonConfig();
++PyConfig_InitIsolatedConfig();
+ 
+ status = PyConfig_SetBytesArgv(, argc, argv);
+ if (PyStatus_Exception(status)) {
+-- 
+2.39.1
+

diff --git 
a/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
 
b/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
new file mode 100644
index ..402c84ee4d28
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
@@ -0,0 +1,93 @@
+https://github.com/FreeCAD/FreeCAD/commit/8b056f156fd087b3df36a5223fc5ca6900649a83
+
+From 8b056f156fd087b3df36a5223fc5ca6900649a83 Mon Sep 17 00:00:00 2001
+From: Uwe 
+Date: Wed, 17 Aug 2022 12:32:02 +0200
+Subject: [PATCH 0008/1678] [Netgen] add headers to support recent Netgen
+
+- as reported here: https://forum.freecadweb.org/viewtopic.php?p=618174#p618174
+- also fix compiler warnings about unsafe bool handling
+--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
 b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
+@@ -50,7 +50,9 @@
+ 
+ #include 
+ 
++#include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -66,6 +68,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #ifdef _MSC_VER
+ #pragma warning(disable : 4067)
+@@ -3027,7 +3030,7 @@ bool NETGENPlugin_Mesher::Compute()
+ }
+   }
+ }
+-if (!err && mparams.secondorder > 0)
++if (!err && mparams.secondorder)
+ {
+   try
+   {
+@@ -3302,7 +3305,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& 
aResMap)
+   // calculate total nb of segments and length of edges
+   double fullLen = 0.0;
+   int fullNbSeg = 0;
+-  int entity = mparams.secondorder > 0 ? SMDSEntity_Quad_Edge : 
SMDSEntity_Edge;
++  int entity = mparams.secondorder ? SMDSEntity_Quad_Edge : SMDSEntity_Edge;
+   TopTools_DataMapOfShapeInteger Edge2NbSeg;
+   for (TopExp_Explorer exp(_shape, TopAbs_EDGE); exp.More(); exp.Next())
+   {
+@@ -3340,7 +3343,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& 
aResMap)
+   {
+ vector& aVec = aResMap[_mesh->GetSubMesh(Edge2NbSegIt.Key())];
+ if ( aVec[ entity ] > 1 && aVec[ SMDSEntity_Node ] == 0 )
+-  aVec[SMDSEntity_Node] = mparams.secondorder > 0  ? 2*aVec[ entity ]-1 : 
aVec[ entity ]-1;
++  aVec[SMDSEntity_Node] = mparams.secondorder ? 2*aVec[ entity ]-1 : 
aVec[ entity ]-1;
+ 
+ fullNbSeg += aVec[ entity ];
+ Edge2NbSeg( Edge2NbSegIt.Key() ) = aVec[ entity ];
+@@ -3386,7 +3389,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& 
aResMap)
+ int nbNodes = tooManyElems ? hugeNb : (( nbFaces*3 - (nb1d-1)*2 ) / 6 + 1 
);
+ 
+ vector aVec(SMDSEntity_Last, 0);
+-if( mparams.secondorder > 0 ) {
++if (mparams.secondorder) {
+   int nb1d_in = (nbFaces*3 - nb1d) / 2;
+   aVec[SMDSEntity_Node] = nbNodes + nb1d_in;
+   aVec[SMDSEntity_Quad_Triangle] = nbFaces;
+@@ -3428,11 +3431,11 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& 
aResMap)
+ if ( tooManyElems ) // avoid FPE
+ {
+   aVec[SMDSEntity_Node] = hugeNb;
+-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2023-02-23 Thread Andrew Ammerlaan

commit: 05b09279f2d9a2d3012d051b79126ece16f50ea0
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Feb 21 11:58:27 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Feb 23 11:25:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b09279

media-gfx/freecad: drop 0.20.1

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29700
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/Manifest  |   1 -
 media-gfx/freecad/freecad-0.20.1.ebuild | 303 
 media-gfx/freecad/metadata.xml  |   4 -
 3 files changed, 308 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 0a9b181f62a2..0973d9d48798 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1 @@
-DIST freecad-0.20.1.tar.gz 75545072 BLAKE2B 
be2d2970b80523b34f7400a2762f997b815a5ae90dcb6cee6e560316712ebe3ab8a64053bd73e9f50548ff076920af0304a6780c94c4f3708d30b82bbee3b5d9
 SHA512 
ab4cfab4008300b8273769b9395602261c88c19f0893dabe6498a2eac020f1fe3fbf7284928144f1d4147d8627a47d83a40a1777a298673da2e24d956006d827
 DIST freecad-0.20.2.tar.gz 7561 BLAKE2B 
278b05a3fe3bdccb46da62926aee46f066cb073f034b273dc4d8b27975724b754a6822b7eb0b673500db4592237690decb830cc7a30e8da689c6b067c256d4f8
 SHA512 
c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d

diff --git a/media-gfx/freecad/freecad-0.20.1.ebuild 
b/media-gfx/freecad/freecad-0.20.1.ebuild
deleted file mode 100644
index 746a966ee4d0..
--- a/media-gfx/freecad/freecad-0.20.1.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit check-reqs cmake optfeature python-single-r1 xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
-
-MY_PN=FreeCAD
-
-if [[ ${PV} = * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
-   S="${WORKDIR}/freecad-${PV}"
-else
-   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64"
-   S="${WORKDIR}/FreeCAD-${PV}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="debug designer headless test"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud pcl"
-FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
-   openscad part-design path points raytracing robot show surface
-   techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
-   IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-   IUSE="${IUSE} ${module}"
-done
-unset module
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-libs/OpenNI2[opengl(+)]
-   dev-libs/libspnav[X]
-   dev-libs/xerces-c[icu]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-   dev-qt/qtx11extras:5
-   dev-qt/qtxml:5
-   >=media-libs/coin-4.0.0
-   media-libs/freetype
-   media-libs/qhull:=
-   sci-libs/flann[openmp]
-   sci-libs/hdf5:=[fortran,zlib]
-   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-   =sci-libs/pcl-1.8.1:=[opengl,openni2,qt5,vtk] )
-   $(python_gen_cond_dep '
-   dev-libs/boost:=[python,${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-   dev-python/pybind11[${PYTHON_USEDEP}]
-   
dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
-   dev-python/shiboken2[${PYTHON_USEDEP}]
-   addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
-   fem? ( dev-python/ply[${PYTHON_USEDEP}] )
-   ')
-"
-DEPEND="
-   ${RDEPEND}
-   >=dev-cpp/eigen-3.3.1:3
-"
-BDEPEND="
-   app-text/dos2unix
-   dev-lang/swig
-"
-
-# To get required dependencies:
-# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-# We set the following requirements by default:
-# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, 
web.
-#
-# Additionally, we auto-enable mesh_part, flat_mesh and smesh
-# Fem actually needs smesh, but as long as we don't have a smesh package, we 
enable
-# smesh through the mesh USE flag. Note however, the fem<-smesh dependency 
isn't
-# reflected by the REQUIRES_MODS

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2023-02-23 Thread Andrew Ammerlaan

commit: 2a75bd98a3a22b79d764207b0ce16195662ece4b
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Feb 13 20:20:00 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Feb 23 11:25:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a75bd98

media-gfx/freecad: enable netgen support in live ebuild

- add py3.11 support
- better organize dependencies, add new libfmt dep
- fix REQUIRED_USE for designer plugin

Bug: https://bugs.gentoo.org/895660
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...s-src-Qt-only-build-test-for-BUILD_GUI-ON.patch | 24 
 media-gfx/freecad/freecad-.ebuild  | 70 ++
 media-gfx/freecad/metadata.xml |  3 +
 3 files changed, 72 insertions(+), 25 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
 
b/media-gfx/freecad/files/freecad--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
new file mode 100644
index ..5455c0ee2992
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
@@ -0,0 +1,24 @@
+From cb77c7d937c259224699273fee1ba5907588fa4c Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 12 Feb 2023 19:54:13 +0100
+Subject: [PATCH] tests/src/Qt: only build test for BUILD_GUI=ON
+
+Signed-off-by: Bernd Waibel 
+--- a/tests/src/Qt/CMakeLists.txt
 b/tests/src/Qt/CMakeLists.txt
+@@ -30,6 +30,7 @@ endfunction()
+ set(CMAKE_AUTOMOC ON)
+ 
+ # Qt Test
++if(BUILD_GUI)
+ include_directories(
+ ${QtGui_INCLUDE_DIRS}
+ ${QtTest_INCLUDE_DIRS}
+@@ -46,3 +47,4 @@ set (InventorBuilder_LIBS
+ SETUP_TESTS(
+ InventorBuilder
+ )
++endif()
+-- 
+2.39.1
+

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index ba5840c6b720..a006497fe1bd 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit check-reqs cmake optfeature python-single-r1 xdg
 
@@ -28,7 +28,7 @@ LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
 IUSE="debug designer +gui test"
 
-FREECAD_EXPERIMENTAL_MODULES="cloud pcl"
+FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
openscad part-design path points raytracing robot show surface
techdraw tux"
@@ -46,47 +46,54 @@ RESTRICT="!test? ( test )"
 RDEPEND="
${PYTHON_DEPS}
dev-libs/OpenNI2[opengl(+)]
+   dev-libs/boost:=
+   dev-libs/libfmt:=
dev-libs/libspnav[X]
dev-libs/xerces-c[icu]
-   dev-qt/designer:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
-   dev-qt/qtgui:5
dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-   dev-qt/qtx11extras:5
dev-qt/qtxml:5
-   >=media-libs/coin-4.0.0
+   dev-qt/qtxmlpatterns:5
media-libs/freetype
media-libs/qhull:=
sci-libs/flann[openmp]
sci-libs/hdf5:=[fortran,zlib]
-   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-   sci-libs/opencascade:=[json,vtk(+)]
+   >=sci-libs/med-4.0.0-r1
+   sci-libs/opencascade:=[json,vtk]
sci-libs/orocos_kdl:=
sys-libs/zlib
-   virtual/glu
virtual/libusb:1
-   virtual/opengl
cloud? (
dev-libs/openssl:=
net-misc/curl
)
-   fem? ( 
sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+   fem? ( sci-libs/vtk:=[qt5,rendering] )
+   gui? (
+   dev-qt/designer:5
+   dev-qt/qtgui:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   >=media-libs/coin-4.0.0
+   virtual/glu
+   virtual/opengl
+   $(python_gen_cond_dep '
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+   
dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+   dev-python/shiboken2[${PYTHON_USEDEP}]
+   ')
+   )
+   netgen? ( media-gfx/netgen[opencascade] )
openscad? ( media-gfx/openscad )
-   pcl? ( sci-libs/pcl:=[opengl,openni2(+),qt5(+),vtk(+)] )
+   pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] )
$(python_gen_cond_dep '
-   dev-libs/boost:=[python,${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2023-02-20 Thread Joonas Niilola

commit: 137a709332b3732e738d7f7fed7a86f945fc06e6
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Feb 21 06:15:53 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Feb 21 06:18:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=137a7093

media-gfx/freecad: Stabilize 0.20.2 amd64, #894682

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-0.20.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-0.20.2.ebuild 
b/media-gfx/freecad/freecad-0.20.2.ebuild
index 5459901b4121..c34c4c9425e3 100644
--- a/media-gfx/freecad/freecad-0.20.2.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = * ]]; then
S="${WORKDIR}/freecad-${PV}"
 else

SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
S="${WORKDIR}/FreeCAD-${PV}"
 fi

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2023-01-09 Thread Joonas Niilola

commit: 0c76aa67c52f41d8f9c420092477d218d68ba409
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Dec 14 06:50:38 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jan  9 19:23:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c76aa67

media-gfx/freecad: add 0.20.2

- cleanup some depstrings (med, vtk, boost)
- not yet ready for py311 (SEGV when running test suite)
- backport changes from live ebuild to prepare for Qt6 (headless -> gui USE 
flag)

Closes: https://bugs.gentoo.org/887589
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28769
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/Manifest  |   1 +
 media-gfx/freecad/freecad-0.20.2.ebuild | 307 
 2 files changed, 308 insertions(+)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index ae9dfbc8a37d..0a9b181f62a2 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1 +1,2 @@
 DIST freecad-0.20.1.tar.gz 75545072 BLAKE2B 
be2d2970b80523b34f7400a2762f997b815a5ae90dcb6cee6e560316712ebe3ab8a64053bd73e9f50548ff076920af0304a6780c94c4f3708d30b82bbee3b5d9
 SHA512 
ab4cfab4008300b8273769b9395602261c88c19f0893dabe6498a2eac020f1fe3fbf7284928144f1d4147d8627a47d83a40a1777a298673da2e24d956006d827
+DIST freecad-0.20.2.tar.gz 7561 BLAKE2B 
278b05a3fe3bdccb46da62926aee46f066cb073f034b273dc4d8b27975724b754a6822b7eb0b673500db4592237690decb830cc7a30e8da689c6b067c256d4f8
 SHA512 
c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d

diff --git a/media-gfx/freecad/freecad-0.20.2.ebuild 
b/media-gfx/freecad/freecad-0.20.2.ebuild
new file mode 100644
index ..93ed8b1ea7ca
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.20.2.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit check-reqs cmake optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
+
+MY_PN=FreeCAD
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
+   S="${WORKDIR}/freecad-${PV}"
+else
+   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/FreeCAD-${PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug designer +gui test"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud pcl"
+FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
+   openscad part-design path points raytracing robot show surface
+   techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+   IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+   IUSE="${IUSE} ${module}"
+done
+unset module
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/OpenNI2[opengl(+)]
+   dev-libs/boost:=
+   dev-libs/libspnav[X]
+   dev-libs/xerces-c[icu]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   dev-qt/qtxml:5
+   >=media-libs/coin-4.0.0
+   media-libs/freetype
+   media-libs/qhull:=
+   sci-libs/flann[openmp]
+   sci-libs/hdf5:=[fortran,zlib]
+   >=sci-libs/med-4.0.0-r1
+   =dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   
dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+   dev-python/shiboken2[${PYTHON_USEDEP}]
+   addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
+   fem? ( dev-python/ply[${PYTHON_USEDEP}] )
+   ')
+"
+DEPEND="
+   ${RDEPEND}
+   >=dev-cpp/eigen-3.3.1:3
+   test? ( $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') )
+"
+BDEPEND="
+   app-text/dos2unix
+   dev-lang/swig
+   test? ( $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') )
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, 
web.
+#
+# Additionally, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we 
enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-11-27 Thread Piotr Karbowski

commit: 734858c39ae95ae5fcdaa3178583d43b8ea52de4
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Nov 27 11:38:54 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Nov 27 13:23:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=734858c3

media-gfx/freecad: restrict to https://bugs.gentoo.org/883073
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28447
Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/freecad/freecad-0.20.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-0.20.1.ebuild 
b/media-gfx/freecad/freecad-0.20.1.ebuild
index 92f01267350b..40c90979cd7e 100644
--- a/media-gfx/freecad/freecad-0.20.1.ebuild
+++ b/media-gfx/freecad/freecad-0.20.1.ebuild
@@ -66,7 +66,7 @@ RDEPEND="
sci-libs/flann[openmp]
sci-libs/hdf5:=[fortran,zlib]
>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-   sci-libs/opencascade:=[json,vtk]
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-11-22 Thread Joonas Niilola

commit: f85e159cd80a8d61e89a64cd4ec9e9abcbf88fcc
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Nov  1 09:08:08 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov 22 15:03:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85e159c

media-gfx/freecad: adapt for Qt6 related changes

Upstream has introduced cmake changes for handling both Qt5 and Qt6.
No code changes have been made so far, so we don't yet implement the
qt6 USE flag.
This patch reflects the upstream changes and prepares for implementing
the qt6 USE flag, by renaming the "headless" USE flag to "gui" and
passing the new cmake variable FREECAD_QT_VERSION.

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28069
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-.ebuild | 10 ++
 media-gfx/freecad/metadata.xml|  7 +++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 95e48c37bdac..7a29fc5538d5 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -26,7 +26,7 @@ fi
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="debug designer headless test"
+IUSE="debug designer +gui test"
 
 FREECAD_EXPERIMENTAL_MODULES="cloud pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
@@ -159,7 +159,7 @@ src_configure() {
-DBUILD_FLAT_MESH=ON
-DBUILD_FORCE_DIRECTORY=ON  # force 
building in a dedicated directory
-DBUILD_FREETYPE=ON 
# automagic dep
-   -DBUILD_GUI=$(usex !headless)
+   -DBUILD_GUI=$(usex gui)
-DBUILD_IDF=$(usex idf)
-DBUILD_IMAGE=$(usex image)
-DBUILD_IMPORT=ON   
# import module for various file formats
@@ -197,6 +197,8 @@ src_configure() {
 
-DFREECAD_BUILD_DEBIAN=OFF
 
+   -DFREECAD_QT_VERSION="5"
+
-DFREECAD_USE_EXTERNAL_KDL=ON
-DFREECAD_USE_EXTERNAL_SMESH=OFF# no package in 
Gentoo
-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF   # doesn't work 
yet, also no package in Gentoo tree
@@ -235,7 +237,7 @@ src_configure() {
 
 # We use the FreeCADCmd binary instead of the FreeCAD binary here
 # for two reasons:
-# 1. It works out of the box with USE=headless as well, not needing a guard
+# 1. It works out of the box with USE=-gui as well, not needing a guard
 # 2. We don't need virtualx.eclass and it's dependencies
 # The exported environment variables are needed, so freecad does know
 # where to save it's temporary files, and where to look and write it's
@@ -255,7 +257,7 @@ src_install() {
 
dobin src/Tools/freecad-thumbnailer
 
-   if ! use headless; then
+   if use gui; then
dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || 
die "failed to move shared resources"
fi

diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index d55000ab3501..6e0770f45ea8 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -26,6 +26,13 @@
Build the FEM module and workbench which provides 
Finite Element 
Analysis (FEA) workflows

+   
+   Build FreeCAD with a Qt based GUI. If built without 
setting this
+   USE flag, FreeCAD can be used in a headless mode, for 
server-side
+   instances.
+   The Python modules are available, without their GUI 
parts though,
+   if this is unset.
+   

Build FreeCAD without a GUI, usable for server-side 
instances.
The Python modules are still available, without their 
GUI parts though.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2022-10-31 Thread Joonas Niilola

commit: f1fad773fe9f1280691e37c5f148a43294ca232e
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Oct 31 15:10:14 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Oct 31 15:46:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1fad773

media-gfx/freecad: drop 0.19.4-r1, 0.20-r1

Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/Manifest |   3 -
 ...6-add-boost-serialization-to-find_package.patch |  53 
 ...19.4-backport-correctly-find-PySide2Tools.patch | 106 ---
 media-gfx/freecad/freecad-0.19.4-r1.ebuild | 325 -
 media-gfx/freecad/freecad-0.20-r1.ebuild   | 309 
 media-gfx/freecad/metadata.xml |  17 --
 6 files changed, 813 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 42213fb79589..ae9dfbc8a37d 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,4 +1 @@
-DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
-DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 
6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45
 SHA512 
58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f
 DIST freecad-0.20.1.tar.gz 75545072 BLAKE2B 
be2d2970b80523b34f7400a2762f997b815a5ae90dcb6cee6e560316712ebe3ab8a64053bd73e9f50548ff076920af0304a6780c94c4f3708d30b82bbee3b5d9
 SHA512 
ab4cfab4008300b8273769b9395602261c88c19f0893dabe6498a2eac020f1fe3fbf7284928144f1d4147d8627a47d83a40a1777a298673da2e24d956006d827
-DIST freecad-0.20.tar.gz 75452957 BLAKE2B 
600baf30541dabb7cf5df22a2d0fef0972d1b9cbf7c8425b9e2fadae54a0b0a1b75bb252fa18ecbf68fa5649ce459a88c71d69e000899e4b46d5c59fe956fcd1
 SHA512 
b1d91efa873f180bf635f6006d6c4b7a33b64b630955c639fe923bb340ce8104474688e05eea151d1ac1557388947ae81618cfc8a578f14706aa07b5cdc45cda

diff --git 
a/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch
 
b/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch
deleted file mode 100644
index f9120e051919..
--- 
a/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From fc4ae2ff217c67eae39947ed6b655b8afaa83859 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Sun, 20 Jun 2021 15:38:45 +0200
-Subject: [PATCH] add boost::serialization to find_package
-
-Swaps SetupBoost() after SetupSalomeSMESH() has been called.
-SetupSalomeSMESH() looks for vtk, which searches for boost::serialization
-overriding the default libraries detected by SetupBoost().
-
-Signed-off-by: Bernd Waibel 

- CMakeLists.txt | 4 +++-
- cMake/FreeCAD_Helpers/SetupBoost.cmake | 2 +-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b17736..c241ebe 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,7 +45,6 @@ if(NOT FREECAD_LIBPACK_USE OR 
FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
- SetupPython()
- SetupPCL()
- SetupPybind11()
--SetupBoost()
- SetupXercesC()
- find_package(ZLIB REQUIRED)
- find_package(PyCXX REQUIRED)
-@@ -57,6 +56,9 @@ if(NOT FREECAD_LIBPACK_USE OR 
FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
- SetupOpenGL()
- endif(BUILD_GUI)
- SetupSalomeSMESH()
-+# needs to be called after SMESH which pulls in VTK, which only add 
boost::serialization
-+# overriding the values of SetupBoost()
-+SetupBoost()
- if (BUILD_FEM_NETGEN)
- find_package(NETGEN)
- endif(BUILD_FEM_NETGEN)
-diff --git a/cMake/FreeCAD_Helpers/SetupBoost.cmake 
b/cMake/FreeCAD_Helpers/SetupBoost.cmake
-index 76c6d64..77c415b 100644
 a/cMake/FreeCAD_Helpers/SetupBoost.cmake
-+++ b/cMake/FreeCAD_Helpers/SetupBoost.cmake
-@@ -3,7 +3,7 @@ macro(SetupBoost)
- 
- set(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS})
- 
--set (BOOST_COMPONENTS filesystem program_options regex system thread)
-+set (BOOST_COMPONENTS filesystem program_options regex serialization 
system thread)
- find_package(Boost ${BOOST_MIN_VERSION}
- COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
- 
--- 
-2.32.0
-

diff --git 
a/media-gfx/freecad/files/freecad-0.19.4-backport-correctly-find-PySide2Tools.patch
 
b/media-gfx/freecad/files/freecad-0.19.4-backport-correctly-find-PySide2Tools.patch
deleted file mode 100644
index b297727033db..
---

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2022-10-31 Thread Joonas Niilola

commit: ae75bb2605050c62397e489d9929ddadb1dd246e
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Oct 31 15:16:09 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Oct 31 15:46:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae75bb26

media-gfx/freecad: swap patch

Swap a patch, available in two different versions to reduce number of
files in ${FILESDIR}. This patch is also used by 0.20.1.

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28051
Signed-off-by: Joonas Niilola  gentoo.org>

 ...1231-0003-Gentoo-specific-don-t-check-vcs.patch | 26 --
 media-gfx/freecad/freecad-.ebuild  |  4 +++-
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
deleted file mode 100644
index ac8d194d00ea..
--- 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From acc8a26b73a87ae024bce30e9f1531610b6e0e5f Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Sat, 13 Feb 2021 14:54:28 +0100
-Subject: [PATCH] [Gentoo specific] don't check vcs
-
-Signed-off-by: Bernd Waibel 

- src/Tools/SubWCRev.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py
-index 9795450..59938bd 100644
 a/src/Tools/SubWCRev.py
-+++ b/src/Tools/SubWCRev.py
-@@ -455,7 +455,7 @@ def main():
- if o in ("-b", "--bindir"):
- bindir = a
- 
--vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), 
MercurialControl(), DebianChangelog(), UnknownControl()]
-+vcs=[UnknownControl()]
- for i in vcs:
- if i.extractInfo(srcdir, bindir):
- # Open the template file and the version file
--- 
-2.30.1
-

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 67ba7b4138f4..95e48c37bdac 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -120,7 +120,7 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-   
"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+   "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch

"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 )
 
@@ -138,6 +138,8 @@ src_prepare() {
# Fix desktop file
sed -e 's/Exec=FreeCAD/Exec=freecad/' -i 
src/XDGData/org.freecadweb.FreeCAD.desktop || die
 
+   find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert 
to unix line endings"
+
cmake_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-09-28 Thread Joonas Niilola

commit: e4657caf5e32cca2b1e5de377e7523d38617b1ae
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Sep 28 09:54:29 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Sep 28 09:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4657caf

media-gfx/freecad: Stabilize 0.20.1 amd64, #858308

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-0.20.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-0.20.1.ebuild 
b/media-gfx/freecad/freecad-0.20.1.ebuild
index 23aab7c25c7b..92f01267350b 100644
--- a/media-gfx/freecad/freecad-0.20.1.ebuild
+++ b/media-gfx/freecad/freecad-0.20.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = * ]]; then
S="${WORKDIR}/freecad-${PV}"
 else

SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
S="${WORKDIR}/FreeCAD-${PV}"
 fi

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-09-02 Thread Joonas Niilola

commit: 8c430fb9ee8ee3657576db75b54c276300763b13
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Sep  2 14:41:00 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Sep  2 16:49:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c430fb9

media-gfx/freecad: fixes to metadata

While checking p.g.o, I noticed, that some of the metadata
has been changed recently and is no longer valid. The patch
fixes these.

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27114
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-0.19.4-r1.ebuild | 2 +-
 media-gfx/freecad/freecad-0.20-r1.ebuild   | 2 +-
 media-gfx/freecad/freecad-.ebuild  | 2 +-
 media-gfx/freecad/metadata.xml | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.4-r1.ebuild 
b/media-gfx/freecad/freecad-0.19.4-r1.ebuild
index 3c1fa648d9da..07bc22bf982c 100644
--- a/media-gfx/freecad/freecad-0.19.4-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.19.4-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit check-reqs cmake optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
+HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
 
 MY_PN=FreeCAD
 

diff --git a/media-gfx/freecad/freecad-0.20-r1.ebuild 
b/media-gfx/freecad/freecad-0.20-r1.ebuild
index 52b99f2e863f..38b595dac25b 100644
--- a/media-gfx/freecad/freecad-0.20-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.20-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit check-reqs cmake optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
+HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
 
 MY_PN=FreeCAD
 

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index b9adba360983..eb4e9741c4cb 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit check-reqs cmake optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
+HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
 
 MY_PN=FreeCAD
 

diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 0cb44cbdecb5..120ff56fd4a2 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -101,8 +101,8 @@



-   https://www.freecadweb.org/tracker/
+   https://github.com/FreeCAD/FreeCAD/issues
FreeCAD/FreeCAD
-   https://www.freecadweb.org/wiki/MainPage
+   https://wiki.freecad.org/Main_Page

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-08-30 Thread Joonas Niilola

commit: bd52133a3c1179c09c17861aabc26149be90c275
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Aug 10 07:31:56 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 31 04:57:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd52133a

media-gfx/freecad: add 0.20.1

Closes: https://bugs.gentoo.org/865791
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26924
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/Manifest  |   1 +
 media-gfx/freecad/freecad-0.20.1.ebuild | 303 
 2 files changed, 304 insertions(+)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 8fd5b5d028a5..42213fb79589 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,3 +1,4 @@
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 
6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45
 SHA512 
58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f
+DIST freecad-0.20.1.tar.gz 75545072 BLAKE2B 
be2d2970b80523b34f7400a2762f997b815a5ae90dcb6cee6e560316712ebe3ab8a64053bd73e9f50548ff076920af0304a6780c94c4f3708d30b82bbee3b5d9
 SHA512 
ab4cfab4008300b8273769b9395602261c88c19f0893dabe6498a2eac020f1fe3fbf7284928144f1d4147d8627a47d83a40a1777a298673da2e24d956006d827
 DIST freecad-0.20.tar.gz 75452957 BLAKE2B 
600baf30541dabb7cf5df22a2d0fef0972d1b9cbf7c8425b9e2fadae54a0b0a1b75bb252fa18ecbf68fa5649ce459a88c71d69e000899e4b46d5c59fe956fcd1
 SHA512 
b1d91efa873f180bf635f6006d6c4b7a33b64b630955c639fe923bb340ce8104474688e05eea151d1ac1557388947ae81618cfc8a578f14706aa07b5cdc45cda

diff --git a/media-gfx/freecad/freecad-0.20.1.ebuild 
b/media-gfx/freecad/freecad-0.20.1.ebuild
new file mode 100644
index ..89036988794b
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.20.1.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit check-reqs cmake optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD;
+
+MY_PN=FreeCAD
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
+   S="${WORKDIR}/freecad-${PV}"
+else
+   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/FreeCAD-${PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug designer headless test"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud pcl"
+FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
+   openscad part-design path points raytracing robot show surface
+   techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+   IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+   IUSE="${IUSE} ${module}"
+done
+unset module
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/OpenNI2[opengl(+)]
+   dev-libs/libspnav[X]
+   dev-libs/xerces-c[icu]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   dev-qt/qtxml:5
+   >=media-libs/coin-4.0.0
+   media-libs/freetype
+   media-libs/qhull:=
+   sci-libs/flann[openmp]
+   sci-libs/hdf5:=[fortran,zlib]
+   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+   sci-libs/opencascade:=[json,vtk]
+   sci-libs/orocos_kdl:=
+   sys-libs/zlib
+   virtual/glu
+   virtual/libusb:1
+   virtual/opengl
+   cloud? (
+   dev-libs/openssl:=
+   net-misc/curl
+   )
+   fem? ( 
sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+   openscad? ( media-gfx/openscad )
+   pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2,qt5,vtk] )
+   $(python_gen_cond_dep '
+   dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-07-28 Thread Sam James

commit: 031bcc6d2bb135f6560b363c7189032e277d2df1
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Jul 25 17:56:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 29 03:15:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031bcc6d

media-gfx/freecad: drop ship and plot workbenches

Upstream has dropped the ship and plot workbenches recently. The
patch reflects these changes and drops the USE flags for it.
Note, that the plot module is still available, only the workbench
for separate working with plots has been removed.

See also https://github.com/FreeCAD/FreeCAD/pull/4971 and
https://github.com/FreeCAD/FreeCAD/pull/4900

Also fixes some typos in pkg_postinst and minor code cleanup.

Bug: https://bugs.gentoo.org/858308#c2
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26597
Signed-off-by: Sam James  gentoo.org>

 ...{freecad-0.20.ebuild => freecad-0.20-r1.ebuild} | 19 +---
 media-gfx/freecad/freecad-.ebuild  | 50 ++
 2 files changed, 15 insertions(+), 54 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.20.ebuild 
b/media-gfx/freecad/freecad-0.20-r1.ebuild
similarity index 93%
rename from media-gfx/freecad/freecad-0.20.ebuild
rename to media-gfx/freecad/freecad-0.20-r1.ebuild
index d71ea49e2be3..52b99f2e863f 100644
--- a/media-gfx/freecad/freecad-0.20.ebuild
+++ b/media-gfx/freecad/freecad-0.20-r1.ebuild
@@ -17,8 +17,6 @@ if [[ ${PV} = * ]]; then
EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
S="${WORKDIR}/freecad-${PV}"
 else
-   MY_PV=$(ver_cut 1-2)
-   MY_PV=$(ver_rs 1 '_' ${MY_PV})

SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64"
S="${WORKDIR}/FreeCAD-${PV}"
@@ -32,7 +30,7 @@ SLOT="0"
 # see https://forum.freecadweb.org/viewtopic.php?f=4=69450
 IUSE="debug headless test"
 
-FREECAD_EXPERIMENTAL_MODULES="cloud pcl plot ship"
+FREECAD_EXPERIMENTAL_MODULES="cloud pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
openscad part-design path points raytracing robot show surface
techdraw tux"
@@ -121,7 +119,6 @@ REQUIRED_USE="
${PYTHON_REQUIRED_USE}
inspection? ( points )
path? ( robot )
-   ship? ( image plot )
 "
 
 PATCHES=(
@@ -181,13 +178,11 @@ src_configure() {
-DBUILD_PART=ON
-DBUILD_PART_DESIGN=$(usex part-design)
-DBUILD_PATH=$(usex path)
-   -DBUILD_PLOT=$(usex plot)   # 
conflicts with possible external workbench
-DBUILD_POINTS=$(usex points)
-DBUILD_QT5=ON  
# OFF means to use Qt4
-DBUILD_RAYTRACING=$(usex raytracing)
-DBUILD_REVERSEENGINEERING=OFF  # currently 
only an empty sandbox
-DBUILD_ROBOT=$(usex robot)
-   -DBUILD_SHIP=$(usex ship)   # 
conflicts with possible external workbench
-DBUILD_SHOW=$(usex show)
-DBUILD_SKETCHER=ON 
# needed by draft workspace
-DBUILD_SMESH=ON
@@ -280,18 +275,6 @@ src_install() {
 pkg_postinst() {
xdg_pkg_postinst
 
-   if use plot; then
-   einfo "Note: You are enabling the 'plot' USE flag."
-   einfo "This conflicts with the plot workbench that can be 
loaded"
-   einfo "via the addon manager! You can only install one of 
those."
-   fi
-
-   if use ship; then
-   einfo "Note: You are enabling the 'ship' USE flag."
-   einfo "This conflicts with the ship workbench that can be 
loaded"
-   einfo "via the addon manager! You can only install one of 
those."
-   fi
-
einfo "You can load a lot of additional workbenches using the 
integrated"
einfo "AddonManager."
 

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index d10e47f1f6e1..b9adba360983 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -17,10 +17,7 @@ if [[ ${PV} = * ]]; then
EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
S="${WORKDIR}/freecad-${PV}"
 else
-   MY_PV=$(ver_cut 1-2)
-   MY_PV=$(ver_rs 1 '_' ${MY_PV})
-   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
-   
https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${P}-0005-Make-smesh-compile-with-vtk9.patch.xz;
+   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64"
S="${WORKDIR}/FreeCAD-${PV}"
 fi
@@ -31,7 +28,7 @@ LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
 IUSE="debug

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-07-09 Thread Matthew Smith

commit: 319168a5748b9c655645bbea81f7366e4249f761
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Jun 15 09:11:38 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Jul  9 12:26:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319168a5

media-gfx/freecad: add 0.20

Closes: https://bugs.gentoo.org/851852
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26283
Signed-off-by: Matthew Smith  gentoo.org>

 media-gfx/freecad/Manifest|   1 +
 media-gfx/freecad/freecad-0.20.ebuild | 326 ++
 2 files changed, 327 insertions(+)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 23eb9682d4ed..8fd5b5d028a5 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1,3 @@
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 
6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45
 SHA512 
58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f
+DIST freecad-0.20.tar.gz 75452957 BLAKE2B 
600baf30541dabb7cf5df22a2d0fef0972d1b9cbf7c8425b9e2fadae54a0b0a1b75bb252fa18ecbf68fa5649ce459a88c71d69e000899e4b46d5c59fe956fcd1
 SHA512 
b1d91efa873f180bf635f6006d6c4b7a33b64b630955c639fe923bb340ce8104474688e05eea151d1ac1557388947ae81618cfc8a578f14706aa07b5cdc45cda

diff --git a/media-gfx/freecad/freecad-0.20.ebuild 
b/media-gfx/freecad/freecad-0.20.ebuild
new file mode 100644
index ..d71ea49e2be3
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.20.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit check-reqs cmake optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
+
+MY_PN=FreeCAD
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
+   S="${WORKDIR}/freecad-${PV}"
+else
+   MY_PV=$(ver_cut 1-2)
+   MY_PV=$(ver_rs 1 '_' ${MY_PV})
+   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/FreeCAD-${PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+# directory for USE=designer not yet packaged in tarball
+# see https://forum.freecadweb.org/viewtopic.php?f=4=69450
+IUSE="debug headless test"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud pcl plot ship"
+FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
+   openscad part-design path points raytracing robot show surface
+   techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+   IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+   IUSE="${IUSE} ${module}"
+done
+unset module
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/OpenNI2[opengl(+)]
+   dev-libs/libspnav[X]
+   dev-libs/xerces-c[icu]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   dev-qt/qtxml:5
+   >=media-libs/coin-4.0.0
+   media-libs/freetype
+   media-libs/qhull:=
+   sci-libs/flann[openmp]
+   sci-libs/hdf5:=[fortran,zlib]
+   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+   sci-libs/opencascade:=[json,vtk]
+   sci-libs/orocos_kdl:=
+   sys-libs/zlib
+   virtual/glu
+   virtual/libusb:1
+   virtual/opengl
+   cloud? (
+   dev-libs/openssl:=
+   net-misc/curl
+   )
+   fem? ( 
sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+   openscad? ( media-gfx/openscad )
+   pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2,qt5,vtk] )
+   $(python_gen_cond_dep '
+   dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-05-19 Thread Joonas Niilola

commit: 492ab26847ca2b338b3c166a6db82295d9de02d0
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu May 19 12:10:53 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu May 19 12:10:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=492ab268

media-gfx/freecad: Stabilize 0.19.4-r1 amd64, #829841

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-0.19.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-0.19.4-r1.ebuild 
b/media-gfx/freecad/freecad-0.19.4-r1.ebuild
index 44b0a46fcd71..3c1fa648d9da 100644
--- a/media-gfx/freecad/freecad-0.19.4-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.19.4-r1.ebuild
@@ -21,7 +21,7 @@ else
MY_PV=$(ver_rs 1 '_' ${MY_PV})

SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz

https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${PN}-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz;
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
S="${WORKDIR}/FreeCAD-${PV}"
 fi

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-04-18 Thread Joonas Niilola

commit: 0dae94fc4b20de9644ee5e2ff1418aa58bb29384
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Apr  9 10:32:02 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Apr 18 11:35:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dae94fc

media-gfx/freecad: fix install location of shared files

Shared files have been installed into /usr/$(get_libdir)/freecad/share
instead of /usr/share. This patch fixes this.

Closes: https://bugs.gentoo.org/837173
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24962
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/{freecad-0.19.4.ebuild => freecad-0.19.4-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/freecad/freecad-0.19.4.ebuild 
b/media-gfx/freecad/freecad-0.19.4-r1.ebuild
similarity index 99%
rename from media-gfx/freecad/freecad-0.19.4.ebuild
rename to media-gfx/freecad/freecad-0.19.4-r1.ebuild
index fb3ed461c41c..44b0a46fcd71 100644
--- a/media-gfx/freecad/freecad-0.19.4.ebuild
+++ b/media-gfx/freecad/freecad-0.19.4-r1.ebuild
@@ -267,6 +267,7 @@ src_install() {
 
if ! use headless; then
dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+   mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || 
die "failed to move shared resources"
fi
dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-04-14 Thread Joonas Niilola

commit: 423e0819a86884988c9355e93ed9bd1d5813e267
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Apr  5 09:52:51 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Apr 14 08:54:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=423e0819

media-gfx/freecad: add option to build designer plugin

Add a USE flag to build and install the designer plugin of FreeCAD,
to be used from within the Qt designer application. The widgets are
prefixed with Gui:: within designer.

See https://forum.freecadweb.org/viewtopic.php?f=10=67706 and
https://github.com/FreeCAD/FreeCAD/pull/6711

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24918
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-.ebuild | 8 +---
 media-gfx/freecad/metadata.xml| 4 
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index f977510288c5..d10e47f1f6e1 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -29,10 +29,9 @@ fi
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="debug headless pcl test"
-RESTRICT="!test? ( test )"
+IUSE="debug designer headless test"
 
-FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_EXPERIMENTAL_MODULES="cloud pcl plot ship"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
openscad part-design path points raytracing robot show surface
techdraw tux"
@@ -45,6 +44,8 @@ for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
 done
 unset module
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
${PYTHON_DEPS}
dev-libs/OpenNI2[opengl(+)]
@@ -156,6 +157,7 @@ src_configure() {
-DBUILD_CLOUD=$(usex cloud)
-DBUILD_COMPLETE=OFF# 
deprecated
-DBUILD_DRAFT=ON
+   -DBUILD_DESIGNER_PLUGIN=$(usex designer)
-DBUILD_DRAWING=ON
-DBUILD_ENABLE_CXX_STD:STRING="C++17"   # needed for current 
git master
-DBUILD_FEM=$(usex fem)

diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 44899f008bc0..0cb44cbdecb5 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -18,6 +18,10 @@
Build the Cloud workbench, to access cloud providers 
(mostly
Amazon S3).

+   
+   Build and install the Qt designer plugin, so the 
FreeCAD widgets
+   can be used from within designer.
+   

Build the Drawing workbench, a predecessor to the 
TechDraw workbench.
Users are encouraged to learn how to use the TechDraw 
workbench and

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-04-06 Thread Piotr Karbowski

commit: 75319af4b4faa0e8c7d4fde6712fc7ea56693dfd
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Wed Apr  6 17:29:37 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Wed Apr  6 17:30:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75319af4

media-gfx/freecad: 0.19.4, : Python 3.10 support added.

Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/freecad/freecad-0.19.4.ebuild | 2 +-
 media-gfx/freecad/freecad-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.4.ebuild 
b/media-gfx/freecad/freecad-0.19.4.ebuild
index 743b82c2a4c3..fb3ed461c41c 100644
--- a/media-gfx/freecad/freecad-0.19.4.ebuild
+++ b/media-gfx/freecad/freecad-0.19.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit check-reqs cmake optfeature python-single-r1 xdg
 

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 1891cda52e3d..f977510288c5 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit check-reqs cmake optfeature python-single-r1 xdg

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-04-02 Thread Andreas Sturmlechner

commit: 477feaf640df94fe5627a00f668351617eded41d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  2 12:51:54 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  2 12:57:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477feaf6

media-gfx/freecad: Fix typo

See also: https://github.com/gentoo/gentoo/pull/24861

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/freecad/freecad-0.19.4.ebuild | 2 +-
 media-gfx/freecad/freecad-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.4.ebuild 
b/media-gfx/freecad/freecad-0.19.4.ebuild
index 270ba00b2832..743b82c2a4c3 100644
--- a/media-gfx/freecad/freecad-0.19.4.ebuild
+++ b/media-gfx/freecad/freecad-0.19.4.ebuild
@@ -138,7 +138,7 @@ CHECKREQS_DISK_BUILD="2G"
 pkg_setup() {
check-reqs_pkg_setup
python-single-r1_pkg_setup
-   [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect 
opencascade"
+   [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect 
opencascade"
 }
 
 src_prepare() {

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 377cf7cb37ba..1891cda52e3d 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -134,7 +134,7 @@ CHECKREQS_DISK_BUILD="2G"
 pkg_setup() {
check-reqs_pkg_setup
python-single-r1_pkg_setup
-   [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect 
opencascade"
+   [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect 
opencascade"
 }
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2022-04-02 Thread Andreas Sturmlechner

commit: a45e193674d314658e13674229d19703d7cbdc47
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Apr  2 12:20:35 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  2 12:57:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a45e1936

media-gfx/freecad: drop 0.19.2-r7

Drop the version instead of backporting to this version.
Use 0.19.4 instead.
See discussion on https://github.com/gentoo/gentoo/pull/24861

Bug: https://bugs.gentoo.org/836433
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/freecad/Manifest |   1 -
 ...-0004809-Security-vulnerability-in-DWG-im.patch |  59 
 ...-0001-fix-failing-test-workbench-testcase.patch |  26 --
 ...-Use-run-instead-of-Popen-to-avoid-need-f.patch |  25 --
 ...2-0002-fix-femtest-failure-with-yaml-load.patch |  26 --
 ...19.2-0003-fix-test-when-built-without-GUI.patch |  33 ---
 ...-fix-build-failure-with-opencascade-7.5.2.patch |  30 --
 media-gfx/freecad/freecad-0.19.2-r7.ebuild | 324 -
 8 files changed, 524 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 02d737572cc2..23eb9682d4ed 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,3 +1,2 @@
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
-DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 
3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf
 SHA512 
420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
 DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 
6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45
 SHA512 
58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f

diff --git 
a/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
 
b/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
deleted file mode 100644
index 2df44ff66ac8..
--- 
a/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 4006e62860c73f0943e71c7da478256a7337941d Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Mon, 31 Jan 2022 08:12:35 +0100
-Subject: [PATCH 1/2] Backport of 0004809: Security vulnerability in DWG import
- when using ODA file converter
-
-Original patch commit id 1742d7ff82af1653253c4a4183c262c9af3b26d6 by
-wmayer .
-
-Signed-off-by: Bernd Waibel 
 a/src/Mod/Draft/importDWG.py
-+++ b/src/Mod/Draft/importDWG.py
-@@ -44,8 +44,6 @@ https://knowledge.autodesk.com/support/autocad/downloads/
- # * *
- # ***
- 
--# TODO: use subprocess.popen() instead of subprocess.call()
--
- import six
- import FreeCAD
- from FreeCAD import Console as FCC
-@@ -217,15 +215,10 @@ def convertToDxf(dwgfilename):
- indir = os.path.dirname(dwgfilename)
- outdir = tempfile.mkdtemp()
- basename = os.path.basename(dwgfilename)
--cmdline = ('"%s" "%s" "%s" "ACAD2000" "DXF" "0" "1" "%s"'
--   % (teigha, indir, outdir, basename))
--FCC.PrintMessage(translate("ImportDWG", "Converting: ")
-- + cmdline + "\n")
--if six.PY2:
--if isinstance(cmdline, six.text_type):
--encoding = sys.getfilesystemencoding()
--cmdline = cmdline.encode(encoding)
--subprocess.call(cmdline, shell=True)  # os.system(cmdline)
-+cmdline = [teigha, indir, outdir, "ACAD2000", "DXF", "0", "1", 
basename]
-+FCC.PrintMessage(translate("draft", "Converting:") + " " + 
str(cmdline) + "\n")
-+proc = subprocess.Popen(cmdline)
-+proc.communicate()
- result = outdir + os.sep + os.path.splitext(basename)[0] + ".dxf"
- if os.path.exists(result):
- FCC.PrintMessage(translate("ImportDWG",
-@@ -270,10 +263,9 @@ def convertToDwg(dxffilename, dwgfilename):
- indir = os.path.dirname(dxffilename)
- outdir = os.path.dirname(dwgfilename)
- basename = os.path.basename(dxffilename)
--cmdline = ('"%s" "%s" "%s" "ACAD2000" "DWG" "0" "1" "%s"'
--   % (teigha, indir, outdir, basename))
--

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

2022-04-02 Thread Andreas Sturmlechner

commit: 728417f0a8ce57a6daaa448100a101d107c25b6d
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Apr  2 08:22:04 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  2 12:57:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=728417f0

media-gfx/freecad: fix build of 0.19.4 with Qt 5.15.3

Backport changes from HEAD FindPySide2Tools.cmake to correctly
find the path for uic and rcc binaries.

Closes: https://bugs.gentoo.org/836433
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24861
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...19.4-backport-correctly-find-PySide2Tools.patch | 106 +
 media-gfx/freecad/freecad-0.19.4.ebuild|   1 +
 2 files changed, 107 insertions(+)

diff --git 
a/media-gfx/freecad/files/freecad-0.19.4-backport-correctly-find-PySide2Tools.patch
 
b/media-gfx/freecad/files/freecad-0.19.4-backport-correctly-find-PySide2Tools.patch
new file mode 100644
index ..b297727033db
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.4-backport-correctly-find-PySide2Tools.patch
@@ -0,0 +1,106 @@
+From 
https://github.com/FreeCAD/FreeCAD/tree/6b062b25e118fc6d260d8caff6cf46fafd6cfa0f
+From: Bernd Waibel 
+Date: Sat, 2 Apr 2022 09:30:09 +0200
+Subject: [PATCH] backport correctly find PySide2Tools
+
+Backported from current HEAD
+
+Signed-off-by: Bernd Waibel 
+--- a/cMake/FindPySide2Tools.cmake
 b/cMake/FindPySide2Tools.cmake
+@@ -23,7 +23,7 @@ endif(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ # Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by 
Qt5Core uic and rcc, with '-g python' option
+ # We test Qt5Core version to act accordingly
+ 
+-FIND_PACKAGE(Qt5Core)
++FIND_PACKAGE(Qt5 COMPONENTS Core)
+ 
+ IF(Qt5Core_VERSION VERSION_LESS 5.14)
+   # Legacy (< 5.14)
+@@ -33,13 +33,20 @@ IF(Qt5Core_VERSION VERSION_LESS 5.14)
+   set(RCCOPTIONS "")
+ ELSE(Qt5Core_VERSION VERSION_LESS 5.14)
+   # New (>= 5.14)
+-  FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic pyside2-uic)
+-  set(UICOPTIONS "--generator=python")
+-  FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc pyside2-rcc)
+-  set(RCCOPTIONS "--generator=python" "--compress-algo=zlib" "--compress=1")
++  if (TARGET Qt::uic)
++get_property(PYSIDE2UICBINARY TARGET Qt::uic PROPERTY LOCATION)
++set(UICOPTIONS "--generator=python")
++  endif()
++  if (TARGET Qt::rcc)
++get_property(PYSIDE2RCCBINARY TARGET Qt::rcc PROPERTY LOCATION)
++set(RCCOPTIONS "--generator=python" "--compress-algo=zlib" "--compress=1")
++  endif()
+ ENDIF(Qt5Core_VERSION VERSION_LESS 5.14)
+ 
+ MACRO(PYSIDE_WRAP_UI outfiles)
++  if (NOT PYSIDE2UICBINARY)
++message(FATAL_ERROR "Qt uic is required for generating ${ARGN}")
++  endif()
+   FOREACH(it ${ARGN})
+ GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+ GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+@@ -58,7 +65,7 @@ MACRO(PYSIDE_WRAP_UI outfiles)
+ # we follow the tool command with in-place sed.
+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+   COMMAND "${PYSIDE2UICBINARY}" ${UICOPTIONS} "${infile}" -o 
"${outfile}"
+-  COMMAND sed -i "/^# /d" "${outfile}"
++  COMMAND sed "/^# /d" "${outfile}" >"${outfile}.tmp" && mv 
"${outfile}.tmp" "${outfile}"
+   MAIN_DEPENDENCY "${infile}"
+ )
+ endif()
+@@ -67,6 +74,9 @@ MACRO(PYSIDE_WRAP_UI outfiles)
+ ENDMACRO (PYSIDE_WRAP_UI)
+ 
+ MACRO(PYSIDE_WRAP_RC outfiles)
++  if (NOT PYSIDE2RCCBINARY)
++message(FATAL_ERROR "Qt rcc is required for generating ${ARGN}")
++  endif()
+   FOREACH(it ${ARGN})
+ GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+ GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+@@ -85,7 +95,7 @@ MACRO(PYSIDE_WRAP_RC outfiles)
+ # we follow the tool command with in-place sed.
+ ADD_CUSTOM_COMMAND(OUTPUT "${outfile}"
+   COMMAND "${PYSIDE2RCCBINARY}" ${RCCOPTIONS} "${infile}" 
${PY_ATTRIBUTE} -o "${outfile}"
+-  COMMAND sed -i "/^# /d" "${outfile}"
++  COMMAND sed "/^# /d" "${outfile}" >"${outfile}.tmp" && mv 
"${outfile}.tmp" "${outfile}"
+   MAIN_DEPENDENCY "${infile}"
+ )
+ endif()
+@@ -93,20 +103,17 @@ MACRO(PYSIDE_WRAP_RC outfiles)
+   ENDFOREACH(it)
+ ENDMACRO (PYSIDE_WRAP_RC)
+ 
+-IF(EXISTS ${PYSIDE2UICBINARY} AND EXISTS ${PYSIDE2RCCBINARY})
+-   set(PYSIDE2_TOOLS_FOUND TRUE)
+-ENDIF(EXISTS ${PYSIDE2UICBINARY} AND EXISTS ${PYSIDE2RCCBINARY})
+-
+ if(PYSIDE2RCCBINARY AND PYSIDE2UICBINARY)
++  set(PYSIDE2_TOOLS_FOUND TRUE)
++  if (NOT PySide2Tools_FIND_QUIETLY)
++message(STATUS "Found PySide2 tools: ${PYSIDE2UICBINARY}, 
${PYSIDE2RCCBINARY}")
++  endif (NOT PySide2Tools_FIND_QUIETLY)
++else(PYSIDE2RCCBINARY AND PYSIDE2UICBINARY)
++  if(PySide2Tools_FIND_REQUIRED)
++message(FATAL_ERROR "PySide2 tools could not be found, but are required.")
++  else(PySide2Tools_FIND_REQUIRED)
+ if (NOT PySide2Tools_FIND_QUIETLY)
+-message(STATUS

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2022-03-19 Thread Sam James

commit: 8ef65a33f8d2be7585c134664ae4b83906679719
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Jan 18 18:15:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 16:14:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef65a33

media-gfx/freecad: bump to 0.19.4

Closes: https://bugs.gentoo.org/834470
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24643
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/Manifest |   1 +
 ...ad-0.19.4-Gentoo-specific-don-t-check-vcs.patch |  20 ++
 media-gfx/freecad/freecad-0.19.4.ebuild| 323 +
 media-gfx/freecad/metadata.xml |   8 +
 4 files changed, 352 insertions(+)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index fe0489b287e6..02d737572cc2 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1,3 @@
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 
3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf
 SHA512 
420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
+DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 
6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45
 SHA512 
58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f

diff --git 
a/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch 
b/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index ..62ae92392adf
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,20 @@
+From 60ba533d21302b8a4c11ac06adb53b4041754b02 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Tue, 1 Mar 2022 18:22:00 +0100
+Subject: [PATCH] [Gentoo specific] don't check vcs
+
+Signed-off-by: Bernd Waibel 
+--- a/src/Tools/SubWCRev.py
 b/src/Tools/SubWCRev.py
+@@ -455,7 +455,7 @@ def main():
+ if o in ("-b", "--bindir"):
+ bindir = a
+ 
+-vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), 
MercurialControl(), DebianChangelog(), UnknownControl()]
++vcs=[UnknownControl()]
+ for i in vcs:
+ if i.extractInfo(srcdir, bindir):
+ # Open the template file and the version file
+-- 
+2.35.1
+

diff --git a/media-gfx/freecad/freecad-0.19.4.ebuild 
b/media-gfx/freecad/freecad-0.19.4.ebuild
new file mode 100644
index ..cab7693eaacd
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.19.4.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit check-reqs cmake optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
+
+MY_PN=FreeCAD
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
+   S="${WORKDIR}/freecad-${PV}"
+else
+   MY_PV=$(ver_cut 1-2)
+   MY_PV=$(ver_rs 1 '_' ${MY_PV})
+   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
+   
https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${PN}-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz;
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/FreeCAD-${PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr drawing fem idf image inspection
+   material openscad part-design path points raytracing robot show
+   surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+   IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+   IUSE="${IUSE} ${module}"
+done
+unset module
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/OpenNI2[opengl(+)]
+   dev-libs/libspnav[X]
+   dev-libs/xerces-c[icu]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2022-03-19 Thread Sam James

commit: 5927fa068889aa555a1f9657e27305eb11ffae37
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Mar 18 09:12:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 16:14:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5927fa06

media-gfx/freecad: drop environment file

Setting PYTHONPATH seems no longer be needed and raises incompatibilities
with other packages.

Also, AddonManager plugin now needs webchannel and webengine support for 
pyside2,
thus the USEDEP string has been updated to include USE flags for these.

Bug: https://bugs.gentoo.org/835331
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24636
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/files/99freecad | 1 -
 .../freecad/{freecad-0.19.2-r6.ebuild => freecad-0.19.2-r7.ebuild}| 2 --
 media-gfx/freecad/freecad-.ebuild | 4 +---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/media-gfx/freecad/files/99freecad 
b/media-gfx/freecad/files/99freecad
deleted file mode 100644
index 81104107c22e..
--- a/media-gfx/freecad/files/99freecad
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONPATH=/usr/lib64/freecad/Ext:/usr/lib64/freecad/Mod:/usr/lib64/freecad/lib64

diff --git a/media-gfx/freecad/freecad-0.19.2-r6.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r7.ebuild
similarity index 99%
rename from media-gfx/freecad/freecad-0.19.2-r6.ebuild
rename to media-gfx/freecad/freecad-0.19.2-r7.ebuild
index 931a6260baa1..aa2041fd5f01 100644
--- a/media-gfx/freecad/freecad-0.19.2-r6.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r7.ebuild
@@ -273,8 +273,6 @@ src_install() {
python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage 
"${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
# compile main package in python site-packages as well
python_optimize
-
-   doenvd "${FILESDIR}/99${PN}"
 }
 
 pkg_postinst() {

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 97ada209ae61..377cf7cb37ba 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -87,7 +87,7 @@ RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
dev-python/pybind11[${PYTHON_USEDEP}]
-   dev-python/pyside2[gui,svg,${PYTHON_USEDEP}]
+   
dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
dev-python/shiboken2[${PYTHON_USEDEP}]
addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
fem? ( dev-python/ply[${PYTHON_USEDEP}] )
@@ -270,8 +270,6 @@ src_install() {
python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage 
"${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
# compile main package in python site-packages as well
python_optimize
-
-   doenvd "${FILESDIR}/99${PN}"
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-02-03 Thread John Helmert III

commit: 688c609c7edf5ac40dbdc89ef419187544e4319f
Author: Bernd Waibel  posteo  net>
AuthorDate: Thu Feb  3 05:15:21 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Thu Feb  3 15:51:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688c609c

media-gfx/freecad: cleanup vulnerable versions

Bug: https://bugs.gentoo.org/832209
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24061
Signed-off-by: John Helmert III  gentoo.org>

 media-gfx/freecad/freecad-0.19.2-r5.ebuild | 324 -
 1 file changed, 324 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.2-r5.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r5.ebuild
deleted file mode 100644
index 7ebeed8e3168..
--- a/media-gfx/freecad/freecad-0.19.2-r5.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit check-reqs cmake optfeature python-single-r1 xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
-
-MY_PN=FreeCAD
-
-if [[ ${PV} = * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
-   S="${WORKDIR}/freecad-${PV}"
-else
-   MY_PV=$(ver_cut 1-2)
-   MY_PV=$(ver_rs 1 '_' ${MY_PV})
-   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
-   
https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${P}-0005-Make-smesh-compile-with-vtk9.patch.xz;
-   KEYWORDS="~amd64"
-   S="${WORKDIR}/FreeCAD-${PV}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="debug headless pcl test"
-RESTRICT="!test? ( test )"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
-FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
-   openscad part-design path points raytracing robot show surface
-   techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
-   IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-   IUSE="${IUSE} ${module}"
-done
-unset module
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-libs/OpenNI2[opengl(+)]
-   dev-libs/libspnav[X]
-   dev-libs/xerces-c[icu]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-   dev-qt/qtx11extras:5
-   dev-qt/qtxml:5
-   >=media-libs/coin-4.0.0
-   media-libs/freetype
-   media-libs/qhull:=
-   sci-libs/flann[openmp]
-   sci-libs/hdf5:=[fortran,zlib]
-   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-   =sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
-   $(python_gen_cond_dep '
-   dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-   dev-python/pybind11[${PYTHON_USEDEP}]
-   dev-python/pyside2[gui,svg,${PYTHON_USEDEP}]
-   dev-python/shiboken2[${PYTHON_USEDEP}]
-   addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
-   fem? ( dev-python/ply[${PYTHON_USEDEP}] )
-   ')
-"
-DEPEND="
-   ${RDEPEND}
-   >=dev-cpp/eigen-3.3.1:3
-"
-BDEPEND="dev-lang/swig"
-
-# To get required dependencies:
-# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-# We set the following requirements by default:
-# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, 
web.
-#
-# Additionally, we auto-enable mesh_part, flat_mesh and smesh
-# Fem actually needs smesh, but as long as we don't have a smesh package, we 
enable
-# smesh through the mesh USE flag. Note however, the fem<-smesh dependency 
isn't
-# reflected by the REQUIRES_MODS macro, but at
-# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
-#
-# The increase in auto-enabled workbenches is due to their need in parts of the
-# test suite when compiled with a minimal set of USE flags.
-REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
-   inspection? ( points )
-   path? ( robot )
-   ship? ( image plot )
-"
-
-PATCHES=(
-   
"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
-   
"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
-   "${FILESDIR}"/${P}-0001-fix-failing-test-workbench-testcase.patch
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

2022-02-02 Thread Sam James

commit: a57d11c8caaa82831507a2074d19ec87cb62dbcb
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Jan 31 05:32:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb  3 02:18:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57d11c8

media-gfx/freecad: backport vulnerability patches

Bug: https://bugs.gentoo.org/832209
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24043
Signed-off-by: Sam James  gentoo.org>

 ...-0004809-Security-vulnerability-in-DWG-im.patch |  59 
 ...-Use-run-instead-of-Popen-to-avoid-need-f.patch |  25 ++
 media-gfx/freecad/freecad-0.19.2-r6.ebuild | 326 +
 3 files changed, 410 insertions(+)

diff --git 
a/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
 
b/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
new file mode 100644
index ..2df44ff66ac8
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
@@ -0,0 +1,59 @@
+From 4006e62860c73f0943e71c7da478256a7337941d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Mon, 31 Jan 2022 08:12:35 +0100
+Subject: [PATCH 1/2] Backport of 0004809: Security vulnerability in DWG import
+ when using ODA file converter
+
+Original patch commit id 1742d7ff82af1653253c4a4183c262c9af3b26d6 by
+wmayer .
+
+Signed-off-by: Bernd Waibel 
+--- a/src/Mod/Draft/importDWG.py
 b/src/Mod/Draft/importDWG.py
+@@ -44,8 +44,6 @@ https://knowledge.autodesk.com/support/autocad/downloads/
+ # * *
+ # ***
+ 
+-# TODO: use subprocess.popen() instead of subprocess.call()
+-
+ import six
+ import FreeCAD
+ from FreeCAD import Console as FCC
+@@ -217,15 +215,10 @@ def convertToDxf(dwgfilename):
+ indir = os.path.dirname(dwgfilename)
+ outdir = tempfile.mkdtemp()
+ basename = os.path.basename(dwgfilename)
+-cmdline = ('"%s" "%s" "%s" "ACAD2000" "DXF" "0" "1" "%s"'
+-   % (teigha, indir, outdir, basename))
+-FCC.PrintMessage(translate("ImportDWG", "Converting: ")
+- + cmdline + "\n")
+-if six.PY2:
+-if isinstance(cmdline, six.text_type):
+-encoding = sys.getfilesystemencoding()
+-cmdline = cmdline.encode(encoding)
+-subprocess.call(cmdline, shell=True)  # os.system(cmdline)
++cmdline = [teigha, indir, outdir, "ACAD2000", "DXF", "0", "1", 
basename]
++FCC.PrintMessage(translate("draft", "Converting:") + " " + 
str(cmdline) + "\n")
++proc = subprocess.Popen(cmdline)
++proc.communicate()
+ result = outdir + os.sep + os.path.splitext(basename)[0] + ".dxf"
+ if os.path.exists(result):
+ FCC.PrintMessage(translate("ImportDWG",
+@@ -270,10 +263,9 @@ def convertToDwg(dxffilename, dwgfilename):
+ indir = os.path.dirname(dxffilename)
+ outdir = os.path.dirname(dwgfilename)
+ basename = os.path.basename(dxffilename)
+-cmdline = ('"%s" "%s" "%s" "ACAD2000" "DWG" "0" "1" "%s"'
+-   % (teigha, indir, outdir, basename))
+-FCC.PrintMessage(translate("ImportDWG", "Converting: ")
+- + cmdline + "\n")
+-subprocess.call(cmdline, shell=True)  # os.system(cmdline)
++cmdline = [teigha, indir, outdir, "ACAD2000", "DWG", "0", "1", 
basename]
++FCC.PrintMessage(translate("draft", "Converting:") + " " + 
str(cmdline) + "\n")
++proc = subprocess.Popen(cmdline)
++proc.communicate()
+ return dwgfilename
+ return None
+-- 
+2.35.0
+

diff --git 
a/media-gfx/freecad/files/freecad-0.19.2-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch
 
b/media-gfx/freecad/files/freecad-0.19.2-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch
new file mode 100644
index ..9b043bd34563
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.2-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch
@@ -0,0 +1,25 @@
+From 937d8ca9bf4c50f8a7dc0fbcf9e6ac23b0fbe033 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Mon, 31 Jan 2022 08:17:24 +0100
+Subject: [PATCH 2/2] Backport of Use run() instead of Popen() to avoid need
+ for communicate
+
+Original patch commit id a65dbc6f8296562a12407a36f4931a80bbb628b7 by
+sliptonic 
+
+Signed-off-by: Bernd Waibel 
+--- a/src/Mod/Path/PathScripts/PathSanity.py
 b/src/Mod/Path/PathScripts/PathSanity.py
+@@ -412,8 +412,7 @@ class CommandPathSanity:
+ FreeCAD.Console.PrintMessage('asciidoc file written to 
{}\n'.format(reportraw))
+ 
+ try:
+-result = os.system('asciidoctor {}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-01-28 Thread Sam James

commit: c0d511652d855d453231c9e301c1516586889131
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Jan 16 11:13:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 28 08:24:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d51165

media-gfx/freecad: fix patchset

Split the patchset and use several patches instead of a compressed
patch set stored elsewhere. This way, the patches can be handled
more easily in case of upstream changes to some of the files.

Some of the source code files have to be patched in order to use
the settings.

Bug: https://github.com/waebbl/waebbl-gentoo/issues/354
Bug: https://github.com/waebbl/waebbl-gentoo/issues/355
Closes: https://bugs.gentoo.org/831086
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23825
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/Manifest|  1 -
 media-gfx/freecad/freecad-.ebuild | 30 +++---
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index cf58ec9ff504..fe0489b287e6 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,3 +1,2 @@
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 
3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf
 SHA512 
420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
-DIST 
freecad--Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4144 
BLAKE2B 
bfd9a0fcd9a6a5fb4c9ef2d5e88e69b869f908142cedf5dd1449b917d90e36187ce6227af99613efedd05eb3218d17e9e6df4430ea0413988340c91c111bbe4e
 SHA512 
5d452eca6bc88fb50ae47a6b6127e39f3d17a60498627920b13273e6afaceaca64e47ade4d1fce18b3bfbcdf4eb13565244ecc575707f1aedf3bb1d6dfc7e89e

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 2852f295c8e1..97ada209ae61 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,12 +11,10 @@ DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
 
 MY_PN=FreeCAD
-MY_PATCH="${P}-Gentoo-specific-fix-install-locations-of-Ext-and-Mod"
 
 if [[ ${PV} = * ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
-   
SRC_URI="https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${MY_PATCH}.patch.xz;
S="${WORKDIR}/freecad-${PV}"
 else
MY_PV=$(ver_cut 1-2)
@@ -139,11 +137,6 @@ pkg_setup() {
[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect 
opencascade"
 }
 
-src_unpack() {
-   git-r3_src_unpack
-   unpack ${MY_PATCH}.patch.xz
-}
-
 src_prepare() {
# the upstream provided file doesn't find the coin doc tag file,
# but cmake ships a working one, so we use this.
@@ -153,13 +146,6 @@ src_prepare() {
sed -e 's/Exec=FreeCAD/Exec=freecad/' -i 
src/XDGData/org.freecadweb.FreeCAD.desktop || die
 
cmake_src_prepare
-
-   # Fix line endings on a few files for patching
-   for f in src/Mod/{Cloud,Inspection,Start/StartPage}/CMakeLists.txt; do
-   dos2unix -q ${f}
-   done
-
-   eapply 
"${WORKDIR}"/${P}-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch
 }
 
 src_configure() {
@@ -210,10 +196,10 @@ src_configure() {
-DBUILD_WEB=ON  
# needed by start workspace
-DBUILD_WITH_CONDA=OFF
 
-   -DCMAKE_INSTALL_DATADIR=share/${PN}/data
-   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-   -DCMAKE_INSTALL_INCLUDEDIR=include/${PN}
-   -DCMAKE_INSTALL_LIBDIR=$(get_libdir)/${PN}
+   -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+   -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+   -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
 
-DFREECAD_BUILD_DEBIAN=OFF
 
@@ -275,6 +261,12 @@ src_install() {
 
dobin src/Tools/freecad-thumbnailer
 
+   if ! use headless; then
+   dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-01-09 Thread Sam James

commit: 6954d318554a2bc37ab6855b49f72af824a588d6
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Dec 19 08:18:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 10 01:02:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6954d318

media-gfx/freecad: update Manifest for updated patch bundle

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 94a0fc360a90..cf58ec9ff504 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,3 +1,3 @@
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 
3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf
 SHA512 
420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
-DIST 
freecad--Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4136 
BLAKE2B 
207003dacd7f02bd4782ebb0d5f9a7093d8fd3ef8011301454dab03d7a79bab7b2fd623c7d8e11d1f6557803b40f1d206dc75c41b1520e1dd2467dda72d91868
 SHA512 
d7d6096c1cfb06e6218673a927c5791ec820dc13a23c89df6233109e288d98f86920141e01a8cb680e7cbb8c83c4c655a7a66d5578d284a144dc3f44c028ceb5
+DIST 
freecad--Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4144 
BLAKE2B 
bfd9a0fcd9a6a5fb4c9ef2d5e88e69b869f908142cedf5dd1449b917d90e36187ce6227af99613efedd05eb3218d17e9e6df4430ea0413988340c91c111bbe4e
 SHA512 
5d452eca6bc88fb50ae47a6b6127e39f3d17a60498627920b13273e6afaceaca64e47ade4d1fce18b3bfbcdf4eb13565244ecc575707f1aedf3bb1d6dfc7e89e

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2022-01-09 Thread Sam James

commit: 30b2c7a4590ba71245e305c5584ad8b686f5aca6
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Dec 18 22:35:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 10 01:02:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30b2c7a4

media-gfx/freecad: restrict opencascade for 0.19.2

This version doesn't build against 7.6.0, so we restrict to 7.5 versions.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-0.19.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-0.19.2-r5.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r5.ebuild
index c9287ed91fa5..7ebeed8e3168 100644
--- a/media-gfx/freecad/freecad-0.19.2-r5.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r5.ebuild
@@ -68,7 +68,7 @@ RDEPEND="
sci-libs/flann[openmp]
sci-libs/hdf5:=[fortran,zlib]
>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-   sci-libs/opencascade:=[vtk(+)]
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-12-04 Thread Sam James

commit: febb7b197dd214a577942eddcc0096984ec0b8d3
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Dec  3 23:11:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  4 21:52:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=febb7b19

media-gfx/freecad: don't fail if oce and occ are both installed

Switch a cmake option, to allow proper configuration if both
sci-libs/oce and sci-libs/opencascade are installed.
This allows to further simplify opencascade related logic.

Closes: https://bugs.gentoo.org/827936
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-0.19.2-r5.ebuild | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.2-r5.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r5.ebuild
index df0faac7f980..c9287ed91fa5 100644
--- a/media-gfx/freecad/freecad-0.19.2-r5.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r5.ebuild
@@ -223,17 +223,6 @@ src_configure() {
# Use the version of shiboken2 that matches the selected python 
version
-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-DPython3_EXECUTABLE=${PYTHON}
-
-   -DOCCT_CMAKE_FALLBACK=ON# don't 
use occt-config which isn't included in opencascade for Gentoo
-   )
-
-   # bug https://bugs.gentoo.org/788274
-   local OCC_P=$(best_version sci-libs/opencascade[vtk])
-   OCC_P=${OCC_P#sci-libs/}
-   OCC_P=${OCC_P%-r*}
-   mycmakeargs+=(
-   -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
-   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
)
 
if use debug; then

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-12-04 Thread Sam James

commit: acca9d04991575dad5d9930110e6ed3ec199d859
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Dec  4 11:06:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  4 21:52:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acca9d04

media-gfx/freecad: port changes from v0.19 to live ebuild

Switch a cmake option, to allow proper configuration, if both,
sci-libs/oce and sci-libs/opencascade are being installed.
This allow to further simplify opencascade related logic.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23179
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-.ebuild | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index a4a2fa3acc6c..2852f295c8e1 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -234,17 +234,6 @@ src_configure() {
# Use the version of shiboken2 that matches the selected python 
version
-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-DPython3_EXECUTABLE=${PYTHON}
-
-   -DOCCT_CMAKE_FALLBACK=ON# don't 
use occt-config which isn't included in opencascade for Gentoo
-   )
-
-   # bug https://bugs.gentoo.org/788274
-   local OCC_P=$(best_version sci-libs/opencascade[vtk])
-   OCC_P=${OCC_P#sci-libs/}
-   OCC_P=${OCC_P%-r*}
-   mycmakeargs+=(
-   -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
-   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
)
 
if use debug; then

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-11-30 Thread Joonas Niilola

commit: e6c53e3e86537e972bea3fcc51d83edee653e3f2
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Nov 20 01:14:41 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov 30 12:50:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6c53e3e

media-gfx/freecad: remove obsolete patch

- fix some dependencies
- simplify opencascade related code, which has been obsoleted due to removal
of slot 7.4.0
- use default CMAKE_INSTALL_PREFIX (/usr) instead of /usr/$(get_libdir)/${PN}.
This leads to some files being installed in /usr/{Ext,Mod}. A new patch
fixes this. The lower case symlinks for the executables are no longer
installed now, as the binaries are in the path and can be called 
directly.
- use relative patchs for CMAKE_INSTALL_* variables

Closes: https://bugs.gentoo.org/824550
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/Manifest|  1 +
 media-gfx/freecad/freecad-.ebuild | 81 +++
 2 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index fe0489b287e6..94a0fc360a90 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1,3 @@
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 
3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf
 SHA512 
420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
+DIST 
freecad--Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4136 
BLAKE2B 
207003dacd7f02bd4782ebb0d5f9a7093d8fd3ef8011301454dab03d7a79bab7b2fd623c7d8e11d1f6557803b40f1d206dc75c41b1520e1dd2467dda72d91868
 SHA512 
d7d6096c1cfb06e6218673a927c5791ec820dc13a23c89df6233109e288d98f86920141e01a8cb680e7cbb8c83c4c655a7a66d5578d284a144dc3f44c028ceb5

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index df78793c7f3b..a4a2fa3acc6c 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -11,10 +11,12 @@ DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
 
 MY_PN=FreeCAD
+MY_PATCH="${P}-Gentoo-specific-fix-install-locations-of-Ext-and-Mod"
 
 if [[ ${PV} = * ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
+   
SRC_URI="https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${MY_PATCH}.patch.xz;
S="${WORKDIR}/freecad-${PV}"
 else
MY_PV=$(ver_cut 1-2)
@@ -47,7 +49,6 @@ unset module
 
 RDEPEND="
${PYTHON_DEPS}
-   >=dev-cpp/eigen-3.3.1:3
dev-libs/OpenNI2[opengl(+)]
dev-libs/libspnav[X]
dev-libs/xerces-c[icu]
@@ -79,7 +80,7 @@ RDEPEND="
dev-libs/openssl:=
net-misc/curl
)
-   fem? ( 
sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+   fem? ( 
sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
openscad? ( media-gfx/openscad )
pcl? ( sci-libs/pcl:=[opengl,openni2(+),qt5(+),vtk(+)] )
$(python_gen_cond_dep '
@@ -94,8 +95,14 @@ RDEPEND="
fem? ( dev-python/ply[${PYTHON_USEDEP}] )
')
 "
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/swig"
+DEPEND="
+   ${RDEPEND}
+   >=dev-cpp/eigen-3.3.1:3
+"
+BDEPEND="
+   app-text/dos2unix
+   dev-lang/swig
+"
 
 # To get required dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
@@ -132,31 +139,27 @@ pkg_setup() {
[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect 
opencascade"
 }
 
+src_unpack() {
+   git-r3_src_unpack
+   unpack ${MY_PATCH}.patch.xz
+}
+
 src_prepare() {
# the upstream provided file doesn't find the coin doc tag file,
# but cmake ships a working one, so we use this.
rm "${S}/cMake/FindCoin3D.cmake" || die
 
-   # Fix OpenCASCADE lookup
-   local OCC_P=$(best_version sci-libs/opencascade[vtk])
-   OCC_P=${OCC_P#sci-libs/}
-   local OCC_PV=${OCC_P#opencascade-}
-   OCC_PV=$(ver_cut 1-2 ${OCC_PV})
-   # check for CASROOT needed to ensure occ-7.5 is eselected and profile 
resourced
-   if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then
-   sed -e

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-11-30 Thread Joonas Niilola

commit: 3c966730bf52e6d2169cb8d0a35133e92a13076b
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Nov 20 10:13:34 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov 30 12:50:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c966730

media-gfx/freecad: simplify opencascade logic

With sci-libs/opencascade:7.4.0 gone from the tree, this patch simplifies
the code needed to configure various opencascade related variables to cmake.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23008
Signed-off-by: Joonas Niilola  gentoo.org>

 ...d-0.19.2-r4.ebuild => freecad-0.19.2-r5.ebuild} | 48 ++
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.2-r4.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r5.ebuild
similarity index 90%
rename from media-gfx/freecad/freecad-0.19.2-r4.ebuild
rename to media-gfx/freecad/freecad-0.19.2-r5.ebuild
index 24dc6a703399..df0faac7f980 100644
--- a/media-gfx/freecad/freecad-0.19.2-r4.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r5.ebuild
@@ -47,7 +47,6 @@ unset module
 
 RDEPEND="
${PYTHON_DEPS}
-   >=dev-cpp/eigen-3.3.1:3
dev-libs/OpenNI2[opengl(+)]
dev-libs/libspnav[X]
dev-libs/xerces-c[icu]
@@ -79,7 +78,7 @@ RDEPEND="
dev-libs/openssl:=
net-misc/curl
)
-   fem? ( 
sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+   fem? ( 
sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
openscad? ( media-gfx/openscad )
pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
$(python_gen_cond_dep '
@@ -94,7 +93,10 @@ RDEPEND="
fem? ( dev-python/ply[${PYTHON_USEDEP}] )
')
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+   ${RDEPEND}
+   >=dev-cpp/eigen-3.3.1:3
+"
 BDEPEND="dev-lang/swig"
 
 # To get required dependencies:
@@ -143,22 +145,6 @@ src_prepare() {
# but cmake ships a working one, so we use this.
rm "${S}/cMake/FindCoin3D.cmake" || die
 
-   # Fix OpenCASCADE lookup
-   local OCC_P=$(best_version sci-libs/opencascade[vtk])
-   OCC_P=${OCC_P#sci-libs/}
-   local OCC_PV=${OCC_P#opencascade-}
-   OCC_PV=$(ver_cut 1-2 ${OCC_PV})
-   # check for CASROOT needed to ensure occ-7.5 is eselected and profile 
resourced
-   if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then
-   sed -e 
's|/usr/include/opencascade|'${CASROOT}'/include/'${OCC_P}'|' \
-   -e 's|/usr/lib|'${CASROOT}'/'$(get_libdir)'/'${OCC_P}' 
NO_DEFAULT_PATH|' \
-   -i cMake/FindOpenCasCade.cmake || die
-   else
-   sed -e 
's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
-   -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' 
NO_DEFAULT_PATH|' \
-   -i cMake/FindOpenCasCade.cmake || die
-   fi
-
# Fix desktop file
sed -e 's/Exec=FreeCAD/Exec=freecad/' -i 
src/XDGData/org.freecadweb.FreeCAD.desktop || die
 
@@ -241,22 +227,14 @@ src_configure() {
-DOCCT_CMAKE_FALLBACK=ON# don't 
use occt-config which isn't included in opencascade for Gentoo
)
 
-   if has_version ">=sci-libs/opencascade-7.5"; then
-   # bug https://bugs.gentoo.org/788274
-   local OCC_P=$(best_version sci-libs/opencascade[vtk])
-   OCC_P=${OCC_P#sci-libs/}
-   OCC_P=${OCC_P%-r*}
-   mycmakeargs+=(
-   -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
-   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
-   )
-   else
-   # https://bugs.gentoo.org/788274
+   local OCC_P=$(best_version sci-libs/opencascade[vtk])
+   OCC_P=${OCC_P#sci-libs/}
+   OCC_P=${OCC_P%-r*}
+   mycmakeargs+=(
+   -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
+   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
+   )
 
if use debug; then
mycmakeargs+=(

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2021-11-28 Thread Miroslav Šulc

commit: c9c70febe01d558f88c2d621515b889075afd1f1
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Nov 28 09:57:56 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Nov 28 09:58:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c70feb

media-gfx/freecad: dropped patch in live

patch is already applied by upstream and so prevented building freecad

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...-Add-memory-header-for-std-shared_ptr.patch | 31 --
 media-gfx/freecad/freecad-.ebuild  |  1 -
 2 files changed, 32 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad--Add-memory-header-for-std-shared_ptr.patch
 
b/media-gfx/freecad/files/freecad--Add-memory-header-for-std-shared_ptr.patch
deleted file mode 100644
index 81a8f22d8937..
--- 
a/media-gfx/freecad/files/freecad--Add-memory-header-for-std-shared_ptr.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Bernd Waibel 
-Date: Sat, 16 Oct 2021 17:02:19 +0200
-Subject: [PATCH] Add memory header for std::shared_ptr
-
-Signed-off-by: Bernd Waibel 

- src/App/Metadata.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/App/Metadata.h b/src/App/Metadata.h
-index de8be3ea8e..2c5fd8f417 100644
 a/src/App/Metadata.h
-+++ b/src/App/Metadata.h
-@@ -30,6 +30,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include 
- #include 
-@@ -296,4 +297,4 @@ namespace App {
- 
- }
- 
--#endif
-\ No newline at end of file
-+#endif
--- 
-2.33.1
-

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index cef63f28477e..df78793c7f3b 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -120,7 +120,6 @@ REQUIRED_USE="
 PATCHES=(

"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch

"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
-   "${FILESDIR}"/${P}-Add-memory-header-for-std-shared_ptr.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

2021-11-02 Thread Sam James

commit: 6499c130f97644defd3b71d86c4af3b3b5c96c2a
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Oct 17 19:55:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  2 10:04:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6499c130

media-gfx/freecad: install freecad-thumbnailer

Can be used by file-managers to show previews for FreeCAD's .fcstd
files.

Additional changes:
- bump to EAPI 8
- cleanup inherit statement
- patch to build with boost-1.77.0
- soften sci-libs/pcl dependency. pcl-1.12 supports vtk-9, so there's
no longer any need to use live ebuild
- clean optfeature statments from packages which are installed anyway
or controlled by USE flags
- use C++17

Suggested-by: Michael Perlov  gmail.com>
Bug: https://github.com/waebbl/waebbl-gentoo/issues/341
Closes: https://bugs.gentoo.org/821160
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 ...-Add-memory-header-for-std-shared_ptr.patch | 31 ++
 media-gfx/freecad/freecad-.ebuild  | 24 -
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad--Add-memory-header-for-std-shared_ptr.patch
 
b/media-gfx/freecad/files/freecad--Add-memory-header-for-std-shared_ptr.patch
new file mode 100644
index 000..81a8f22d893
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad--Add-memory-header-for-std-shared_ptr.patch
@@ -0,0 +1,31 @@
+From: Bernd Waibel 
+Date: Sat, 16 Oct 2021 17:02:19 +0200
+Subject: [PATCH] Add memory header for std::shared_ptr
+
+Signed-off-by: Bernd Waibel 
+---
+ src/App/Metadata.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/App/Metadata.h b/src/App/Metadata.h
+index de8be3ea8e..2c5fd8f417 100644
+--- a/src/App/Metadata.h
 b/src/App/Metadata.h
+@@ -30,6 +30,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+@@ -296,4 +297,4 @@ namespace App {
+ 
+ }
+ 
+-#endif
+\ No newline at end of file
++#endif
+-- 
+2.33.1
+

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 8c0caca6adc..cef63f28477 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
 
-inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
+inherit check-reqs cmake optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
@@ -81,7 +81,7 @@ RDEPEND="
)
fem? ( 
sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
openscad? ( media-gfx/openscad )
-   pcl? ( ~sci-libs/pcl-${PV}:=[opengl,openni2(+),qt5(+),vtk(+)] )
+   pcl? ( sci-libs/pcl:=[opengl,openni2(+),qt5(+),vtk(+)] )
$(python_gen_cond_dep '
dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -120,6 +120,7 @@ REQUIRED_USE="
 PATCHES=(

"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch

"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+   "${FILESDIR}"/${P}-Add-memory-header-for-std-shared_ptr.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
@@ -168,7 +169,7 @@ src_configure() {
-DBUILD_COMPLETE=OFF# 
deprecated
-DBUILD_DRAFT=ON
-DBUILD_DRAWING=ON
-   -DBUILD_ENABLE_CXX_STD:STRING="C++14"   # needed for 
>=boost-1.75.0
+   -DBUILD_ENABLE_CXX_STD:STRING="C++17"   # needed for current 
git master
-DBUILD_FEM=$(usex fem)
-DBUILD_FEM_NETGEN=OFF
-DBUILD_FLAT_MESH=ON
@@ -224,14 +225,14 @@ src_configure() {
-DFREECAD_USE_QT_FILEDIALOG=ON
-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
-   # Use the version of shiboken2 that matches the selected python 
version
-   -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-
# install python modules to site-packages' dir. True only for 
the main package,
# sub-packages will still be installed inside /usr/lib64/freecad
-DINSTALL_TO_SITEPACKAGES=ON
 
+   # Use the version of shiboken2 that matches the selected python 
version
+   -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-DPython3_EXECUTABLE=${PYTHON}
+
-DOCCT_CMAKE_FALLBACK=ON# don't 
use occt-config which isn't included in opencascade for Gentoo
)
 
@@ -289,11 +290,13 @@

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-11-02 Thread Sam James

commit: 5851bd091fca1165c97a27e96232807548b5df84
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Oct 18 04:53:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  2 10:04:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5851bd09

media-gfx/freecad: backport some changes from live ebuild

- install freecad-thumbnailer
- bump to EAPI 8
- clean inherit statement
- clean optfeature statements from packages which are installed anyway
or controlled by use flags
- use C++17

Bug: https://bugs.gentoo.org/821160
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-0.19.2-r4.ebuild | 357 +
 1 file changed, 357 insertions(+)

diff --git a/media-gfx/freecad/freecad-0.19.2-r4.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r4.ebuild
new file mode 100644
index 000..24dc6a70339
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.19.2-r4.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit check-reqs cmake optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
+
+MY_PN=FreeCAD
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
+   S="${WORKDIR}/freecad-${PV}"
+else
+   MY_PV=$(ver_cut 1-2)
+   MY_PV=$(ver_rs 1 '_' ${MY_PV})
+   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
+   
https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${P}-0005-Make-smesh-compile-with-vtk9.patch.xz;
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/FreeCAD-${PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
+   openscad part-design path points raytracing robot show surface
+   techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+   IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+   IUSE="${IUSE} ${module}"
+done
+unset module
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-cpp/eigen-3.3.1:3
+   dev-libs/OpenNI2[opengl(+)]
+   dev-libs/libspnav[X]
+   dev-libs/xerces-c[icu]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   dev-qt/qtxml:5
+   >=media-libs/coin-4.0.0
+   media-libs/freetype
+   media-libs/qhull:=
+   sci-libs/flann[openmp]
+   sci-libs/hdf5:=[fortran,zlib]
+   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+   sci-libs/opencascade:=[vtk(+)]
+   sci-libs/orocos_kdl:=
+   sys-libs/zlib
+   virtual/glu
+   virtual/libusb:1
+   virtual/opengl
+   cloud? (
+   dev-libs/openssl:=
+   net-misc/curl
+   )
+   fem? ( 
sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+   openscad? ( media-gfx/openscad )
+   pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
+   $(python_gen_cond_dep '
+   dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   dev-python/pyside2[gui,svg,${PYTHON_USEDEP}]
+   dev-python/shiboken2[${PYTHON_USEDEP}]
+   addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
+   fem? ( dev-python/ply[${PYTHON_USEDEP}] )
+   ')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, 
web.
+#
+# Additionally, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we 
enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency 
isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+#
+# The increase in auto-enabled workbenches is due to

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-11-02 Thread Sam James

commit: ba49e1c413cad33d9c7a69afa8e8459cf773c0bd
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Oct 18 04:55:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  2 10:04:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba49e1c4

media-gfx/freecad: drop 0.19.2-r3

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22619
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-0.19.2-r3.ebuild | 357 -
 1 file changed, 357 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.2-r3.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r3.ebuild
deleted file mode 100644
index 70fb0270fb5..000
--- a/media-gfx/freecad/freecad-0.19.2-r3.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
-
-MY_PN=FreeCAD
-
-if [[ ${PV} = * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
-   S="${WORKDIR}/freecad-${PV}"
-else
-   MY_PV=$(ver_cut 1-2)
-   MY_PV=$(ver_rs 1 '_' ${MY_PV})
-   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
-   
https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${P}-0005-Make-smesh-compile-with-vtk9.patch.xz;
-   KEYWORDS="~amd64"
-   S="${WORKDIR}/FreeCAD-${PV}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="debug headless pcl test"
-RESTRICT="!test? ( test )"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
-FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
-   openscad part-design path points raytracing robot show surface
-   techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
-   IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-   IUSE="${IUSE} ${module}"
-done
-unset module
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-cpp/eigen-3.3.1:3
-   dev-libs/OpenNI2[opengl(+)]
-   dev-libs/libspnav[X]
-   dev-libs/xerces-c[icu]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-   dev-qt/qtx11extras:5
-   dev-qt/qtxml:5
-   >=media-libs/coin-4.0.0
-   media-libs/freetype
-   media-libs/qhull:=
-   sci-libs/flann[openmp]
-   sci-libs/hdf5:=[fortran,zlib]
-   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-   sci-libs/opencascade:=[vtk(+)]
-   sci-libs/orocos_kdl:=
-   sys-libs/zlib
-   virtual/glu
-   virtual/libusb:1
-   virtual/opengl
-   cloud? (
-   dev-libs/openssl:=
-   net-misc/curl
-   )
-   fem? ( 
sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
-   openscad? ( media-gfx/openscad )
-   pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
-   $(python_gen_cond_dep '
-   dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-   dev-python/pybind11[${PYTHON_USEDEP}]
-   dev-python/pyside2[gui,svg,${PYTHON_USEDEP}]
-   dev-python/shiboken2[${PYTHON_USEDEP}]
-   addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
-   fem? ( dev-python/ply[${PYTHON_USEDEP}] )
-   ')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/swig"
-
-# To get required dependencies:
-# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-# We set the following requirements by default:
-# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, 
web.
-#
-# Additionally, we auto-enable mesh_part, flat_mesh and smesh
-# Fem actually needs smesh, but as long as we don't have a smesh package, we 
enable
-# smesh through the mesh USE flag. Note however, the fem<-smesh dependency 
isn't
-# reflected by the REQUIRES_MODS macro, but at
-# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
-#
-# The increase in auto-enabled workbenches is due to their need in parts of the
-# test suite when compiled with a minimal set of USE flags.
-REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
-   inspection? ( points )
-   path?

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2021-07-10 Thread Ionen Wolkens

commit: 44073440183298d04de422fe7978ff4ef9d199d5
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Jul  9 08:29:26 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jul 10 09:17:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44073440

media-gfx/freecad: drop 0.19.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Ionen Wolkens  gentoo.org>

 media-gfx/freecad/Manifest |   1 -
 ...ndCoin3DDoc.cmake-fix-patch-for-coin-docs.patch |  26 --
 media-gfx/freecad/freecad-0.19.1-r1.ebuild | 286 -
 media-gfx/freecad/metadata.xml |  16 --
 4 files changed, 329 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index e67bfab4a78..fe0489b287e 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,3 +1,2 @@
-DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B 
de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118
 SHA512 
5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b9d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 
3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf
 SHA512 
420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72

diff --git 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
deleted file mode 100644
index 9f4131f15a3..000
--- 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e08aec1344e753cd338a61c3584230741e00b23f Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Thu, 31 Dec 2020 13:26:44 +0100
-Subject: [PATCH 1/2] FindCoin3DDoc.cmake: fix patch for coin docs
-
-Signed-off-by: Bernd Waibel 

- cMake/FindCoin3DDoc.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cMake/FindCoin3DDoc.cmake b/cMake/FindCoin3DDoc.cmake
-index c6c92f2..1af53c2 100644
 a/cMake/FindCoin3DDoc.cmake
-+++ b/cMake/FindCoin3DDoc.cmake
-@@ -22,7 +22,7 @@ IF (COIN3D_FOUND)
-   # Unix systems
-   find_path(COIN3D_DOC_PATH index.html 
- /usr/share/doc/libcoin80-doc/html
--/usr/share/doc/coin/html
-+/usr/share/doc/coin-4.0.0/html
- /usr/share/doc/Coin/html
-   )
-   IF( EXISTS ${COIN3D_DOC_PATH})
--- 
-2.30.0
-

diff --git a/media-gfx/freecad/freecad-0.19.1-r1.ebuild 
b/media-gfx/freecad/freecad-0.19.1-r1.ebuild
deleted file mode 100644
index 95e44586e4c..000
--- a/media-gfx/freecad/freecad-0.19.1-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# vtk needs updating to use 3.9
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
-
-if [[ ${PV} = * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
-   S="${WORKDIR}/freecad-${PV}"
-else
-   MY_PV=$(ver_cut 1-2)
-   MY_PV=$(ver_rs 1 '_' ${MY_PV})
-   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
-   S="${WORKDIR}/FreeCAD-${PV}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="debug headless pcl test"
-RESTRICT="!test? ( test )"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
-FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
-   inspection material mesh openscad part-design path points
-   raytracing robot show spreadsheet surface techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
-   IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-   IUSE="${IUSE} ${module}"
-done
-unset module
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-cpp/eigen-3.3.1:3
-   dev-libs/OpenNI2[opengl(+)]
-   dev-libs/libspnav[X]
-   dev-libs/xerces-c

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-07-10 Thread Ionen Wolkens

commit: db575ff7122ddf31de0092d9a3fdc59dcdda9d63
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Jul  9 08:33:38 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jul 10 09:17:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db575ff7

media-gfx/freecad: add slot operator for sci-libs/vtk

Following PR #21149, I added subslots for the sci-libs/vtk package.
This patch adds the subslot operator for 0.19.2 and  ebuilds.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21573
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../freecad/{freecad-0.19.2-r2.ebuild => freecad-0.19.2-r3.ebuild}  | 2 +-
 media-gfx/freecad/freecad-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.2-r2.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r3.ebuild
similarity index 99%
rename from media-gfx/freecad/freecad-0.19.2-r2.ebuild
rename to media-gfx/freecad/freecad-0.19.2-r3.ebuild
index fc330f2ea53..954e1f8b1fe 100644
--- a/media-gfx/freecad/freecad-0.19.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r3.ebuild
@@ -79,7 +79,7 @@ RDEPEND="
dev-libs/openssl:=
net-misc/curl
)
-   fem? ( sci-libs/vtk[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] 
)
+   fem? ( 
sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
openscad? ( media-gfx/openscad )
pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
$(python_gen_cond_dep '

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 3d41d5d0ca1..cb6c6efe011 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -79,7 +79,7 @@ RDEPEND="
dev-libs/openssl:=
net-misc/curl
)
-   fem? ( sci-libs/vtk[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] 
)
+   fem? ( 
sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
openscad? ( media-gfx/openscad )
pcl? ( ~sci-libs/pcl-${PV}:=[opengl,openni2(+),qt5(+),vtk(+)] )
$(python_gen_cond_dep '

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-06-21 Thread Sam James

commit: 2c8e8d8d7adc1e9f230c73b4c9b02e8161cef3f1
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Jun 21 02:49:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 21 22:25:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8e8d8d

media-gfx/freecad: drop 0.19.2-r1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-0.19.2-r1.ebuild | 335 -
 1 file changed, 335 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.2-r1.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r1.ebuild
deleted file mode 100644
index d15c588e8c3..000
--- a/media-gfx/freecad/freecad-0.19.2-r1.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
-
-MY_PN=FreeCAD
-
-if [[ ${PV} = * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
-   S="${WORKDIR}/freecad-${PV}"
-else
-   MY_PV=$(ver_cut 1-2)
-   MY_PV=$(ver_rs 1 '_' ${MY_PV})
-   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
-   S="${WORKDIR}/FreeCAD-${PV}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="debug headless pcl test"
-RESTRICT="!test? ( test )"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
-FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
-   openscad part-design path points raytracing robot show surface
-   techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
-   IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-   IUSE="${IUSE} ${module}"
-done
-unset module
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-cpp/eigen-3.3.1:3
-   dev-libs/OpenNI2[opengl(+)]
-   dev-libs/libspnav[X]
-   dev-libs/xerces-c[icu]
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-   dev-qt/qtx11extras:5
-   dev-qt/qtxml:5
-   >=media-libs/coin-4.0.0
-   media-libs/freetype
-   media-libs/qhull:=
-   sci-libs/flann[openmp]
-   sci-libs/hdf5:=[fortran,zlib]
-   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-   =sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
-   $(python_gen_cond_dep '
-   dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}]
-   dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-   >=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
-   dev-python/pybind11[${PYTHON_MULTI_USEDEP}]
-   dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
-   dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
-   addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
-   fem? ( dev-python/ply[${PYTHON_MULTI_USEDEP}] )
-   ')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/swig"
-
-# To get required dependencies:
-# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-# We set the following requirements by default:
-# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, 
web.
-#
-# Additionally, we auto-enable mesh_part, flat_mesh and smesh
-# Fem actually needs smesh, but as long as we don't have a smesh package, we 
enable
-# smesh through the mesh USE flag. Note however, the fem<-smesh dependency 
isn't
-# reflected by the REQUIRES_MODS macro, but at
-# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
-#
-# The increase in auto-enabled workbenches is due to their need in parts of the
-# test suite when compiled with a minimal set of USE flags.
-REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
-   inspection? ( points )
-   path? ( robot )
-   ship? ( image plot )
-"
-
-PATCHES=(
-   
"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
-   
"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
-   "${FILESDIR}"/${P}-0001-fix-failing-test-workbench-testcase.patch
-   "${FILESDIR}"/${P}-0002-fix-femtest-failure-with-yaml-load.patch
-   "${FILESDIR}"/${P}-0003-fix-test-when-built-without-GUI.patch
-)
-
-DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

2021-06-21 Thread Sam James

commit: 7b5a3b73f36cafd3274ad495028bfae3c573d049
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Jun 20 12:09:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 21 22:25:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b5a3b73

media-gfx/freecad: update dependencies

support >=sci-libs/opencascade-7.5.2
support >=sci-libs/vtk-9

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/Manifest |   1 +
 ...6-add-boost-serialization-to-find_package.patch |  53 
 ...-fix-build-failure-with-opencascade-7.5.2.patch |  30 ++
 media-gfx/freecad/freecad-0.19.2-r2.ebuild | 339 +
 4 files changed, 423 insertions(+)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 486f8202d98..e67bfab4a78 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1,3 @@
 DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B 
de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118
 SHA512 
5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b9d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
+DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 
3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf
 SHA512 
420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72

diff --git 
a/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch
 
b/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch
new file mode 100644
index 000..f9120e05191
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch
@@ -0,0 +1,53 @@
+From fc4ae2ff217c67eae39947ed6b655b8afaa83859 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 20 Jun 2021 15:38:45 +0200
+Subject: [PATCH] add boost::serialization to find_package
+
+Swaps SetupBoost() after SetupSalomeSMESH() has been called.
+SetupSalomeSMESH() looks for vtk, which searches for boost::serialization
+overriding the default libraries detected by SetupBoost().
+
+Signed-off-by: Bernd Waibel 
+---
+ CMakeLists.txt | 4 +++-
+ cMake/FreeCAD_Helpers/SetupBoost.cmake | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b17736..c241ebe 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -45,7 +45,6 @@ if(NOT FREECAD_LIBPACK_USE OR 
FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
+ SetupPython()
+ SetupPCL()
+ SetupPybind11()
+-SetupBoost()
+ SetupXercesC()
+ find_package(ZLIB REQUIRED)
+ find_package(PyCXX REQUIRED)
+@@ -57,6 +56,9 @@ if(NOT FREECAD_LIBPACK_USE OR 
FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
+ SetupOpenGL()
+ endif(BUILD_GUI)
+ SetupSalomeSMESH()
++# needs to be called after SMESH which pulls in VTK, which only add 
boost::serialization
++# overriding the values of SetupBoost()
++SetupBoost()
+ if (BUILD_FEM_NETGEN)
+ find_package(NETGEN)
+ endif(BUILD_FEM_NETGEN)
+diff --git a/cMake/FreeCAD_Helpers/SetupBoost.cmake 
b/cMake/FreeCAD_Helpers/SetupBoost.cmake
+index 76c6d64..77c415b 100644
+--- a/cMake/FreeCAD_Helpers/SetupBoost.cmake
 b/cMake/FreeCAD_Helpers/SetupBoost.cmake
+@@ -3,7 +3,7 @@ macro(SetupBoost)
+ 
+ set(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS})
+ 
+-set (BOOST_COMPONENTS filesystem program_options regex system thread)
++set (BOOST_COMPONENTS filesystem program_options regex serialization 
system thread)
+ find_package(Boost ${BOOST_MIN_VERSION}
+ COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
+ 
+-- 
+2.32.0
+

diff --git 
a/media-gfx/freecad/files/freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch
 
b/media-gfx/freecad/files/freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch
new file mode 100644
index 000..46c69326129
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch
@@ -0,0 +1,30 @@
+From bbbaf3e27d39767ba0b3de998b9d8d5fd42a681f Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 20 Jun 2021 16:24:04 +0200
+Subject: [PATCH] fix build failure with opencascade-7.5.2
+
+For patch, see

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-06-21 Thread Sam James

commit: 6f292cab1e5b58e3c87e1914fe93e48772f150c3
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Jun 20 17:08:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 21 22:25:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f292cab

media-gfx/freecad: improve display of optional packages

See https://forum.freecadweb.org/viewtopic.php?f=42=37806 for a list of
supported optional packages.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-0.19.2-r2.ebuild | 26 ++
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.2-r2.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r2.ebuild
index 8dd3ab78ae3..fc330f2ea53 100644
--- a/media-gfx/freecad/freecad-0.19.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r2.ebuild
@@ -323,15 +323,33 @@ pkg_postinst() {
einfo "You can load a lot of additional workbenches using the 
integrated"
einfo "AddonManager."
 
+   # ToDo: check opencv, pysolar (::science), elmerfem (::science)
+   #   ifc++, ifcopenshell, netgen, z88 (no pkgs), 
calculix-ccx (::waebbl)
einfo "There are a lot of additional tools, for which FreeCAD has 
builtin"
einfo "support. Some of them are available in Gentoo. Take a look at"
einfo 
"https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD;
-   optfeature "interact with git repositories" dev-python/GitPython
-   optfeature "work with COLLADA documents" dev-python/pycollada
-   optfeature "dependency graphs" media-gfx/graphviz
+   optfeature_header "Computational utilities"
+   optfeature "Numerical computations with Python" dev-python/numpy
+   optfeature "BLAS library" sci-libs/openblas
+   optfeature "Statistical computation with Python" dev-python/pandas
+   optfeature "Use Point Clouds" sci-libs/pcl
+   optfeature "Use scientific computation with Python" dev-python/scipy
+   optfeature "Use symbolic math with Python" dev-python/sympy
+   optfeature_header "Imaging, Plotting and Rendering utilities"
+   optfeature "Function plotting with Python" dev-python/matplotlib
+   optfeature "Dependency graphs" media-gfx/graphviz
optfeature "PBR Rendering" media-gfx/povray
+   optfeature_header "Import / Export"
+   optfeature "Interact with git repositories" dev-python/GitPython
+   optfeature "Work with COLLADA documents" dev-python/pycollada
+   optfeature "YAML importer and emitter" dev-python/pyyaml
+   optfeature "Importing and exporting 2D AutoCAD DWG files" 
media-gfx/libredwg
+   optfeature "Importing and exporting geospatial data formats" 
sci-libs/gdal
+   optfeature "Working with projection data" sci-libs/proj
+   optfeature_header "Meshing and FEM"
optfeature "FEM mesh generator" sci-libs/gmsh
-   optfeature "importing and exporting 2D AutoCAD DWG files" 
media-gfx/libredwg
+   optfeature "Triangulating meshes" sci-libs/gts
+   optfeature "Visualization" sci-visualization/paraview
 }
 
 pkg_postrm() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-06-21 Thread Sam James

commit: 6628a9ab320db0de0a112215db0d3d586f282838
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Jun 21 00:39:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 21 22:25:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6628a9ab

media-gfx/freecad: sync changes from 0.19.2

- support sci-libs/opencascade-7.5.2
- support sci-libs/vtk-9
- add more optfeature's

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21350
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-.ebuild | 33 ++---
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index b96f2771615..3d41d5d0ca1 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -19,7 +19,8 @@ if [[ ${PV} = * ]]; then
 else
MY_PV=$(ver_cut 1-2)
MY_PV=$(ver_rs 1 '_' ${MY_PV})
-   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
+   
https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${P}-0005-Make-smesh-compile-with-vtk9.patch.xz;
KEYWORDS="~amd64"
S="${WORKDIR}/FreeCAD-${PV}"
 fi
@@ -68,7 +69,7 @@ RDEPEND="
sci-libs/flann[openmp]
sci-libs/hdf5:=[fortran,zlib]
>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-   https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD;
-   optfeature "interact with git repositories" dev-python/GitPython
-   optfeature "work with COLLADA documents" dev-python/pycollada
+   optfeature_header "Computational utilities"
+   optfeature "numerical computations with Python" dev-python/numpy
+   optfeature "BLAS library" sci-libs/openblas
+   optfeature "statistical computation with Python" dev-python/pandas
+   optfeature "usage of Point Clouds" sci-libs/pcl
+   optfeature "scientific computation with Python" dev-python/scipy
+   optfeature "symbolic math with Python" dev-python/sympy
+   optfeature_header "Imaging, Plotting and Rendering utilities"
+   optfeature "function plotting with Python" dev-python/matplotlib
optfeature "dependency graphs" media-gfx/graphviz
optfeature "PBR Rendering" media-gfx/povray
-   optfeature "FEM mesh generator" sci-libs/gmsh
+   optfeature_header "Import / Export"
+   optfeature "interacting with git repositories" dev-python/GitPython
+   optfeature "working with COLLADA documents" dev-python/pycollada
+   optfeature "YAML importer and emitter" dev-python/pyyaml
optfeature "importing and exporting 2D AutoCAD DWG files" 
media-gfx/libredwg
+   optfeature "importing and exporting geospatial data formats" 
sci-libs/gdal
+   optfeature "working with projection data" sci-libs/proj
+   optfeature_header "Meshing and FEM"
+   optfeature "FEM mesh generator" sci-libs/gmsh
+   optfeature "triangulating meshes" sci-libs/gts
+   optfeature "visualization" sci-visualization/paraview
 }
 
 pkg_postrm() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-06-18 Thread David Seifert

commit: d488ade34ffa25268cfe0d1eb0446c88d589b61b
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jun 18 19:16:50 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jun 18 19:16:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d488ade3

media-gfx/freecad: Depend on dev-libs/boost:=[threads(+)]

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 media-gfx/freecad/{freecad-0.19.1.ebuild => freecad-0.19.1-r1.ebuild} | 4 ++--
 media-gfx/freecad/{freecad-0.19.2.ebuild => freecad-0.19.2-r1.ebuild} | 4 ++--
 media-gfx/freecad/freecad-.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild 
b/media-gfx/freecad/freecad-0.19.1-r1.ebuild
similarity index 99%
rename from media-gfx/freecad/freecad-0.19.1.ebuild
rename to media-gfx/freecad/freecad-0.19.1-r1.ebuild
index 0589fef979f..95e44586e4c 100644
--- a/media-gfx/freecad/freecad-0.19.1.ebuild
+++ b/media-gfx/freecad/freecad-0.19.1-r1.ebuild
@@ -63,7 +63,7 @@ RDEPEND="
dev-qt/qtxml:5
>=media-libs/coin-4.0.0
media-libs/freetype
-   media-libs/qhull
+   media-libs/qhull:=
sci-libs/flann[openmp]
>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
sci-libs/opencascade:=[vtk(+)]
@@ -81,7 +81,7 @@ RDEPEND="
openscad? ( media-gfx/openscad )
pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
$(python_gen_cond_dep '
-   dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}]
+   dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}]
dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
dev-python/numpy[${PYTHON_MULTI_USEDEP}]
>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]

diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r1.ebuild
similarity index 99%
rename from media-gfx/freecad/freecad-0.19.2.ebuild
rename to media-gfx/freecad/freecad-0.19.2-r1.ebuild
index a2a32823f67..d15c588e8c3 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r1.ebuild
@@ -64,7 +64,7 @@ RDEPEND="
dev-qt/qtxml:5
>=media-libs/coin-4.0.0
media-libs/freetype
-   media-libs/qhull
+   media-libs/qhull:=
sci-libs/flann[openmp]
sci-libs/hdf5:=[fortran,zlib]
>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
@@ -82,7 +82,7 @@ RDEPEND="
openscad? ( media-gfx/openscad )
pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
$(python_gen_cond_dep '
-   dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}]
+   dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}]
dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
dev-python/numpy[${PYTHON_MULTI_USEDEP}]
>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 3f5de2fa3a1..b96f2771615 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -64,7 +64,7 @@ RDEPEND="
dev-qt/qtxml:5
>=media-libs/coin-4.0.0
media-libs/freetype
-   media-libs/qhull
+   media-libs/qhull:=
sci-libs/flann[openmp]
sci-libs/hdf5:=[fortran,zlib]
>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
@@ -82,7 +82,7 @@ RDEPEND="
openscad? ( media-gfx/openscad )
pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
$(python_gen_cond_dep '
-   dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}]
+   dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}]
dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
dev-python/numpy[${PYTHON_MULTI_USEDEP}]
>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-06-16 Thread Sam James

commit: a1276d40cc56884b813e34ae2a4b3d8c74005c8d
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Jun 16 13:28:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 16 13:58:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1276d40

media-gfx/freecad: add py39 support to live ebuild

Also restrict dependency on sci-libs/opencascade.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21266
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 490b29d0793..3f5de2fa3a1 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-# vtk needs updating to use 3.9
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
 
@@ -69,7 +68,7 @@ RDEPEND="
sci-libs/flann[openmp]
sci-libs/hdf5:=[fortran,zlib]
>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-   sci-libs/opencascade:=[vtk(+)]
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-06-15 Thread Sam James

commit: 0ed3c2582763576100bd183a69f83beb00b2dfd4
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Jun 11 07:42:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 15 14:39:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ed3c258

media-gfx/freecad: add python-3.9 support

Also restrict dependency for opencascade

Closes: https://bugs.gentoo.org/789780
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21242
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-0.19.2.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild 
b/media-gfx/freecad/freecad-0.19.2.ebuild
index dcceebb859a..a2a32823f67 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-# vtk needs updating to use 3.9
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
 
@@ -69,7 +68,7 @@ RDEPEND="
sci-libs/flann[openmp]
sci-libs/hdf5:=[fortran,zlib]
>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-   sci-libs/opencascade:=[vtk(+)]
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-06-05 Thread Andrew Ammerlaan

commit: 04dd713b4dbf8c7eb62a6598b1c826ed5e8e34f8
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Jun  5 14:13:57 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jun  5 14:13:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04dd713b

media-gfx/freecad: strip revision number from OCC version string

Otherwise it doesn't compile because it fails to find the dir

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/freecad-0.19.2.ebuild | 1 +
 media-gfx/freecad/freecad-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild 
b/media-gfx/freecad/freecad-0.19.2.ebuild
index 99e81bfeeed..dcceebb859a 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -241,6 +241,7 @@ src_configure() {
# bug https://bugs.gentoo.org/788274
local OCC_P=$(best_version sci-libs/opencascade[vtk])
OCC_P=${OCC_P#sci-libs/}
+   OCC_P=${OCC_P%-r*}
mycmakeargs+=(
-DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 26f5cab4f42..490b29d0793 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -239,6 +239,7 @@ src_configure() {
# bug https://bugs.gentoo.org/788274
local OCC_P=$(best_version sci-libs/opencascade[vtk])
OCC_P=${OCC_P#sci-libs/}
+   OCC_P=${OCC_P%-r*}
mycmakeargs+=(
-DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-06-05 Thread Andrew Ammerlaan

commit: 12f82ac6b59dcbb679a0a5a4b819ac0ba2f6193a
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Jun  5 11:42:21 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jun  5 11:56:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12f82ac6

media-gfx/freecad: use the shiboken2 that matches python version

Closes: https://bugs.gentoo.org/793962
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/freecad-0.19.1.ebuild | 3 +++
 media-gfx/freecad/freecad-0.19.2.ebuild | 3 +++
 media-gfx/freecad/freecad-.ebuild   | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild 
b/media-gfx/freecad/freecad-0.19.1.ebuild
index 1d7e6144599..0589fef979f 100644
--- a/media-gfx/freecad/freecad-0.19.1.ebuild
+++ b/media-gfx/freecad/freecad-0.19.1.ebuild
@@ -214,6 +214,9 @@ src_configure() {
-DFREECAD_USE_QT_FILEDIALOG=ON
-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
+   # Use the version of shiboken2 that matches the selected python 
version
+   -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+
-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-DOCCT_CMAKE_FALLBACK=ON# don't 
use occt-config which isn't included in opencascade for Gentoo

diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild 
b/media-gfx/freecad/freecad-0.19.2.ebuild
index 393c42ede03..99e81bfeeed 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -227,6 +227,9 @@ src_configure() {
-DFREECAD_USE_QT_FILEDIALOG=ON
-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
+   # Use the version of shiboken2 that matches the selected python 
version
+   -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+
# install python modules to site-packages' dir. True only for 
the main package,
# sub-packages will still be installed inside /usr/lib64/freecad
-DINSTALL_TO_SITEPACKAGES=ON

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 765ee01a7a0..26f5cab4f42 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -224,6 +224,9 @@ src_configure() {
-DFREECAD_USE_QT_FILEDIALOG=ON
-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
+   # Use the version of shiboken2 that matches the selected python 
version
+   -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+
# install python modules to site-packages' dir. True only for 
the main package,
# sub-packages will still be installed inside /usr/lib64/freecad
-DINSTALL_TO_SITEPACKAGES=ON

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-06-03 Thread Sam James

commit: c54eb2086d44649278ca216a9e165a92b6f5ce12
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  2 23:55:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  3 19:14:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c54eb208

media-gfx/freecad: fix BadDefaultUseFlags

-foo in IUSE is discouraged. It is equivalent (in every meaningful case) to 
'foo' but confuses parsing
tools like e.g. packages.gentoo.org.

Dropping '-' from these flags has no impact on the actual default behaviour.

See: 
https://devmanual.gentoo.org/general-concepts/use-flags/index.html#iuse-defaults
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-0.19.1.ebuild | 2 +-
 media-gfx/freecad/freecad-0.19.2.ebuild | 2 +-
 media-gfx/freecad/freecad-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild 
b/media-gfx/freecad/freecad-0.19.1.ebuild
index 5ffecf7de50..1d7e6144599 100644
--- a/media-gfx/freecad/freecad-0.19.1.ebuild
+++ b/media-gfx/freecad/freecad-0.19.1.ebuild
@@ -39,7 +39,7 @@ for module in ${FREECAD_STABLE_MODULES}; do
IUSE="${IUSE} +${module}"
 done
 for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-   IUSE="${IUSE} -${module}"
+   IUSE="${IUSE} ${module}"
 done
 unset module
 

diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild 
b/media-gfx/freecad/freecad-0.19.2.ebuild
index 4719298feb3..393c42ede03 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -41,7 +41,7 @@ for module in ${FREECAD_STABLE_MODULES}; do
IUSE="${IUSE} +${module}"
 done
 for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-   IUSE="${IUSE} -${module}"
+   IUSE="${IUSE} ${module}"
 done
 unset module
 

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 8b29013224e..765ee01a7a0 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -41,7 +41,7 @@ for module in ${FREECAD_STABLE_MODULES}; do
IUSE="${IUSE} +${module}"
 done
 for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-   IUSE="${IUSE} -${module}"
+   IUSE="${IUSE} ${module}"
 done
 unset module

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-05-31 Thread Alexey Shvetsov

commit: 04ff08820f7e8734963d046b496fbb03190b64c0
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue May 18 22:16:39 2021 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Mon May 31 19:26:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ff0882

media-gfx/freecad: port changes from 0.19.2

Incorporate the changes from 0.19.2 ebuild.
Disable BUILD_SANDBOX if USE=debug, due to
https://forum.freecadweb.org/viewtopic.php?f=4=36071=30#p504595

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20879
Signed-off-by: Alexey Shvetsov  gentoo.org>

 media-gfx/freecad/freecad-.ebuild | 133 +++---
 1 file changed, 90 insertions(+), 43 deletions(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 90acff50625..8b29013224e 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -11,14 +11,16 @@ inherit check-reqs cmake desktop eapi8-dosym optfeature 
python-single-r1 xdg
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
 
+MY_PN=FreeCAD
+
 if [[ ${PV} = * ]]; then
inherit git-r3
-   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
+   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
S="${WORKDIR}/freecad-${PV}"
 else
MY_PV=$(ver_cut 1-2)
MY_PV=$(ver_rs 1 '_' ${MY_PV})
-   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64"
S="${WORKDIR}/FreeCAD-${PV}"
 fi
@@ -31,9 +33,9 @@ IUSE="debug headless pcl test"
 RESTRICT="!test? ( test )"
 
 FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
-FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
-   inspection material mesh openscad part-design path points
-   raytracing robot show spreadsheet surface techdraw tux"
+FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
+   openscad part-design path points raytracing robot show surface
+   techdraw tux"
 
 for module in ${FREECAD_STABLE_MODULES}; do
IUSE="${IUSE} +${module}"
@@ -48,7 +50,7 @@ RDEPEND="
>=dev-cpp/eigen-3.3.1:3
dev-libs/OpenNI2[opengl(+)]
dev-libs/libspnav[X]
-   dev-libs/xerces-c
+   dev-libs/xerces-c[icu]
dev-qt/designer:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -65,6 +67,7 @@ RDEPEND="
media-libs/freetype
media-libs/qhull
sci-libs/flann[openmp]
+   sci-libs/hdf5:=[fortran,zlib]
>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
sci-libs/opencascade:=[vtk(+)]
sci-libs/orocos_kdl:=
@@ -77,7 +80,6 @@ RDEPEND="
net-misc/curl
)
fem? ( 
=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
$(python_gen_cond_dep '
@@ -85,10 +87,11 @@ RDEPEND="
dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
dev-python/numpy[${PYTHON_MULTI_USEDEP}]
>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
+   dev-python/pybind11[${PYTHON_MULTI_USEDEP}]
dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
-   mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
+   fem? ( dev-python/ply[${PYTHON_MULTI_USEDEP}] )
')
 "
 DEPEND="${RDEPEND}"
@@ -97,35 +100,31 @@ BDEPEND="dev-lang/swig"
 # To get required dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
 # We set the following requirements by default:
-# draft, import, part, qt5, sketcher, start, web.
+# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, 
web.
 #
-# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
+# Additionally, we auto-enable mesh_part, flat_mesh and smesh
 # Fem actually needs smesh, but as long as we don't have a smesh package, we 
enable
 # smesh through the mesh USE flag. Note however, the fem<-smesh dependency 
isn't
 # reflected by the REQUIRES_MODS macro, but at
 # cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+#
+# The increase in auto-enabled workbenches is due to their need in parts of the
+# test suite when compiled with a minimal set of USE flags.
 REQUIRED_USE="
${PYTHON_REQUIRED_USE}
-   arch? ( mesh )
-   debug? ( mesh )
-   drawing? ( spreadsheet )
-   fem? ( mesh )
-   inspection? ( mesh points )
-   openscad? ( mesh )
-   path? ( mesh robot )
+   inspection? ( points )
+   path? ( robot )
ship? ( image plot )
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-05-31 Thread Alexey Shvetsov

commit: b83b3eaf0c8423672624c1cb06cc0ff5bc4aa360
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue May 18 18:40:01 2021 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Mon May 31 19:26:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b83b3eaf

media-gfx/freecad: fix opencascade issue

Fix an issue with sci-libs/opencascade:7.4.0, where a wrong options
has been passed to cmake.
Additionally improves testing which version of opencascade has been
installed and adds some guards to select correct options.

Closes: https://bugs.gentoo.org/789705
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Alexey Shvetsov  gentoo.org>

 media-gfx/freecad/freecad-0.19.2.ebuild | 27 +++
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild 
b/media-gfx/freecad/freecad-0.19.2.ebuild
index 7e191a22a02..4719298feb3 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -141,11 +141,20 @@ src_prepare() {
rm "${S}/cMake/FindCoin3D.cmake" || die
 
# Fix OpenCASCADE lookup
-   # TODO: check this for opencascade-7.5.1 locations, which have
-   # changed since 7.4.0 after that package has merged
-   sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
-   -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
-   -i cMake/FindOpenCasCade.cmake || die
+   local OCC_P=$(best_version sci-libs/opencascade[vtk])
+   OCC_P=${OCC_P#sci-libs/}
+   local OCC_PV=${OCC_P#opencascade-}
+   OCC_PV=$(ver_cut 1-2 ${OCC_PV})
+   # check for CASROOT needed to ensure occ-7.5 is eselected and profile 
resourced
+   if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then
+   sed -e 
's|/usr/include/opencascade|'${CASROOT}'/include/'${OCC_P}'|' \
+   -e 's|/usr/lib|'${CASROOT}'/'$(get_libdir)'/'${OCC_P}' 
NO_DEFAULT_PATH|' \
+   -i cMake/FindOpenCasCade.cmake || die
+   else
+   sed -e 
's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+   -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' 
NO_DEFAULT_PATH|' \
+   -i cMake/FindOpenCasCade.cmake || die
+   fi
 
# Fix desktop file
sed -e 's/Exec=FreeCAD/Exec=freecad/' -i 
src/XDGData/org.freecadweb.FreeCAD.desktop || die
@@ -227,14 +236,16 @@ src_configure() {
 
if has_version ">=sci-libs/opencascade-7.5"; then
# bug https://bugs.gentoo.org/788274
+   local OCC_P=$(best_version sci-libs/opencascade[vtk])
+   OCC_P=${OCC_P#sci-libs/}
mycmakeargs+=(
-   -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1
-   
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1
+   -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
+   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
)
else
#

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-05-24 Thread Andrew Ammerlaan

commit: fcd3ebfb7145a2ba44d65702a99d3145004bda10
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon May 24 12:29:19 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon May 24 12:30:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcd3ebfb

media-gfx/freecad: add media-gfx/libredwg as optfeature

As discussed with @waebbl via email

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/freecad/freecad-0.19.1.ebuild | 1 +
 media-gfx/freecad/freecad-0.19.2.ebuild | 1 +
 media-gfx/freecad/freecad-.ebuild   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild 
b/media-gfx/freecad/freecad-0.19.1.ebuild
index 4a113baa229..5ffecf7de50 100644
--- a/media-gfx/freecad/freecad-0.19.1.ebuild
+++ b/media-gfx/freecad/freecad-0.19.1.ebuild
@@ -275,6 +275,7 @@ pkg_postinst() {
optfeature "dependency graphs" media-gfx/graphviz
optfeature "PBR Rendering" media-gfx/povray
optfeature "FEM mesh generator" sci-libs/gmsh
+   optfeature "importing and exporting 2D AutoCAD DWG files" 
media-gfx/libredwg
 }
 
 pkg_postrm() {

diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild 
b/media-gfx/freecad/freecad-0.19.2.ebuild
index 4238e819f09..7e191a22a02 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -313,6 +313,7 @@ pkg_postinst() {
optfeature "dependency graphs" media-gfx/graphviz
optfeature "PBR Rendering" media-gfx/povray
optfeature "FEM mesh generator" sci-libs/gmsh
+   optfeature "importing and exporting 2D AutoCAD DWG files" 
media-gfx/libredwg
 }
 
 pkg_postrm() {

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 47d3587ffec..90acff50625 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -277,6 +277,7 @@ pkg_postinst() {
optfeature "dependency graphs" media-gfx/graphviz
optfeature "PBR Rendering" media-gfx/povray
optfeature "FEM mesh generator" sci-libs/gmsh
+   optfeature "importing and exporting 2D AutoCAD DWG files" 
media-gfx/libredwg
 }
 
 pkg_postrm() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-05-06 Thread Sam James

commit: d8e72a84aebb1ac6094257935e5c5a589da1870c
Author: Bernd Waibel  posteo  net>
AuthorDate: Thu May  6 21:37:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  6 21:42:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e72a84

media-gfx/freecad: find opencascade-7.5

Correctly find sci-libs/opencascade-7.5.1 header and
library locations.

Closes: https://bugs.gentoo.org/788274
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20708
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-0.19.2.ebuild | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild 
b/media-gfx/freecad/freecad-0.19.2.ebuild
index f2d55fb7b13..f7125e38c85 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -222,11 +222,22 @@ src_configure() {
# sub-packages will still be installed inside /usr/lib64/freecad
-DINSTALL_TO_SITEPACKAGES=ON
 
-   -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-DOCCT_CMAKE_FALLBACK=ON# don't 
use occt-config which isn't included in opencascade for Gentoo
)
 
+   if has_version ">=sci-libs/opencascade-7.5"; then
+   mycmakeargs+=(
+   -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1
+   
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1
+   )
+   else
+   #

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-05-06 Thread Sam James

commit: ba902ec3a01181390af7c460b0f07fd9f80f616c
Author: Sam James  gentoo  org>
AuthorDate: Thu May  6 21:43:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  6 21:44:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba902ec3

media-gfx/freecad: add bug reference to opencascade tweak

Bug: https://bugs.gentoo.org/788274
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/freecad-0.19.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild 
b/media-gfx/freecad/freecad-0.19.2.ebuild
index f7125e38c85..4238e819f09 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -226,6 +226,7 @@ src_configure() {
)
 
if has_version ">=sci-libs/opencascade-7.5"; then
+   # bug https://bugs.gentoo.org/788274
mycmakeargs+=(
-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1

-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

2021-05-04 Thread Sam James

commit: 1bd881d96b0ced37ff57668b1d02413a3548cca0
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Apr 28 17:24:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 22:01:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd881d9

media-gfx/freecad: bump to 0.19.2

Closes: https://bugs.gentoo.org/785256
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20580
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/Manifest |   1 +
 media-gfx/freecad/files/99freecad  |   1 +
 ...-0001-fix-failing-test-workbench-testcase.patch |  26 ++
 ...2-0002-fix-femtest-failure-with-yaml-load.patch |  26 ++
 ...19.2-0003-fix-test-when-built-without-GUI.patch |  33 +++
 media-gfx/freecad/freecad-0.19.2.ebuild| 308 +
 6 files changed, 395 insertions(+)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index c1b013c5901..486f8202d98 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1 +1,2 @@
 DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B 
de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118
 SHA512 
5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b9d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
+DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 
3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf
 SHA512 
420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72

diff --git a/media-gfx/freecad/files/99freecad 
b/media-gfx/freecad/files/99freecad
new file mode 100644
index 000..81104107c22
--- /dev/null
+++ b/media-gfx/freecad/files/99freecad
@@ -0,0 +1 @@
+PYTHONPATH=/usr/lib64/freecad/Ext:/usr/lib64/freecad/Mod:/usr/lib64/freecad/lib64

diff --git 
a/media-gfx/freecad/files/freecad-0.19.2-0001-fix-failing-test-workbench-testcase.patch
 
b/media-gfx/freecad/files/freecad-0.19.2-0001-fix-failing-test-workbench-testcase.patch
new file mode 100644
index 000..58107fb544d
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.2-0001-fix-failing-test-workbench-testcase.patch
@@ -0,0 +1,26 @@
+From dc04c745ea1e7dc277ab06fab69a2b91fbf543c5 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 25 Apr 2021 23:02:39 +0200
+Subject: [PATCH] fix failing test workbench testcase
+
+Signed-off-by: Bernd Waibel 
+---
+ src/Mod/Test/Document.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Mod/Test/Document.py b/src/Mod/Test/Document.py
+index e41375c..fd5eb15 100644
+--- a/src/Mod/Test/Document.py
 b/src/Mod/Test/Document.py
+@@ -1307,7 +1307,7 @@ class DocumentFileIncludeCases(unittest.TestCase):
+ # copy file from L5 which is in the same directory
+ L7 = doc2.addObject("App::DocumentObjectFileIncluded","FileObject3")
+ L7.File = (L5.File,"Copy.txt")
+-self.failUnless(os.path.exists(L5.File))
++self.failUnless(os.path.exists(L7.File))
+ FreeCAD.closeDocument("Doc2")
+ 
+ 
+-- 
+2.31.1
+

diff --git 
a/media-gfx/freecad/files/freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch
 
b/media-gfx/freecad/files/freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch
new file mode 100644
index 000..17da18c2b12
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch
@@ -0,0 +1,26 @@
+From a8314fdc56bb39f5af85e1678a03d613bfb9ee03 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Mon, 26 Apr 2021 19:32:54 +0200
+Subject: [PATCH] fix femtest failure with yaml load
+
+Signed-off-by: Bernd Waibel 
+---
+ src/Mod/Fem/feminout/importYamlJsonMesh.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Mod/Fem/feminout/importYamlJsonMesh.py 
b/src/Mod/Fem/feminout/importYamlJsonMesh.py
+index 9886248..aff83a5 100644
+--- a/src/Mod/Fem/feminout/importYamlJsonMesh.py
 b/src/Mod/Fem/feminout/importYamlJsonMesh.py
+@@ -162,7 +162,7 @@ def read(
+ or fileExtension.lower() == ".yml"
+ ) and has_yaml:
+ fp = pyopen(fileString, "rt")
+-raw_mesh_data = yaml.load(fp)
++raw_mesh_data = yaml.load(fp, Loader=yaml.SafeLoader)
+ fp.close()
+ else:
+ Console.PrintError(
+-- 
+2.31.1
+

diff --git 
a/media-gfx/freecad/files/freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch
 
b/media-gfx/freecad/files/freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch
new file mode 100644
index 000..33892ade6d5
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch
@@ -0,0 +1,33 @@
+From d7ea5a0f20888a2ddae3eb48e508e9067662cdc7 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date:

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-03-16 Thread Michał Górny

commit: 325332a72779baa8d0f2f3733675e8f0e218a655
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Mar 16 14:09:29 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Mar 16 16:42:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=325332a7

media-gfx/freecad: metadata.xml, description → name

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/freecad/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 6a1b326bbde..57211691f59 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -7,7 +7,7 @@


proxy-ma...@gentoo.org
-   Gentoo Proxy Maintainers
+   Gentoo Proxy Maintainers

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

2021-03-14 Thread Joonas Niilola

commit: b3215036bdfd41e827c58fbfa46688ba3ba0c36e
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Mar 13 12:39:03 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar 14 11:41:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3215036

media-gfx/freecad: drop 0.19_pre20201231

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/Manifest |   1 -
 ...0002-CMakeLists.txt-add-option-for-ccache.patch |  33 ---
 media-gfx/freecad/freecad-0.19_pre20201231.ebuild  | 284 -
 3 files changed, 318 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index c0966150ea1..c1b013c5901 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1 @@
 DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B 
de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118
 SHA512 
5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b9d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
-DIST freecad-0.19_pre20201231.tar.gz 236040771 BLAKE2B 
648d8c1d8ab03f56403544f8e6a20dc5edc35b2cfc353c875202ce3e85449e450cbda93f410fec15366ce3aab342a93e981fa11cd9f5443a2fc40ef38ac0a1d0
 SHA512 
457792b0a12196d9e2d8113d9721a3b3a6d4fbc93bae001787db3eac43503a74a89a69564903b4005f8648476a150b6d871b3d78adfbf41c7260a4265132da34

diff --git 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
deleted file mode 100644
index 26bb4421077..000
--- 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From bce02c4804d14ae2257ad5f5e7fae4e2baa74503 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Thu, 31 Dec 2020 13:31:47 +0100
-Subject: [PATCH 2/2] CMakeLists.txt: add option for ccache
-
-Signed-off-by: Bernd Waibel 

- CMakeLists.txt | 9 ++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f4dabf7..17b9fad 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,9 +8,12 @@ if (POLICY CMP0072)
- cmake_policy(SET CMP0072 OLD)
- endif(POLICY CMP0072)
- 
--find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
--if(CCACHE_PROGRAM)
--set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-+option(FREECAD_USE_CCACHE "Use ccache to build FreeCAD" OFF)
-+if(FREECAD_USE_CCACHE)
-+find_program(CCACHE_PROGRAM ccache)  #This check should occur before 
project()
-+if(CCACHE_PROGRAM)
-+set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-+endif()
- endif()
- 
- project(FreeCAD)
--- 
-2.30.0
-

diff --git a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild 
b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild
deleted file mode 100644
index 9d1447e685a..000
--- a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# vtk needs updating to use 3.9
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit check-reqs cmake desktop optfeature python-single-r1 xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
-
-if [[ ${PV} = * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
-   S="${WORKDIR}/freecad-${PV}"
-else
-   COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
-   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
-   S="${WORKDIR}/FreeCAD-${COMMIT}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="ccache debug headless pcl test"
-RESTRICT="!test? ( test )"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
-FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
-   inspection material mesh openscad part-design path points
-   raytracing robot show spreadsheet surface techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
-   IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-   IUSE="${IUSE} -${module}"
-done
-unset module
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-cpp/eigen-3.3.1:3
-   dev-libs/OpenNI2[opengl(+)]
-   dev-libs/libspnav[X]
-   dev-libs/xerces-c
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2021-03-14 Thread Joonas Niilola

commit: 54beaeb99324abac5420da68a4e89b2abed059f5
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Mar 13 12:36:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar 14 11:41:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54beaeb9

media-gfx/freecad: bump to 0.19.1

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/Manifest |   1 +
 ...-0001-Gentoo-specific-Remove-ccache-usage.patch |  29 +++
 media-gfx/freecad/freecad-0.19.1.ebuild| 282 +
 3 files changed, 312 insertions(+)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 99ac7bbf679..c0966150ea1 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1 +1,2 @@
+DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B 
de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118
 SHA512 
5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b9d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
 DIST freecad-0.19_pre20201231.tar.gz 236040771 BLAKE2B 
648d8c1d8ab03f56403544f8e6a20dc5edc35b2cfc353c875202ce3e85449e450cbda93f410fec15366ce3aab342a93e981fa11cd9f5443a2fc40ef38ac0a1d0
 SHA512 
457792b0a12196d9e2d8113d9721a3b3a6d4fbc93bae001787db3eac43503a74a89a69564903b4005f8648476a150b6d871b3d78adfbf41c7260a4265132da34

diff --git 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
new file mode 100644
index 000..c8772febdee
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
@@ -0,0 +1,29 @@
+From 74664bf8c9142320be335ab91dca53cb1a1187a2 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Fri, 12 Mar 2021 23:55:09 +0100
+Subject: [PATCH] [Gentoo specific] Remove ccache usage
+
+Signed-off-by: Bernd Waibel 
+---
+ CMakeLists.txt | 5 -
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b17736..38e482a 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -8,11 +8,6 @@ if (POLICY CMP0072)
+ cmake_policy(SET CMP0072 OLD)
+ endif(POLICY CMP0072)
+ 
+-find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
+-if(CCACHE_PROGRAM)
+-set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+-endif()
+-
+ project(FreeCAD)
+ 
+ set(PACKAGE_VERSION_NAME "Vulcan")
+-- 
+2.30.1
+

diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild 
b/media-gfx/freecad/freecad-0.19.1.ebuild
new file mode 100644
index 000..4a113baa229
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.19.1.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# vtk needs updating to use 3.9
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
+   S="${WORKDIR}/freecad-${PV}"
+else
+   MY_PV=$(ver_cut 1-2)
+   MY_PV=$(ver_rs 1 '_' ${MY_PV})
+   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/FreeCAD-${PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
+   inspection material mesh openscad part-design path points
+   raytracing robot show spreadsheet surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+   IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+   IUSE="${IUSE} -${module}"
+done
+unset module
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-cpp/eigen-3.3.1:3
+   dev-libs/OpenNI2[opengl(+)]
+   dev-libs/libspnav[X]
+   dev-libs/xerces-c
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   dev-qt/qtxml:5
+   >=media-libs/coin-4.0.0
+   media-libs/freetype
+   media-libs/qhull
+   sci-libs/flann[openmp]
+   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-03-14 Thread Joonas Niilola

commit: bbdef3fd3ee7165b750f41175238a415e5f81cc5
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Mar 13 14:33:51 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar 14 11:41:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdef3fd

media-gfx/freecad: several updates with 

Fix an issue with selecting correct python, introduced by
https://github.com/FreeCAD/FreeCAD/commit/e2782d0c20111b0563f6e66eb3a7dff1208fe1c5
Remove ccache USE flag, as well as code from CMakeLists.txt

Bug: https://github.com/waebbl/waebbl-gentoo/issues/309
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19914
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-.ebuild | 33 +
 media-gfx/freecad/metadata.xml|  3 ---
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index e2cb13d51fc..47d3587ffec 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # vtk needs updating to use 3.9
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
@@ -16,17 +16,18 @@ if [[ ${PV} = * ]]; then
EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
S="${WORKDIR}/freecad-${PV}"
 else
-   COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
-   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+   MY_PV=$(ver_cut 1-2)
+   MY_PV=$(ver_rs 1 '_' ${MY_PV})
+   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64"
-   S="${WORKDIR}/FreeCAD-${COMMIT}"
+   S="${WORKDIR}/FreeCAD-${PV}"
 fi
 
 # code is licensed LGPL-2
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="ccache debug headless pcl test"
+IUSE="debug headless pcl test"
 RESTRICT="!test? ( test )"
 
 FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
@@ -91,10 +92,7 @@ RDEPEND="
')
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-   dev-lang/swig
-   ccache? ( dev-util/ccache )
-"
+BDEPEND="dev-lang/swig"
 
 # To get required dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
@@ -121,12 +119,13 @@ REQUIRED_USE="
 
 PATCHES=(

"${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
-   
"${FILESDIR}"/${PN}-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
+   
"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+   
"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 )
 
-DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
 
-CHECKREQS_DISK_BUILD="7G"
+CHECKREQS_DISK_BUILD="3G"
 
 pkg_setup() {
check-reqs_pkg_setup
@@ -204,7 +203,7 @@ src_configure() {
 
-DFREECAD_BUILD_DEBIAN=OFF
 
-   -DFREECAD_USE_CCACHE=$(usex ccache)
+   -DFREECAD_USE_CCACHE=OFF
-DFREECAD_USE_EXTERNAL_KDL=ON
-DFREECAD_USE_EXTERNAL_SMESH=OFF# no package in 
Gentoo
-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF   # doesn't work 
yet, also no package in Gentoo tree
@@ -215,6 +214,8 @@ src_configure() {
-DFREECAD_USE_QT_FILEDIALOG=ON
-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
+   -DPython3_EXECUTABLE=${PYTHON}
+
-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-DOCCT_CMAKE_FALLBACK=ON# don't 
use occt-config which isn't included in opencascade for Gentoo
@@ -242,12 +243,12 @@ src_install() {
cmake_src_install
 
if ! use headless; then
-   dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+   dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share 
|| die "failed to move shared ressources"
fi
-   dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+   dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
-   python_optimize "${ED}"/usr/share/${PN}/data/Mod/ 
"${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+   python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage 
"${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/

2021-02-15 Thread Joonas Niilola

commit: b74dc61c869a750563368af98db0758853b7cd23
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Feb 16 07:11:09 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Feb 16 07:11:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74dc61c

media-gfx/freecad: fix patch file formatting

Closes: https://bugs.gentoo.org/770820
Signed-off-by: Joonas Niilola  gentoo.org>

 ...001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch | 16 
 ...re20201231-0003-Gentoo-specific-don-t-check-vcs.patch | 16 
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
index d0097ab0730..9f4131f15a3 100644
--- 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
+++ 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
@@ -13,14 +13,14 @@ index c6c92f2..1af53c2 100644
 --- a/cMake/FindCoin3DDoc.cmake
 +++ b/cMake/FindCoin3DDoc.cmake
 @@ -22,7 +22,7 @@ IF (COIN3D_FOUND)
-   # Unix systems
-   find_path(COIN3D_DOC_PATH index.html 
- /usr/share/doc/libcoin80-doc/html
--/usr/share/doc/coin/html
-+/usr/share/doc/coin-4.0.0/html
- /usr/share/doc/Coin/html
-   )
-   IF( EXISTS ${COIN3D_DOC_PATH})
+   # Unix systems
+   find_path(COIN3D_DOC_PATH index.html 
+ /usr/share/doc/libcoin80-doc/html
+-/usr/share/doc/coin/html
++/usr/share/doc/coin-4.0.0/html
+ /usr/share/doc/Coin/html
+   )
+   IF( EXISTS ${COIN3D_DOC_PATH})
 -- 
 2.30.0
 

diff --git 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
index 1a384198ae3..ac8d194d00e 100644
--- 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+++ 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
@@ -13,14 +13,14 @@ index 9795450..59938bd 100644
 --- a/src/Tools/SubWCRev.py
 +++ b/src/Tools/SubWCRev.py
 @@ -455,7 +455,7 @@ def main():
- if o in ("-b", "--bindir"):
- bindir = a
- 
--vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), 
MercurialControl(), DebianChangelog(), UnknownControl()]
-+vcs=[UnknownControl()]
- for i in vcs:
- if i.extractInfo(srcdir, bindir):
- # Open the template file and the version file
+ if o in ("-b", "--bindir"):
+ bindir = a
+ 
+-vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), 
MercurialControl(), DebianChangelog(), UnknownControl()]
++vcs=[UnknownControl()]
+ for i in vcs:
+ if i.extractInfo(srcdir, bindir):
+ # Open the template file and the version file
 -- 
 2.30.1

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

2021-02-15 Thread Joonas Niilola

commit: 04ae9c5e0b5f8ce2c89c5c1266b6340bd9727f0f
Author: Bernd Waibel  gmail  com>
AuthorDate: Fri Jan 15 20:11:13 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Feb 15 09:03:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ae9c5e

media-gfx/freecad: re-add package

Pre-release version 0.19_pre with a commit date of 2020-12-31.
The current stable upstream release 0.18.5 needs qtwebkit, that's
why I didn't want to interfere with the removal of that package.

Things to do:
- bump sci-libs/vtk-9 and update dependency
- add python-3.9 support (needs updated vtk)
- update sci-mathematics/netgen and implement it in ebuild (FEM_NETGEN)
- check for external zipios++ (package needed)
- check for external smesh (package needed)
- check for improvements in USE flags?

Closes: https://bugs.gentoo.org/622726
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Bernd Waibel  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/Manifest |   1 +
 ...ndCoin3DDoc.cmake-fix-patch-for-coin-docs.patch |  26 ++
 ...0002-CMakeLists.txt-add-option-for-ccache.patch |  33 +++
 ...1231-0003-Gentoo-specific-don-t-check-vcs.patch |  26 ++
 media-gfx/freecad/freecad-0.19_pre20201231.ebuild  | 284 +
 media-gfx/freecad/metadata.xml | 115 +
 6 files changed, 485 insertions(+)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
new file mode 100644
index 000..99ac7bbf679
--- /dev/null
+++ b/media-gfx/freecad/Manifest
@@ -0,0 +1 @@
+DIST freecad-0.19_pre20201231.tar.gz 236040771 BLAKE2B 
648d8c1d8ab03f56403544f8e6a20dc5edc35b2cfc353c875202ce3e85449e450cbda93f410fec15366ce3aab342a93e981fa11cd9f5443a2fc40ef38ac0a1d0
 SHA512 
457792b0a12196d9e2d8113d9721a3b3a6d4fbc93bae001787db3eac43503a74a89a69564903b4005f8648476a150b6d871b3d78adfbf41c7260a4265132da34

diff --git 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
new file mode 100644
index 000..d0097ab0730
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
@@ -0,0 +1,26 @@
+From e08aec1344e753cd338a61c3584230741e00b23f Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Thu, 31 Dec 2020 13:26:44 +0100
+Subject: [PATCH 1/2] FindCoin3DDoc.cmake: fix patch for coin docs
+
+Signed-off-by: Bernd Waibel 
+---
+ cMake/FindCoin3DDoc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cMake/FindCoin3DDoc.cmake b/cMake/FindCoin3DDoc.cmake
+index c6c92f2..1af53c2 100644
+--- a/cMake/FindCoin3DDoc.cmake
 b/cMake/FindCoin3DDoc.cmake
+@@ -22,7 +22,7 @@ IF (COIN3D_FOUND)
+   # Unix systems
+   find_path(COIN3D_DOC_PATH index.html 
+ /usr/share/doc/libcoin80-doc/html
+-/usr/share/doc/coin/html
++/usr/share/doc/coin-4.0.0/html
+ /usr/share/doc/Coin/html
+   )
+   IF( EXISTS ${COIN3D_DOC_PATH})
+-- 
+2.30.0
+

diff --git 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
new file mode 100644
index 000..26bb4421077
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
@@ -0,0 +1,33 @@
+From bce02c4804d14ae2257ad5f5e7fae4e2baa74503 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Thu, 31 Dec 2020 13:31:47 +0100
+Subject: [PATCH 2/2] CMakeLists.txt: add option for ccache
+
+Signed-off-by: Bernd Waibel 
+---
+ CMakeLists.txt | 9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f4dabf7..17b9fad 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -8,9 +8,12 @@ if (POLICY CMP0072)
+ cmake_policy(SET CMP0072 OLD)
+ endif(POLICY CMP0072)
+ 
+-find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
+-if(CCACHE_PROGRAM)
+-set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
++option(FREECAD_USE_CCACHE "Use ccache to build FreeCAD" OFF)
++if(FREECAD_USE_CCACHE)
++find_program(CCACHE_PROGRAM ccache)  #This check should occur before 
project()
++if(CCACHE_PROGRAM)
++set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
++endif()
+ endif()
+ 
+ project(FreeCAD)
+-- 
+2.30.0
+

diff --git 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index 000..1a384198ae3
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2021-02-15 Thread Joonas Niilola

commit: e05f68215cf3a932447ffb3f0c3f066e4998c178
Author: Bernd Waibel  gmail  com>
AuthorDate: Sat Jan 16 00:58:17 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Feb 15 09:03:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e05f6821

media-gfx/freecad: add live ebuild

Fix email in metadata.xml

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19076
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/freecad-.ebuild | 283 ++
 media-gfx/freecad/metadata.xml|   2 +-
 2 files changed, 284 insertions(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
new file mode 100644
index 000..e2cb13d51fc
--- /dev/null
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# vtk needs updating to use 3.9
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
+   S="${WORKDIR}/freecad-${PV}"
+else
+   COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
+   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/FreeCAD-${COMMIT}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="ccache debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
+   inspection material mesh openscad part-design path points
+   raytracing robot show spreadsheet surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+   IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+   IUSE="${IUSE} -${module}"
+done
+unset module
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-cpp/eigen-3.3.1:3
+   dev-libs/OpenNI2[opengl(+)]
+   dev-libs/libspnav[X]
+   dev-libs/xerces-c
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   dev-qt/qtxml:5
+   >=media-libs/coin-4.0.0
+   media-libs/freetype
+   media-libs/qhull
+   sci-libs/flann[openmp]
+   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+   sci-libs/opencascade:=[vtk(+)]
+   sci-libs/orocos_kdl:=
+   sys-libs/zlib
+   virtual/glu
+   virtual/libusb:1
+   virtual/opengl
+   cloud? (
+   dev-libs/openssl:=
+   net-misc/curl
+   )
+   fem? ( 
=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
+   $(python_gen_cond_dep '
+   dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}]
+   dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+   >=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
+   dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
+   dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
+   addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
+   mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
+   ')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-lang/swig
+   ccache? ( dev-util/ccache )
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# draft, import, part, qt5, sketcher, start, web.
+#
+# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we 
enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency 
isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+   arch? ( mesh )
+   debug? ( mesh )
+   drawing? ( spreadsheet )
+   fem? ( mesh )
+   inspection? ( mesh points )
+   openscad? ( mesh )
+   path? ( mesh robot )
+   ship? ( image plot )
+   techdraw? ( spreadsheet drawing )
+"
+
+PATCHES=(
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, profiles/, media-gfx/freecad/

2018-08-07 Thread Andreas Sturmlechner

commit: 00e86d362b301de831131147ba4a1f541200d883
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  1 16:34:21 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug  7 07:27:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e86d36

media-gfx/freecad: Remove last-rited

Closes: https://bugs.gentoo.org/620702

 media-gfx/freecad/Manifest |   1 -
 .../files/freecad-0.14.3702-install-paths.patch|  21 
 .../freecad/files/freecad-0.17_pre-no-webkit.patch |  45 ---
 media-gfx/freecad/files/freecad.sharedmimeinfo |   8 --
 media-gfx/freecad/freecad-0.16.6712.ebuild | 131 -
 media-gfx/freecad/metadata.xml |  12 --
 profiles/package.mask  |   4 -
 7 files changed, 222 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
deleted file mode 100644
index 662e0f20394..000
--- a/media-gfx/freecad/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B 
ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2
 SHA512 
ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e

diff --git a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch 
b/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch
deleted file mode 100644
index d042695e88c..000
--- a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 freecad-0.14.3702/CMakeLists.txt
-+++ freecad-0.14.3702/CMakeLists.txt
-@@ -69,9 +69,15 @@
- SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH 
"Installation root directory")
- 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)
- # Don't set it without manual adaption of LibDir variable in 
src/App/FreeCADInit.py
- SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
- 

diff --git a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch 
b/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch
deleted file mode 100644
index 60dcfed22c7..000
--- a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Remove Qt4-Webkit dependency
-Author: Anton Gladky 
-Bug-Debian: https://bugs.debian.org/784464
-Last-Update: 2017-09-06
-
-* asturm: tidied up and amended to use and not override BUILD_WEB
-
 a/src/Gui/DownloadManager.cpp
-+++ b/src/Gui/DownloadManager.cpp
-@@ -33,7 +33,6 @@
- #include 
- #include 
- #include 
--#include 
- 
- #include "DownloadItem.h"
- #include "DownloadManager.h"
-@@ -224,11 +223,12 @@ void DownloadManager::updateRow()
- ui->downloadsView->setRowHeight(row, item->minimumSizeHint().height());
- 
- bool remove = false;
-+/*
- QWebSettings *globalSettings = QWebSettings::globalSettings();
- if (!item->downloading()
- && 
globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
- remove = true;
--
-+*/
- if (item->downloadedSuccessfully()
- && removePolicy() == DownloadManager::SuccessFullDownload) {
- remove = true;
 a/CMakeLists.txt   2018-03-02 22:39:46.374140506 +0100
-+++ b/CMakeLists.txt   2018-03-02 22:41:59.904216932 +0100
-@@ -351,11 +351,6 @@
-   set(BUILD_MESH ON)
- endif(BUILD_JTREADER)
- 
--#a runtime dependency
--if(BUILD_START)
--  set(BUILD_WEB ON)
--endif(BUILD_START)
--
- #leaving test module for someone else.
- #image has none. as far as I can tell.
- #mesh has none. as far as I can tell.

diff --git a/media-gfx/freecad/files/freecad.sharedmimeinfo 
b/media-gfx/freecad/files/freecad.sharedmimeinfo
deleted file mode 100644
index 6d5e93e7d13..000
--- a/media-gfx/freecad/files/freecad.sharedmimeinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-   
-   
-   FreeCAD document files
-   
-   
-

diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild 
b/media-gfx/freecad/freecad-0.16.6712.ebuild
deleted file mode 100644
index 0c65c49697b..000
---

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2018-05-11 Thread Andreas Sturmlechner

commit: b874d61060be798e6b6efb75b86953169bcd6cdd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 11 18:35:40 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 11 19:36:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b874d610

media-gfx/freecad: Drop broken 0.17_pre, bug #650274

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-gfx/freecad/Manifest   |   1 -
 media-gfx/freecad/freecad-0.17_pre-r1.ebuild | 131 ---
 2 files changed, 132 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index f34f1e28a61..662e0f20394 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1 @@
 DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B 
ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2
 SHA512 
ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e
-DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 
790462beef989b7a3db69d7412cd1076738579906873c8ce6c152b175f6b8305c2949087c9d719d884839e2966088c23309dc2617b3469bc5fa3296d2131e375
 SHA512 
a826a549d842ba322f7ec5f786d402e81f5b916008be450bacefb7ee976e203427130938c036cc6fca6ea11a8df0ab9b4a39f3bdfedc3cc1a7d31e7a5d11e142

diff --git a/media-gfx/freecad/freecad-0.17_pre-r1.ebuild 
b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
deleted file mode 100644
index 3b3624752c5..000
--- a/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils desktop xdg-utils fortran-2 python-single-r1
-
-DESCRIPTION="Qt based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
-else
-   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-   dev-cpp/eigen:3
-   dev-libs/boost:=[python,${PYTHON_USEDEP}]
-   dev-libs/xerces-c[icu]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/pyside:0[X,svg,${PYTHON_USEDEP}]
-   dev-python/shiboken:0[${PYTHON_USEDEP}]
-   dev-qt/designer:4
-   dev-qt/qtgui:4[-egl]
-   dev-qt/qtopengl:4[-egl]
-   dev-qt/qtsvg:4
-   media-libs/coin
-   media-libs/freetype
-   sci-libs/opencascade:*[vtk(+)]
-   sci-libs/orocos_kdl
-   sys-libs/zlib
-   virtual/glu"
-RDEPEND="${COMMON_DEPEND}
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/pivy[${PYTHON_USEDEP}]
-   dev-qt/assistant:4"
-DEPEND="${COMMON_DEPEND}
-   >=dev-lang/swig-2.0.4-r1:0
-   dev-python/pyside-tools:0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
-   "${FILESDIR}"/${P}-no-webkit.patch
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="mirror"
-
-# TODO:
-#   DEPEND and RDEPEND:
-#  salome-smesh - science overlay
-#  zipio++ - not in portage yet
-
-S="${WORKDIR}/FreeCAD-${PV}"
-
-DOCS=( README.md ChangeLog.txt )
-
-pkg_setup() {
-   fortran-2_pkg_setup
-   python-single-r1_pkg_setup
-
-   [[ -z ${CASROOT} ]] && die "empty \$CASROOT, run eselect opencascade 
set or define otherwise"
-}
-
-src_configure() {
-   export QT_SELECT=4
-
-   #-DOCC_* defined with cMake/FindOpenCasCade.cmake
-   #-DCOIN3D_* defined with cMake/FindCoin3D.cmake
-   #-DSOQT_ not used
-   local mycmakeargs=(
-   -DOCC_INCLUDE_DIR="${CASROOT}"/inc
-   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-   -DCMAKE_INSTALL_DATADIR=share/${P}
-   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-   -DCMAKE_INSTALL_INCLUDEDIR=include/${P}
-   -DFREECAD_USE_EXTERNAL_KDL=ON
-   -DBUILD_WEB=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
-   einfo "${P} will be built against opencascade version ${CASROOT}"
-}
-
-src_install() {
-   cmake-utils_src_install
-
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2018-03-13 Thread Andreas Sturmlechner

commit: 078fd3d958f15505a7466f40df954f00822b3a57
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 13 09:25:42 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 13 09:33:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=078fd3d9

media-gfx/freecad: Switch eutils -> desktop

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/freecad/freecad-0.16.6712.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild 
b/media-gfx/freecad/freecad-0.16.6712.ebuild
index b1cdc457414..8b858df54ba 100644
--- a/media-gfx/freecad/freecad-0.16.6712.ebuild
+++ b/media-gfx/freecad/freecad-0.16.6712.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils eutils xdg-utils fortran-2 python-single-r1
+inherit cmake-utils desktop xdg-utils fortran-2 python-single-r1
 
 DESCRIPTION="Qt based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/;

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2018-03-13 Thread Andreas Sturmlechner

commit: 3de09d76b875dc7ce1754b880d44038ea9e2f3ec
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 13 09:24:33 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 13 09:33:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de09d76

media-gfx/freecad: Drop bogus dev-java/xerces DEPEND

Thanks-to: Christoph Steup  ovgu.de>
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/freecad/freecad-0.16.6712.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild 
b/media-gfx/freecad/freecad-0.16.6712.ebuild
index 9a0fac1067a..b1cdc457414 100644
--- a/media-gfx/freecad/freecad-0.16.6712.ebuild
+++ b/media-gfx/freecad/freecad-0.16.6712.ebuild
@@ -23,10 +23,8 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="
-   ${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
dev-cpp/eigen:3
-   dev-java/xerces
dev-libs/boost:=[python,${PYTHON_USEDEP}]
dev-libs/xerces-c[icu]
dev-python/matplotlib[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2018-03-13 Thread Andreas Sturmlechner

commit: db39186a84fc276d2fc94a3166b97ec3fd0b581f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 13 09:27:42 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 13 09:33:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db39186a

media-gfx/freecad: Add no-webkit patch

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/freecad/freecad-0.16.6712.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild 
b/media-gfx/freecad/freecad-0.16.6712.ebuild
index 8b858df54ba..0c65c49697b 100644
--- a/media-gfx/freecad/freecad-0.16.6712.ebuild
+++ b/media-gfx/freecad/freecad-0.16.6712.ebuild
@@ -34,7 +34,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-qt/qtgui:4[-egl]
dev-qt/qtopengl:4[-egl]
dev-qt/qtsvg:4
-   dev-qt/qtwebkit:4
media-libs/coin
media-libs/freetype
sci-libs/opencascade:*[vtk(+)]
@@ -51,6 +50,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
+   "${FILESDIR}"/${PN}-0.17_pre-no-webkit.patch
 )
 
 # https://bugs.gentoo.org/show_bug.cgi?id=352435
@@ -85,7 +85,8 @@ src_configure() {
-DCMAKE_INSTALL_DATADIR=share/${P}
-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-DCMAKE_INSTALL_INCLUDEDIR=include/${P}
-   -DFREECAD_USE_EXTERNAL_KDL="ON"
+   -DFREECAD_USE_EXTERNAL_KDL=ON
+   -DBUILD_WEB=OFF
)
 
# TODO to remove embedded dependencies:

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2018-03-13 Thread Andreas Sturmlechner

commit: a9c5924be41e9457cdee147b28326b717e8fff40
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 13 09:17:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 13 09:33:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c5924b

media-gfx/freecad: Re-add 0.16.6712

It is actually more up-to-date than 0.17_pre.

Closes: https://bugs.gentoo.org/650274
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/freecad/Manifest |   1 +
 media-gfx/freecad/freecad-0.16.6712.ebuild | 132 +
 2 files changed, 133 insertions(+)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index f43670509b0..f34f1e28a61 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1 +1,2 @@
+DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B 
ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2
 SHA512 
ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e
 DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 
790462beef989b7a3db69d7412cd1076738579906873c8ce6c152b175f6b8305c2949087c9d719d884839e2966088c23309dc2617b3469bc5fa3296d2131e375
 SHA512 
a826a549d842ba322f7ec5f786d402e81f5b916008be450bacefb7ee976e203427130938c036cc6fca6ea11a8df0ab9b4a39f3bdfedc3cc1a7d31e7a5d11e142

diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild 
b/media-gfx/freecad/freecad-0.16.6712.ebuild
new file mode 100644
index 000..9a0fac1067a
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.16.6712.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils xdg-utils fortran-2 python-single-r1
+
+DESCRIPTION="Qt based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
+else
+   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+   ${PYTHON_DEPS}
+   dev-cpp/eigen:3
+   dev-java/xerces
+   dev-libs/boost:=[python,${PYTHON_USEDEP}]
+   dev-libs/xerces-c[icu]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/pyside:0[X,svg,${PYTHON_USEDEP}]
+   dev-python/shiboken:0[${PYTHON_USEDEP}]
+   dev-qt/designer:4
+   dev-qt/qtgui:4[-egl]
+   dev-qt/qtopengl:4[-egl]
+   dev-qt/qtsvg:4
+   dev-qt/qtwebkit:4
+   media-libs/coin
+   media-libs/freetype
+   sci-libs/opencascade:*[vtk(+)]
+   sci-libs/orocos_kdl
+   sys-libs/zlib
+   virtual/glu"
+RDEPEND="${COMMON_DEPEND}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pivy[${PYTHON_USEDEP}]
+   dev-qt/assistant:4"
+DEPEND="${COMMON_DEPEND}
+   >=dev-lang/swig-2.0.4-r1:0
+   dev-python/pyside-tools:0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=352435
+# 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+RESTRICT="mirror"
+
+# TODO:
+#   DEPEND and RDEPEND:
+#  salome-smesh - science overlay
+#  zipio++ - not in portage yet
+
+S="${WORKDIR}/FreeCAD-${PV}"
+
+DOCS=( README.md ChangeLog.txt )
+
+pkg_setup() {
+   fortran-2_pkg_setup
+   python-single-r1_pkg_setup
+
+   [[ -z ${CASROOT} ]] && die "empty \$CASROOT, run eselect opencascade 
set or define otherwise"
+}
+
+src_configure() {
+   export QT_SELECT=4
+
+   #-DOCC_* defined with cMake/FindOpenCasCade.cmake
+   #-DCOIN3D_* defined with cMake/FindCoin3D.cmake
+   #-DSOQT_ not used
+   local mycmakeargs=(
+   -DOCC_INCLUDE_DIR="${CASROOT}"/inc
+   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+   -DCMAKE_INSTALL_DATADIR=share/${P}
+   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+   -DCMAKE_INSTALL_INCLUDEDIR=include/${P}
+   -DFREECAD_USE_EXTERNAL_KDL="ON"
+   )
+
+   # 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
+   einfo "${P} will be built against opencascade version ${CASROOT}"
+}
+
+src_install() {
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2018-03-02 Thread Andreas Sturmlechner

commit: fd83e9d3c1b1a7a619908701ad9dadd0eb503553
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  2 21:55:36 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  2 22:08:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd83e9d3

media-gfx/freecad: Drop old

Closes: https://bugs.gentoo.org/634216
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/freecad/Manifest |   1 -
 media-gfx/freecad/freecad-0.16.6712.ebuild | 132 -
 2 files changed, 133 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index f34f1e28a61..f43670509b0 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1 @@
-DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B 
ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2
 SHA512 
ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e
 DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 
790462beef989b7a3db69d7412cd1076738579906873c8ce6c152b175f6b8305c2949087c9d719d884839e2966088c23309dc2617b3469bc5fa3296d2131e375
 SHA512 
a826a549d842ba322f7ec5f786d402e81f5b916008be450bacefb7ee976e203427130938c036cc6fca6ea11a8df0ab9b4a39f3bdfedc3cc1a7d31e7a5d11e142

diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild 
b/media-gfx/freecad/freecad-0.16.6712.ebuild
deleted file mode 100644
index 46964014555..000
--- a/media-gfx/freecad/freecad-0.16.6712.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils xdg-utils fortran-2 python-single-r1
-
-DESCRIPTION="Qt based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
-else
-   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-   ${PYTHON_DEPS}
-   dev-cpp/eigen:3
-   dev-java/xerces
-   dev-libs/boost:=[python,${PYTHON_USEDEP}]
-   dev-libs/xerces-c[icu]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/pyside:0[X,svg,${PYTHON_USEDEP}]
-   dev-python/shiboken:0[${PYTHON_USEDEP}]
-   dev-qt/designer:4
-   dev-qt/qtgui:4[-egl]
-   dev-qt/qtopengl:4[-egl]
-   dev-qt/qtsvg:4
-   dev-qt/qtwebkit:4
-   media-libs/coin
-   media-libs/freetype
-   sci-libs/opencascade:*[vtk(+)]
-   sci-libs/orocos_kdl
-   sys-libs/zlib
-   virtual/glu"
-RDEPEND="${COMMON_DEPEND}
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/pivy[${PYTHON_USEDEP}]
-   dev-qt/assistant:4"
-DEPEND="${COMMON_DEPEND}
-   >=dev-lang/swig-2.0.4-r1:0
-   dev-python/pyside-tools:0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="mirror"
-
-# TODO:
-#   DEPEND and RDEPEND:
-#  salome-smesh - science overlay
-#  zipio++ - not in portage yet
-
-S="${WORKDIR}/FreeCAD-${PV}"
-
-DOCS=( README.md ChangeLog.txt )
-
-pkg_setup() {
-   fortran-2_pkg_setup
-   python-single-r1_pkg_setup
-
-   [[ -z ${CASROOT} ]] && die "empty \$CASROOT, run eselect opencascade 
set or define otherwise"
-}
-
-src_configure() {
-   export QT_SELECT=4
-
-   #-DOCC_* defined with cMake/FindOpenCasCade.cmake
-   #-DCOIN3D_* defined with cMake/FindCoin3D.cmake
-   #-DSOQT_ not used
-   local mycmakeargs=(
-   -DOCC_INCLUDE_DIR="${CASROOT}"/inc
-   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-   -DCMAKE_INSTALL_DATADIR=share/${P}
-   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-   -DCMAKE_INSTALL_INCLUDEDIR=include/${P}
-   -DFREECAD_USE_EXTERNAL_KDL="ON"
-   )
-
-   # 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
-   einfo "${P} will be built against opencascade version ${CASROOT}"
-}
-
-src_install() {
-   cmake-utils_src_install
-
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2018-03-02 Thread Andreas Sturmlechner

commit: 7de3981f2f76697156b56e92b24f8d05beeeaa2b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  2 21:57:16 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  2 22:08:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de3981f

media-gfx/freecad: Switch eutils -> desktop

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/freecad/freecad-0.17_pre-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/freecad-0.17_pre-r1.ebuild 
b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
index 04f8a543295..3b3624752c5 100644
--- a/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils eutils xdg-utils fortran-2 python-single-r1
+inherit cmake-utils desktop xdg-utils fortran-2 python-single-r1
 
 DESCRIPTION="Qt based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/;

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2018-03-02 Thread Andreas Sturmlechner

commit: 417a8bd818405105bc096c1445a68fdd8f4604a3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  2 21:52:24 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  2 22:08:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=417a8bd8

media-gfx/freecad: Drop bogus dev-java/xerces DEPEND

Thanks-to: Christoph Steup  ovgu.de>
Closes: https://bugs.gentoo.org/607966
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/freecad/freecad-0.17_pre-r1.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.17_pre-r1.ebuild 
b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
index 18a7d527d17..04f8a543295 100644
--- a/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
@@ -23,10 +23,8 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="
-   ${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
dev-cpp/eigen:3
-   dev-java/xerces
dev-libs/boost:=[python,${PYTHON_USEDEP}]
dev-libs/xerces-c[icu]
dev-python/matplotlib[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2018-03-02 Thread Andreas Sturmlechner

commit: b055f5b8a2f097b72bc00e6e980ee61b823cb99d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  2 22:03:42 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  2 22:08:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b055f5b8

media-gfx/freecad: Drop 0.17_pre and 

Live ebuild is broken beyond repair until some Qt5 version finds its way.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/freecad/freecad-0.17_pre.ebuild | 132 -
 media-gfx/freecad/freecad-.ebuild | 134 --
 2 files changed, 266 deletions(-)

diff --git a/media-gfx/freecad/freecad-0.17_pre.ebuild 
b/media-gfx/freecad/freecad-0.17_pre.ebuild
deleted file mode 100644
index 46964014555..000
--- a/media-gfx/freecad/freecad-0.17_pre.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils xdg-utils fortran-2 python-single-r1
-
-DESCRIPTION="Qt based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
-else
-   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-   ${PYTHON_DEPS}
-   dev-cpp/eigen:3
-   dev-java/xerces
-   dev-libs/boost:=[python,${PYTHON_USEDEP}]
-   dev-libs/xerces-c[icu]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/pyside:0[X,svg,${PYTHON_USEDEP}]
-   dev-python/shiboken:0[${PYTHON_USEDEP}]
-   dev-qt/designer:4
-   dev-qt/qtgui:4[-egl]
-   dev-qt/qtopengl:4[-egl]
-   dev-qt/qtsvg:4
-   dev-qt/qtwebkit:4
-   media-libs/coin
-   media-libs/freetype
-   sci-libs/opencascade:*[vtk(+)]
-   sci-libs/orocos_kdl
-   sys-libs/zlib
-   virtual/glu"
-RDEPEND="${COMMON_DEPEND}
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/pivy[${PYTHON_USEDEP}]
-   dev-qt/assistant:4"
-DEPEND="${COMMON_DEPEND}
-   >=dev-lang/swig-2.0.4-r1:0
-   dev-python/pyside-tools:0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="mirror"
-
-# TODO:
-#   DEPEND and RDEPEND:
-#  salome-smesh - science overlay
-#  zipio++ - not in portage yet
-
-S="${WORKDIR}/FreeCAD-${PV}"
-
-DOCS=( README.md ChangeLog.txt )
-
-pkg_setup() {
-   fortran-2_pkg_setup
-   python-single-r1_pkg_setup
-
-   [[ -z ${CASROOT} ]] && die "empty \$CASROOT, run eselect opencascade 
set or define otherwise"
-}
-
-src_configure() {
-   export QT_SELECT=4
-
-   #-DOCC_* defined with cMake/FindOpenCasCade.cmake
-   #-DCOIN3D_* defined with cMake/FindCoin3D.cmake
-   #-DSOQT_ not used
-   local mycmakeargs=(
-   -DOCC_INCLUDE_DIR="${CASROOT}"/inc
-   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-   -DCMAKE_INSTALL_DATADIR=share/${P}
-   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-   -DCMAKE_INSTALL_INCLUDEDIR=include/${P}
-   -DFREECAD_USE_EXTERNAL_KDL="ON"
-   )
-
-   # 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
-   einfo "${P} will be built against opencascade version ${CASROOT}"
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   make_desktop_entry FreeCAD "FreeCAD" "" "" 
"MimeType=application/x-extension-fcstd;"
-
-   # install mimetype for FreeCAD files
-   insinto /usr/share/mime/packages
-   newins "${FILESDIR}"/${PN}.sharedmimeinfo "${PN}.xml"
-
-   # install icons to correct place rather than /usr/share/freecad
-   pushd "${ED%/}"/usr/share/${P} || die
-   local size
-   for size in 16 32 48 64; do
-   newicon -s ${size} freecad-icon-${size}.png freecad.png
-   done
-   doicon -s scalable freecad.svg
-   newicon -s 64 -c mimetypes freecad-doc.png 
application-x-extension-fcstd.png
-   popd || die
-
-   python_optimize "${ED%/}"/usr/{,share/${P}/}Mod/
-}
-
-pkg_postinst() {
-   xdg_mimeinfo_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2018-03-02 Thread Andreas Sturmlechner

commit: 506f827c4f6bdbaf6c93463f2d8e6390d2be6a4e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  2 21:48:50 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  2 22:08:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506f827c

media-gfx/freecad: Add no-webkit patch

Bug: https://bugs.gentoo.org/620702
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../freecad/files/freecad-0.17_pre-no-webkit.patch |  45 +++
 media-gfx/freecad/freecad-0.17_pre-r1.ebuild   | 133 +
 2 files changed, 178 insertions(+)

diff --git a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch 
b/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch
new file mode 100644
index 000..60dcfed22c7
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch
@@ -0,0 +1,45 @@
+Description: Remove Qt4-Webkit dependency
+Author: Anton Gladky 
+Bug-Debian: https://bugs.debian.org/784464
+Last-Update: 2017-09-06
+
+* asturm: tidied up and amended to use and not override BUILD_WEB
+
+--- a/src/Gui/DownloadManager.cpp
 b/src/Gui/DownloadManager.cpp
+@@ -33,7 +33,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ 
+ #include "DownloadItem.h"
+ #include "DownloadManager.h"
+@@ -224,11 +223,12 @@ void DownloadManager::updateRow()
+ ui->downloadsView->setRowHeight(row, item->minimumSizeHint().height());
+ 
+ bool remove = false;
++/*
+ QWebSettings *globalSettings = QWebSettings::globalSettings();
+ if (!item->downloading()
+ && 
globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+ remove = true;
+-
++*/
+ if (item->downloadedSuccessfully()
+ && removePolicy() == DownloadManager::SuccessFullDownload) {
+ remove = true;
+--- a/CMakeLists.txt   2018-03-02 22:39:46.374140506 +0100
 b/CMakeLists.txt   2018-03-02 22:41:59.904216932 +0100
+@@ -351,11 +351,6 @@
+   set(BUILD_MESH ON)
+ endif(BUILD_JTREADER)
+ 
+-#a runtime dependency
+-if(BUILD_START)
+-  set(BUILD_WEB ON)
+-endif(BUILD_START)
+-
+ #leaving test module for someone else.
+ #image has none. as far as I can tell.
+ #mesh has none. as far as I can tell.

diff --git a/media-gfx/freecad/freecad-0.17_pre-r1.ebuild 
b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
new file mode 100644
index 000..18a7d527d17
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils xdg-utils fortran-2 python-single-r1
+
+DESCRIPTION="Qt based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
+else
+   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+   ${PYTHON_DEPS}
+   dev-cpp/eigen:3
+   dev-java/xerces
+   dev-libs/boost:=[python,${PYTHON_USEDEP}]
+   dev-libs/xerces-c[icu]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/pyside:0[X,svg,${PYTHON_USEDEP}]
+   dev-python/shiboken:0[${PYTHON_USEDEP}]
+   dev-qt/designer:4
+   dev-qt/qtgui:4[-egl]
+   dev-qt/qtopengl:4[-egl]
+   dev-qt/qtsvg:4
+   media-libs/coin
+   media-libs/freetype
+   sci-libs/opencascade:*[vtk(+)]
+   sci-libs/orocos_kdl
+   sys-libs/zlib
+   virtual/glu"
+RDEPEND="${COMMON_DEPEND}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pivy[${PYTHON_USEDEP}]
+   dev-qt/assistant:4"
+DEPEND="${COMMON_DEPEND}
+   >=dev-lang/swig-2.0.4-r1:0
+   dev-python/pyside-tools:0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
+   "${FILESDIR}"/${P}-no-webkit.patch
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=352435
+# 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+RESTRICT="mirror"
+
+# TODO:
+#   DEPEND and RDEPEND:
+#  salome-smesh - science overlay
+#  zipio++ - not in portage yet
+
+S="${WORKDIR}/FreeCAD-${PV}"
+
+DOCS=( README.md ChangeLog.txt )
+
+pkg_setup() {
+   fortran-2_pkg_setup
+   python-single-r1_pkg_setup
+
+   [[ -z ${CASROOT} ]] && die "empty \$CASROOT, run eselect opencascade 
set or define otherwise"
+}
+
+src_configure() {
+   export QT_SELECT=4
+
+   #-DOCC_* defined with cMake/FindOpenCasCade.cmake
+   #-DCOIN3D_* defined with cMake/FindCoin3D.cmake
+   #-DSOQT_ not used
+   local mycmakeargs=(
+   -DOCC_INCLUDE_DIR="${CASROOT}"/inc
+   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2018-01-04 Thread Andreas Sturmlechner

commit: 970ae83d488e7cf0c237d68b0a2a6ef35c30959e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan  4 19:59:32 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan  5 00:34:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=970ae83d

media-gfx/freecad: Fix Manifest again

what had been already on Gentoo mirrors is still identical with upstream.

Closes: https://bugs.gentoo.org/642780
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/freecad/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index cefc9112d51..f34f1e28a61 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1,2 @@
 DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B 
ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2
 SHA512 
ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e
-DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 
98b678240e09ef85204719b6d4e9bbeafec358ba8657a8e92d45f3dd9cea20779d4b8b07ae084b0e06e2a02bd13662e6b735e164d867da50f4d7f28ade30ec22
 SHA512 
659baff3d7cf8c7773ae6be253bdd18d8051d9f995e2333d74db4e3e744c719e2caed901264af457570c72fc7505decaf77639ca0834e01feb68c9793ed86cf5
+DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 
790462beef989b7a3db69d7412cd1076738579906873c8ce6c152b175f6b8305c2949087c9d719d884839e2966088c23309dc2617b3469bc5fa3296d2131e375
 SHA512 
a826a549d842ba322f7ec5f786d402e81f5b916008be450bacefb7ee976e203427130938c036cc6fca6ea11a8df0ab9b4a39f3bdfedc3cc1a7d31e7a5d11e142

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2017-12-29 Thread Miroslav Šulc

commit: 5e2a5df7c49975be9ecf39a04f336286dcd7acc9
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Dec 29 19:06:01 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec 29 19:06:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2a5df7

media-gfx/freecad-0.17_pre: fixed digest

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/freecad/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index f34f1e28a61..cefc9112d51 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1,2 @@
 DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B 
ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2
 SHA512 
ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e
-DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 
790462beef989b7a3db69d7412cd1076738579906873c8ce6c152b175f6b8305c2949087c9d719d884839e2966088c23309dc2617b3469bc5fa3296d2131e375
 SHA512 
a826a549d842ba322f7ec5f786d402e81f5b916008be450bacefb7ee976e203427130938c036cc6fca6ea11a8df0ab9b4a39f3bdfedc3cc1a7d31e7a5d11e142
+DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 
98b678240e09ef85204719b6d4e9bbeafec358ba8657a8e92d45f3dd9cea20779d4b8b07ae084b0e06e2a02bd13662e6b735e164d867da50f4d7f28ade30ec22
 SHA512 
659baff3d7cf8c7773ae6be253bdd18d8051d9f995e2333d74db4e3e744c719e2caed901264af457570c72fc7505decaf77639ca0834e01feb68c9793ed86cf5

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

2017-12-29 Thread Miroslav Šulc

commit: a6ae8d1452396e5c06820e26565d1a1b5ccec6e3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Dec 29 19:04:58 2017 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec 29 19:06:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ae8d14

media-gfx/freecad-: several fixes

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/freecad/freecad-.ebuild | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index d6e044a1e51..13355e49800 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils eutils xdg-utils fortran-2 python-single-r1
+inherit cmake-utils eutils xdg-utils gnome2-utils fortran-2 python-single-r1
 
 DESCRIPTION="Qt based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/;
@@ -80,9 +80,9 @@ src_configure() {
local mycmakeargs=(
-DOCC_INCLUDE_DIR="${CASROOT}"/inc
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-   -DCMAKE_INSTALL_DATADIR=share/${P}
-   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-   -DCMAKE_INSTALL_INCLUDEDIR=include/${P}
+   -DCMAKE_INSTALL_DATADIR=/usr/share/${P}
+   -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+   -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${P}
-DFREECAD_USE_EXTERNAL_KDL="ON"
)
 
@@ -121,8 +121,14 @@ src_install() {
 
 pkg_postinst() {
xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+
+   gnome2_icon_cache_update
 }
 
 pkg_postrm() {
xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+
+   gnome2_icon_cache_update
 }

1 2 >

1 - 100 of 124 matches

Mail list logo