* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-12-04 21:52 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-12-04 21:52 UTC (permalink / raw
To: gentoo-commits
commit: febb7b197dd214a577942eddcc0096984ec0b8d3
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Dec 3 23:11:36 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 4 21:52:44 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> 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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2024-09-15 15:42 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2024-09-15 15:42 UTC (permalink / raw
To: gentoo-commits
commit: 57b1623c4a6e23ad5fa73c44304665d2c0fb8d27
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 15:38:15 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 15:42:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b1623c
media-gfx/freecad: misc bug fixes, qt6 by default
- fix issue where path with spaces is not properly passed on
- add USE=smesh for smesh module, because it requires vtk
- add missing rdep asciidoctor
- add missing dep ms-gsl
- qt6 by default for 1,0_rc1 (this rc fixes several qt6 issues)
Bug: https://bugs.gentoo.org/933439
Closes: https://bugs.gentoo.org/927660
Closes: https://bugs.gentoo.org/939704
Closes: https://bugs.gentoo.org/935303
Closes: https://bugs.gentoo.org/939175
Closes: https://bugs.gentoo.org/933821
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
...ad-1.0_rc1.ebuild => freecad-1.0_rc1-r1.ebuild} | 22 +++++++++++--------
media-gfx/freecad/freecad-9999.ebuild | 25 ++++++++++++++--------
media-gfx/freecad/metadata.xml | 3 +++
3 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/media-gfx/freecad/freecad-1.0_rc1.ebuild b/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild
similarity index 96%
rename from media-gfx/freecad/freecad-1.0_rc1.ebuild
rename to media-gfx/freecad/freecad-1.0_rc1-r1.ebuild
index cfc5732f206f..0cd5f233f0bb 100644
--- a/media-gfx/freecad/freecad-1.0_rc1.ebuild
+++ b/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild
@@ -27,12 +27,12 @@ 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 qt6 test"
+IUSE="debug designer +gui +qt6 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"
+ openscad part-design path points raytracing robot show smesh
+ surface techdraw tux"
for module in ${FREECAD_STABLE_MODULES}; do
IUSE="${IUSE} +${module}"
@@ -52,6 +52,7 @@ RDEPEND="
dev-libs/libfmt:=
dev-libs/libspnav[X]
dev-libs/xerces-c[icu]
+ dev-ruby/asciidoctor
!qt6? (
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -118,6 +119,10 @@ RDEPEND="
netgen? ( media-gfx/netgen[opencascade] )
openscad? ( media-gfx/openscad )
pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] )
+ smesh? (
+ !qt6? ( sci-libs/vtk:=[qt5] )
+ qt6? ( sci-libs/vtk:=[-qt5,qt6] )
+ )
$(python_gen_cond_dep '
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pybind11[${PYTHON_USEDEP}]
@@ -125,9 +130,9 @@ RDEPEND="
fem? ( dev-python/ply[${PYTHON_USEDEP}] )
')
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}
>=dev-cpp/eigen-3.3.1:3
+ dev-cpp/ms-gsl
test? (
$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
!qt6? ( dev-qt/qttest:5 )
@@ -201,7 +206,7 @@ src_configure() {
local mycmakeargs=(
-DBUILD_ADDONMGR=$(usex addonmgr)
-DBUILD_ARCH=ON
- -DBUILD_ASSEMBLY=OFF # deprecated
+ -DBUILD_ASSEMBLY=OFF # Requires OndselSolver
-DBUILD_CLOUD=$(usex cloud)
-DBUILD_COMPLETE=OFF # deprecated
-DBUILD_DRAFT=ON
@@ -231,7 +236,7 @@ src_configure() {
-DBUILD_ROBOT=$(usex robot)
-DBUILD_SHOW=$(usex show)
-DBUILD_SKETCHER=ON # needed by draft workspace
- -DBUILD_SMESH=ON
+ -DBUILD_SMESH=$(usex smesh)
-DBUILD_SPREADSHEET=ON
-DBUILD_START=ON
-DBUILD_SURFACE=$(usex surface)
@@ -337,14 +342,13 @@ src_install() {
# https://github.com/coin3d/coin/issues/451
: \${QT_QPA_PLATFORM:=xcb}
export QT_QPA_PLATFORM
- exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@}
+ exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}"
_EOF_
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
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)
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
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 250c1a1dbbf7..239dd9e8222e 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -26,12 +26,12 @@ 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 qt6 test"
+IUSE="debug designer +gui +qt6 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"
+ openscad part-design path points raytracing robot show smesh
+ surface techdraw tux"
for module in ${FREECAD_STABLE_MODULES}; do
IUSE="${IUSE} +${module}"
@@ -51,6 +51,7 @@ RDEPEND="
dev-libs/libfmt:=
dev-libs/libspnav[X]
dev-libs/xerces-c[icu]
+ dev-ruby/asciidoctor
!qt6? (
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -117,6 +118,10 @@ RDEPEND="
netgen? ( media-gfx/netgen[opencascade] )
openscad? ( media-gfx/openscad )
pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] )
+ smesh? (
+ !qt6? ( sci-libs/vtk:=[qt5] )
+ qt6? ( sci-libs/vtk:=[-qt5,qt6] )
+ )
$(python_gen_cond_dep '
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pybind11[${PYTHON_USEDEP}]
@@ -124,9 +129,9 @@ RDEPEND="
fem? ( dev-python/ply[${PYTHON_USEDEP}] )
')
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}
>=dev-cpp/eigen-3.3.1:3
+ dev-cpp/ms-gsl
test? (
$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
!qt6? ( dev-qt/qttest:5 )
@@ -194,10 +199,13 @@ src_configure() {
# https://github.com/FreeCAD/FreeCAD/issues/13173
filter-lto
+ # Fix building tests
+ append-ldflags -Wl,--copy-dt-needed-entries
+
local mycmakeargs=(
-DBUILD_ADDONMGR=$(usex addonmgr)
-DBUILD_ARCH=ON
- -DBUILD_ASSEMBLY=OFF # deprecated
+ -DBUILD_ASSEMBLY=OFF # Requires OndselSolver
-DBUILD_CLOUD=$(usex cloud)
-DBUILD_COMPLETE=OFF # deprecated
-DBUILD_DRAFT=ON
@@ -227,7 +235,7 @@ src_configure() {
-DBUILD_ROBOT=$(usex robot)
-DBUILD_SHOW=$(usex show)
-DBUILD_SKETCHER=ON # needed by draft workspace
- -DBUILD_SMESH=ON
+ -DBUILD_SMESH=$(usex smesh)
-DBUILD_SPREADSHEET=ON
-DBUILD_START=ON
-DBUILD_SURFACE=$(usex surface)
@@ -333,14 +341,13 @@ src_install() {
# https://github.com/coin3d/coin/issues/451
: \${QT_QPA_PLATFORM:=xcb}
export QT_QPA_PLATFORM
- exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@}
+ exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}"
_EOF_
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
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)
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
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index b934f4a2b2de..0787a07fc30c 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -78,6 +78,9 @@
<flag name="show">
Build the show module, a helper module for visibility automation
</flag>
+ <flag name="smesh">
+ Build the Salome SMESH module
+ </flag>
<flag name="surface">
Build the surface module and workbench
</flag>
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2024-09-14 19:59 Alexey Shvetsov
0 siblings, 0 replies; 92+ messages in thread
From: Alexey Shvetsov @ 2024-09-14 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 19b3eac48c776844de60e254717be515ed7eeeed
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 19:58:42 2024 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 19:59:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b3eac4
media-gfx/freecad: add 1.0_rc1
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
media-gfx/freecad/Manifest | 1 +
media-gfx/freecad/freecad-1.0_rc1.ebuild | 388 +++++++++++++++++++++++++++++++
2 files changed, 389 insertions(+)
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 9f6735199db5..064d27114445 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1 +1,2 @@
DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78 SHA512 bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5
+DIST freecad-1.0_rc1.tar.gz 88552055 BLAKE2B 3e2607d87da86edd35c05abba0d7085bed7fc42f9831c7e2451e028b3ce267c7a1e44b82c9a51bdfc736b5c98198030aafb81a7ae5df158ae17bc5afe2df44e0 SHA512 1d0a0d131c35ee03b435a0b901cb56c8e98ce2dd62ff5102856b3777dfc6d3bfba6ff4ea87e8c8949640bd14fdb775db3e9eb9a8b6530dd1f86a903037c95dba
diff --git a/media-gfx/freecad/freecad-1.0_rc1.ebuild b/media-gfx/freecad/freecad-1.0_rc1.ebuild
new file mode 100644
index 000000000000..cfc5732f206f
--- /dev/null
+++ b/media-gfx/freecad/freecad-1.0_rc1.ebuild
@@ -0,0 +1,388 @@
+# 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 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"
+
+MY_PN=FreeCAD
+MY_PV="${PV/_/}"
+
+if [[ ${PV} = *9999 ]]; 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/${MY_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/FreeCAD-${MY_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 qt6 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-cpp/yaml-cpp
+ dev-libs/OpenNI2[opengl(+)]
+ dev-libs/boost:=
+ dev-libs/libfmt:=
+ dev-libs/libspnav[X]
+ dev-libs/xerces-c[icu]
+ !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]
+ >=sci-libs/med-4.0.0-r1
+ sci-libs/opencascade:=[json,vtk]
+ sci-libs/orocos_kdl:=
+ sys-libs/zlib
+ virtual/libusb:1
+ cloud? (
+ dev-libs/openssl:=
+ net-misc/curl
+ )
+ fem? (
+ !qt6? ( sci-libs/vtk:=[qt5,rendering] )
+ qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
+ )
+ gui? (
+ >=media-libs/coin-4.0.0
+ virtual/glu
+ virtual/opengl
+ !qt6? (
+ 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
+ pcl? ( sci-libs/pcl[qt5] )
+ $(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}]
+ ' python3_{10..11} )
+ )
+ 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
+ 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}]
+ dev-python/pyside6:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+ dev-python/shiboken6:=[${PYTHON_USEDEP}]
+ ' )
+ )
+ )
+ netgen? ( media-gfx/netgen[opencascade] )
+ openscad? ( media-gfx/openscad )
+ pcl? ( sci-libs/pcl:=[opengl,openni2,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}]')
+ !qt6? ( dev-qt/qttest:5 )
+ )
+"
+BDEPEND="
+ app-text/dos2unix
+ dev-lang/swig
+ test? (
+ $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+ !qt6? ( 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 )
+ python_single_target_python3_12? ( gui? ( qt6 ) )
+"
+# There is no py3.12 support planned for pyside2
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch
+ "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
+ "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
+)
+
+DOCS=( CODE_OF_CONDUCT.md README.md )
+
+CHECKREQS_DISK_BUILD="2G"
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ python-single-r1_pkg_setup
+ [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
+}
+
+src_prepare() {
+ # Fix desktop file
+ 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"
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/875221
+ # https://github.com/FreeCAD/FreeCAD/issues/13173
+ filter-lto
+
+ # Fix building tests
+ append-ldflags -Wl,--copy-dt-needed-entries
+
+ local mycmakeargs=(
+ -DBUILD_ADDONMGR=$(usex addonmgr)
+ -DBUILD_ARCH=ON
+ -DBUILD_ASSEMBLY=OFF # deprecated
+ -DBUILD_CLOUD=$(usex cloud)
+ -DBUILD_COMPLETE=OFF # deprecated
+ -DBUILD_DRAFT=ON
+ -DBUILD_DESIGNER_PLUGIN=$(usex designer)
+ -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for current git master
+ -DBUILD_FEM=$(usex fem)
+ -DBUILD_FEM_NETGEN=$(usex netgen)
+ -DBUILD_FLAT_MESH=ON
+ -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
+ -DBUILD_FREETYPE=ON # automagic dep
+ -DBUILD_GUI=$(usex gui)
+ -DBUILD_IDF=$(usex idf)
+ -DBUILD_IMAGE=$(usex image)
+ -DBUILD_IMPORT=ON # import module for various file formats
+ -DBUILD_INSPECTION=$(usex inspection)
+ -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
+ -DBUILD_MATERIAL=$(usex material)
+ -DBUILD_MESH=ON
+ -DBUILD_MESH_PART=ON
+ -DBUILD_OPENSCAD=$(usex openscad)
+ -DBUILD_PART=ON
+ -DBUILD_PART_DESIGN=$(usex part-design)
+ -DBUILD_PATH=$(usex path)
+ -DBUILD_POINTS=$(usex points)
+ -DBUILD_RAYTRACING=$(usex raytracing)
+ -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox
+ -DBUILD_ROBOT=$(usex robot)
+ -DBUILD_SHOW=$(usex show)
+ -DBUILD_SKETCHER=ON # needed by draft workspace
+ -DBUILD_SMESH=ON
+ -DBUILD_SPREADSHEET=ON
+ -DBUILD_START=ON
+ -DBUILD_SURFACE=$(usex surface)
+ -DBUILD_TECHDRAW=$(usex techdraw)
+ -DBUILD_TEST=ON # always build test workbench for run-time testing
+ -DBUILD_TUX=$(usex tux)
+ -DBUILD_VR=OFF
+ -DBUILD_WEB=ON # needed by start workspace
+ -DBUILD_WITH_CONDA=OFF
+
+ -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
+
+ -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
+ -DFREECAD_USE_FREETYPE=ON
+ -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+ -DFREECAD_USE_PCL=$(usex pcl)
+ -DFREECAD_USE_PYBIND11=ON
+ -DFREECAD_USE_QT_FILEDIALOG=ON
+ -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+ # 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}
+ )
+
+ if use debug; then
+ # BUILD_SANDBOX currently broken, see
+ # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=ON
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=OFF
+ )
+ fi
+
+ 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
+ # Drawing module unmaintained and not ported to qt6
+ -DBUILD_DRAWING=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
+ # Drawing module unmaintained and not ported to qt6
+ -DBUILD_DRAWING=ON
+ )
+ fi
+
+ cmake_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=-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
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ export FREECAD_USER_HOME="${HOME}"
+ export FREECAD_USER_DATA="${T}"
+ export FREECAD_USER_TEMP="${T}"
+ nonfatal ./bin/FreeCADCmd --run-test 0
+ popd > /dev/null || die
+}
+
+src_install() {
+ cmake_src_install
+
+ dobin src/Tools/freecad-thumbnailer
+
+ if use gui; then
+ newbin - freecad <<- _EOF_
+ #!/bin/sh
+ # https://github.com/coin3d/coin/issues/451
+ : \${QT_QPA_PLATFORM:=xcb}
+ export QT_QPA_PLATFORM
+ exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@}
+ _EOF_
+ 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
+
+ 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)
+
+ 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
+}
+
+pkg_postinst() {
+ xdg_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, 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_header "Computational utilities"
+ optfeature "BLAS library" sci-libs/openblas
+ optfeature "Statistical computation with Python" dev-python/pandas
+ 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 "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 "Triangulating meshes" sci-libs/gts
+ optfeature "Visualization" sci-visualization/paraview
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2024-04-15 9:42 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2024-04-15 9:42 UTC (permalink / raw
To: gentoo-commits
commit: 0eedd9b5a7ec4102b47f3925cfcb61ac204ddd53
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 09:34:10 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 09:34:10 2024 +0000
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 <andrewammerlaan <AT> 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 75555561 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..000000000000
--- 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} = *9999 ]]; 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
- <sci-libs/opencascade-7.7.0:=[json,vtk]
- sci-libs/orocos_kdl:=
- sys-libs/zlib
- virtual/libusb:1
- cloud? (
- dev-libs/openssl:=
- net-misc/curl
- )
- fem? ( <sci-libs/vtk-9.3.0:=[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] )
- $(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
- "${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 )
-
-CHECKREQS_DISK_BUILD="2G"
-
-pkg_setup() {
- check-reqs_pkg_setup
- python-single-r1_pkg_setup
- [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
-}
-
-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
-}
-
-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
- -DBUILD_ASSEMBLY=OFF # deprecated
- -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 >=boost-1.77.0
- -DBUILD_FEM=$(usex fem)
- -DBUILD_FEM_NETGEN=$(usex netgen)
- -DBUILD_FLAT_MESH=ON
- -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
- -DBUILD_FREETYPE=ON # automagic dep
- -DBUILD_GUI=$(usex gui)
- -DBUILD_IDF=$(usex idf)
- -DBUILD_IMAGE=$(usex image)
- -DBUILD_IMPORT=ON # import module for various file formats
- -DBUILD_INSPECTION=$(usex inspection)
- -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
- -DBUILD_MATERIAL=$(usex material)
- -DBUILD_MESH=ON
- -DBUILD_MESH_PART=ON
- -DBUILD_OPENSCAD=$(usex openscad)
- -DBUILD_PART=ON
- -DBUILD_PART_DESIGN=$(usex part-design)
- -DBUILD_PATH=$(usex path)
- -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_SHOW=$(usex show)
- -DBUILD_SKETCHER=ON # needed by draft workspace
- -DBUILD_SMESH=ON
- -DBUILD_SPREADSHEET=ON
- -DBUILD_START=ON
- -DBUILD_SURFACE=$(usex surface)
- -DBUILD_TECHDRAW=$(usex techdraw)
- -DBUILD_TEST=ON # always build test workbench for run-time testing
- -DBUILD_TUX=$(usex tux)
- -DBUILD_VR=OFF
- -DBUILD_WEB=ON # needed by start workspace
- -DBUILD_WITH_CONDA=OFF
-
- -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
-
- -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
- -DFREECAD_USE_FREETYPE=ON
- -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
- -DFREECAD_USE_PCL=$(usex pcl)
- -DFREECAD_USE_PYBIND11=ON
- -DFREECAD_USE_QT_FILEDIALOG=ON
- -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
-
- # 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}
- )
-
- if use debug; then
- # BUILD_SANDBOX currently broken, see
- # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=ON
- )
- else
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=OFF
- )
- fi
-
- cmake_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=-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
-# configuration. Without those, there are sandbox violation, when it
-# tries to create /var/lib/portage/home/.FreeCAD directory.
-src_test() {
- pushd "${BUILD_DIR}" > /dev/null || die
- export FREECAD_USER_HOME="${HOME}"
- export FREECAD_USER_DATA="${T}"
- export FREECAD_USER_TEMP="${T}"
- nonfatal ./bin/FreeCADCmd --run-test 0
- popd > /dev/null || die
-}
-
-src_install() {
- cmake_src_install
-
- dobin src/Tools/freecad-thumbnailer
-
- 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
- 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"
-
- 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
-}
-
-pkg_postinst() {
- xdg_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, 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_header "Computational utilities"
- optfeature "BLAS library" sci-libs/openblas
- optfeature "Statistical computation with Python" dev-python/pandas
- 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 "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 "Triangulating meshes" sci-libs/gts
- optfeature "Visualization" sci-visualization/paraview
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/media-gfx/freecad/freecad-0.20.2-r2.ebuild b/media-gfx/freecad/freecad-0.20.2-r2.ebuild
deleted file mode 100644
index 986a290c62ea..000000000000
--- a/media-gfx/freecad/freecad-0.20.2-r2.ebuild
+++ /dev/null
@@ -1,329 +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} = *9999 ]]; 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
- <sci-libs/opencascade-7.7.0:=[json,vtk]
- sci-libs/orocos_kdl:=
- sys-libs/zlib
- virtual/libusb:1
- cloud? (
- dev-libs/openssl:=
- net-misc/curl
- )
- fem? ( <sci-libs/vtk-9.3.0:=[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] )
- $(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
- "${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 )
-
-CHECKREQS_DISK_BUILD="2G"
-
-pkg_setup() {
- check-reqs_pkg_setup
- python-single-r1_pkg_setup
- [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
-}
-
-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
-}
-
-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
- -DBUILD_ASSEMBLY=OFF # deprecated
- -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 >=boost-1.77.0
- -DBUILD_FEM=$(usex fem)
- -DBUILD_FEM_NETGEN=$(usex netgen)
- -DBUILD_FLAT_MESH=ON
- -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
- -DBUILD_FREETYPE=ON # automagic dep
- -DBUILD_GUI=$(usex gui)
- -DBUILD_IDF=$(usex idf)
- -DBUILD_IMAGE=$(usex image)
- -DBUILD_IMPORT=ON # import module for various file formats
- -DBUILD_INSPECTION=$(usex inspection)
- -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
- -DBUILD_MATERIAL=$(usex material)
- -DBUILD_MESH=ON
- -DBUILD_MESH_PART=ON
- -DBUILD_OPENSCAD=$(usex openscad)
- -DBUILD_PART=ON
- -DBUILD_PART_DESIGN=$(usex part-design)
- -DBUILD_PATH=$(usex path)
- -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_SHOW=$(usex show)
- -DBUILD_SKETCHER=ON # needed by draft workspace
- -DBUILD_SMESH=ON
- -DBUILD_SPREADSHEET=ON
- -DBUILD_START=ON
- -DBUILD_SURFACE=$(usex surface)
- -DBUILD_TECHDRAW=$(usex techdraw)
- -DBUILD_TEST=ON # always build test workbench for run-time testing
- -DBUILD_TUX=$(usex tux)
- -DBUILD_VR=OFF
- -DBUILD_WEB=ON # needed by start workspace
- -DBUILD_WITH_CONDA=OFF
-
- -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
-
- -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
- -DFREECAD_USE_FREETYPE=ON
- -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
- -DFREECAD_USE_PCL=$(usex pcl)
- -DFREECAD_USE_PYBIND11=ON
- -DFREECAD_USE_QT_FILEDIALOG=ON
- -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
-
- # 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}
- )
-
- if use debug; then
- # BUILD_SANDBOX currently broken, see
- # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=ON
- )
- else
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=OFF
- )
- fi
-
- cmake_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=-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
-# configuration. Without those, there are sandbox violation, when it
-# tries to create /var/lib/portage/home/.FreeCAD directory.
-src_test() {
- pushd "${BUILD_DIR}" > /dev/null || die
- export FREECAD_USER_HOME="${HOME}"
- export FREECAD_USER_DATA="${T}"
- export FREECAD_USER_TEMP="${T}"
- nonfatal ./bin/FreeCADCmd --run-test 0
- popd > /dev/null || die
-}
-
-src_install() {
- cmake_src_install
-
- dobin src/Tools/freecad-thumbnailer
-
- 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
- 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"
-
- 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
-}
-
-pkg_postinst() {
- xdg_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, 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_header "Computational utilities"
- optfeature "BLAS library" sci-libs/openblas
- optfeature "Statistical computation with Python" dev-python/pandas
- 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 "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 "Triangulating meshes" sci-libs/gts
- optfeature "Visualization" sci-visualization/paraview
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/media-gfx/freecad/freecad-0.20.2.ebuild b/media-gfx/freecad/freecad-0.20.2.ebuild
deleted file mode 100644
index 77d95697d916..000000000000
--- a/media-gfx/freecad/freecad-0.20.2.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2024 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} = *9999 ]]; 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
- <sci-libs/opencascade-7.7.0:=[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-9.3.0:=[qt5,rendering] )
- openscad? ( media-gfx/openscad )
- pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] )
- $(python_gen_cond_dep '
- 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
- 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 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 )
-"
-
-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
-)
-
-DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
-
-CHECKREQS_DISK_BUILD="2G"
-
-pkg_setup() {
- check-reqs_pkg_setup
- python-single-r1_pkg_setup
- [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
-}
-
-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
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_ADDONMGR=$(usex addonmgr)
- -DBUILD_ARCH=ON
- -DBUILD_ASSEMBLY=OFF # deprecated
- -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 >=boost-1.77.0
- -DBUILD_FEM=$(usex fem)
- -DBUILD_FEM_NETGEN=OFF
- -DBUILD_FLAT_MESH=ON
- -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
- -DBUILD_FREETYPE=ON # automagic dep
- -DBUILD_GUI=$(usex gui)
- -DBUILD_IDF=$(usex idf)
- -DBUILD_IMAGE=$(usex image)
- -DBUILD_IMPORT=ON # import module for various file formats
- -DBUILD_INSPECTION=$(usex inspection)
- -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
- -DBUILD_MATERIAL=$(usex material)
- -DBUILD_MESH=ON
- -DBUILD_MESH_PART=ON
- -DBUILD_OPENSCAD=$(usex openscad)
- -DBUILD_PART=ON
- -DBUILD_PART_DESIGN=$(usex part-design)
- -DBUILD_PATH=$(usex path)
- -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_SHOW=$(usex show)
- -DBUILD_SKETCHER=ON # needed by draft workspace
- -DBUILD_SMESH=ON
- -DBUILD_SPREADSHEET=ON
- -DBUILD_START=ON
- -DBUILD_SURFACE=$(usex surface)
- -DBUILD_TECHDRAW=$(usex techdraw)
- -DBUILD_TEST=ON # always build test workbench for run-time testing
- -DBUILD_TUX=$(usex tux)
- -DBUILD_VR=OFF
- -DBUILD_WEB=ON # needed by start workspace
- -DBUILD_WITH_CONDA=OFF
-
- -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
-
- -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
- -DFREECAD_USE_FREETYPE=ON
- -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
- -DFREECAD_USE_PCL=$(usex pcl)
- -DFREECAD_USE_PYBIND11=ON
- -DFREECAD_USE_QT_FILEDIALOG=ON
- -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
-
- # 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}
- )
-
- if use debug; then
- # BUILD_SANDBOX currently broken, see
- # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=ON
- )
- else
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=OFF
- )
- fi
-
- cmake_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=-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
-# configuration. Without those, there are sandbox violation, when it
-# tries to create /var/lib/portage/home/.FreeCAD directory.
-src_test() {
- pushd "${BUILD_DIR}" > /dev/null || die
- export FREECAD_USER_HOME="${HOME}"
- export FREECAD_USER_DATA="${T}"
- export FREECAD_USER_TEMP="${T}"
- nonfatal ./bin/FreeCADCmd --run-test 0
- popd > /dev/null || die
-}
-
-src_install() {
- cmake_src_install
-
- dobin src/Tools/freecad-thumbnailer
-
- 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
- dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
-
- 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
-}
-
-pkg_postinst() {
- xdg_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_header "Computational utilities"
- optfeature "BLAS library" sci-libs/openblas
- optfeature "Statistical computation with Python" dev-python/pandas
- 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 "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 "Triangulating meshes" sci-libs/gts
- optfeature "Visualization" sci-visualization/paraview
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2024-04-15 8:38 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2024-04-15 8:38 UTC (permalink / raw
To: gentoo-commits
commit: 2d57c7592bfd79795fbebaae588f8a86e2450d0b
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 08:38:08 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 08:38:32 2024 +0000
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 <juippis <AT> 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} = *9999 ]]; 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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2024-03-27 2:57 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2024-03-27 2:57 UTC (permalink / raw
To: gentoo-commits
commit: 6c824d8c17318aa42970dde16ab6ab616eca38db
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Mar 27 00:49:33 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 02:56:50 2024 +0000
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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 804b83dc404f..76f8dae4592e 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2024-03-24 13:54 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2024-03-24 13:54 UTC (permalink / raw
To: gentoo-commits
commit: 8d139bd5e62466ce9156fd2f015331c85ff90c06
Author: Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Sun Mar 24 07:49:34 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 13:52:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d139bd5
media-gfx/freecad: add depend <sci-libs/opencascade-7.8.0
Closes: https://bugs.gentoo.org/927660
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35896
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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]
+ <sci-libs/opencascade-7.8.0:=[json,vtk]
sci-libs/orocos_kdl:=
sys-libs/zlib
virtual/libusb:1
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2024-03-23 11:21 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2024-03-23 11:21 UTC (permalink / raw
To: gentoo-commits
commit: aec924cd3c64f2c349cea2ef26acc2fe1757c546
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 11:20:26 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 11:20:26 2024 +0000
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 <andrewammerlaan <AT> 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-9999.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? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] )
gui? (
dev-qt/designer:5
dev-qt/qtgui:5
diff --git a/media-gfx/freecad/freecad-0.20.2-r2.ebuild b/media-gfx/freecad/freecad-0.20.2-r2.ebuild
index f7c6b0fa93f8..4e0963bd788f 100644
--- a/media-gfx/freecad/freecad-0.20.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2-r2.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
@@ -66,7 +66,7 @@ RDEPEND="
dev-libs/openssl:=
net-misc/curl
)
- fem? ( sci-libs/vtk:=[qt5,rendering] )
+ fem? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] )
gui? (
dev-qt/designer:5
dev-qt/qtgui:5
diff --git a/media-gfx/freecad/freecad-0.20.2.ebuild b/media-gfx/freecad/freecad-0.20.2.ebuild
index c34c4c9425e3..77d95697d916 100644
--- a/media-gfx/freecad/freecad-0.20.2.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2.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
@@ -77,7 +77,7 @@ RDEPEND="
dev-libs/openssl:=
net-misc/curl
)
- fem? ( sci-libs/vtk:=[qt5,rendering] )
+ fem? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] )
openscad? ( media-gfx/openscad )
pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] )
$(python_gen_cond_dep '
diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
index 6f67542fe86c..f92180406ef2 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? ( sci-libs/vtk:=[qt5,rendering] )
- qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
+ !qt6? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] )
+ qt6? ( <sci-libs/vtk-9.3.0:=[-qt5,qt6,rendering] )
)
gui? (
>=media-libs/coin-4.0.0
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 05acf4426854..804b83dc404f 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -74,8 +74,8 @@ RDEPEND="
net-misc/curl
)
fem? (
- !qt6? ( sci-libs/vtk:=[qt5,rendering] )
- qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
+ !qt6? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] )
+ qt6? ( <sci-libs/vtk-9.3.0:=[-qt5,qt6,rendering] )
)
gui? (
>=media-libs/coin-4.0.0
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2024-03-09 10:17 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2024-03-09 10:17 UTC (permalink / raw
To: gentoo-commits
commit: c83045924d872c14c684ea0bae88a49bec3cdcac
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 10:04:03 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 10:16:10 2024 +0000
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 9999 ebuild
- Add yaml-cpp dep to 9999 ebuild
Closes: https://bugs.gentoo.org/920579
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{freecad-0.21.2-r1.ebuild => freecad-0.21.2-r2.ebuild} | 11 ++++++-----
media-gfx/freecad/freecad-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index e9f4f85bd609..05acf4426854 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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 +281,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 +292,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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2024-03-09 7:23 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2024-03-09 7:23 UTC (permalink / raw
To: gentoo-commits
commit: ab7ba7c063d9d8e22c5eb76f08da5daff5949640
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 07:23:12 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 07:23:18 2024 +0000
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 <andrewammerlaan <AT> gentoo.org>
media-gfx/freecad/freecad-0.21.2-r1.ebuild | 1 +
media-gfx/freecad/freecad-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index afcff7e93e63..e9f4f85bd609 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -59,6 +59,7 @@ RDEPEND="
)
qt6? (
dev-qt/qtbase:6[concurrent,network,xml]
+ dev-qt/qt5compat:6
)
media-libs/freetype
media-libs/qhull:=
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2024-01-05 13:12 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2024-01-05 13:12 UTC (permalink / raw
To: gentoo-commits
commit: 88fa919633c4a2289bf6ff08b9f53dfa334d2634
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 13:10:35 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 13:11:53 2024 +0000
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 <andrewammerlaan <AT> 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]
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2024-01-05 10:23 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2024-01-05 10:23 UTC (permalink / raw
To: gentoo-commits
commit: a0c575c52de9730980683c2f458bceda127be3eb
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 10:22:53 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 10:23:37 2024 +0000
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 <andrewammerlaan <AT> gentoo.org>
...{freecad-0.21.2.ebuild => freecad-0.21.2-r1.ebuild} | 18 +++++++++++++-----
media-gfx/freecad/freecad-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 37978aa661a6..afcff7e93e63 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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}]
@@ -271,14 +273,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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2023-11-25 9:11 Miroslav Šulc
0 siblings, 0 replies; 92+ messages in thread
From: Miroslav Šulc @ 2023-11-25 9:11 UTC (permalink / raw
To: gentoo-commits
commit: 8f8a611a99e48aceed2593fbf7ff10679364e371
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 09:11:38 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 09:11:50 2023 +0000
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 <fordfrog <AT> gentoo.org>
media-gfx/freecad/freecad-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 3865d158c785..37978aa661a6 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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"
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2023-11-20 19:43 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2023-11-20 19:43 UTC (permalink / raw
To: gentoo-commits
commit: 56e9e13f30ff75b96635b73dce92a0a3ab67e565
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 19:36:39 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 19:42:48 2023 +0000
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 <andrewammerlaan <AT> gentoo.org>
media-gfx/freecad/freecad-0.21.2.ebuild | 2 +-
media-gfx/freecad/freecad-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index d174541cdb9c..3865d158c785 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2023-05-08 8:19 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2023-05-08 8:19 UTC (permalink / raw
To: gentoo-commits
commit: e1032afd04a7fadaeca0c82549d207b5f043da08
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Apr 28 09:52:04 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 8 08:19:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1032afd
media-gfx/freecad: drop dependency for sci-libs/flann on v9999
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/freecad/freecad-9999.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 47fbacf3eba4..ce6c3efe2731 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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]
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2023-05-08 8:19 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2023-05-08 8:19 UTC (permalink / raw
To: gentoo-commits
commit: 4392befa43bba1a82bd89ecb8fd9d46f3580dd4c
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue May 2 06:28:06 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 8 08:19:02 2023 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30847
Signed-off-by: Joonas Niilola <juippis <AT> 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 000000000000..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} = *9999 ]]; 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
+ <sci-libs/opencascade-7.7.0:=[json,vtk]
+ sci-libs/orocos_kdl:=
+ sys-libs/zlib
+ virtual/libusb:1
+ cloud? (
+ dev-libs/openssl:=
+ net-misc/curl
+ )
+ 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] )
+ $(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
+ "${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 )
+
+CHECKREQS_DISK_BUILD="2G"
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ python-single-r1_pkg_setup
+ [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
+}
+
+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
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ADDONMGR=$(usex addonmgr)
+ -DBUILD_ARCH=ON
+ -DBUILD_ASSEMBLY=OFF # deprecated
+ -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 >=boost-1.77.0
+ -DBUILD_FEM=$(usex fem)
+ -DBUILD_FEM_NETGEN=$(usex netgen)
+ -DBUILD_FLAT_MESH=ON
+ -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
+ -DBUILD_FREETYPE=ON # automagic dep
+ -DBUILD_GUI=$(usex gui)
+ -DBUILD_IDF=$(usex idf)
+ -DBUILD_IMAGE=$(usex image)
+ -DBUILD_IMPORT=ON # import module for various file formats
+ -DBUILD_INSPECTION=$(usex inspection)
+ -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
+ -DBUILD_MATERIAL=$(usex material)
+ -DBUILD_MESH=ON
+ -DBUILD_MESH_PART=ON
+ -DBUILD_OPENSCAD=$(usex openscad)
+ -DBUILD_PART=ON
+ -DBUILD_PART_DESIGN=$(usex part-design)
+ -DBUILD_PATH=$(usex path)
+ -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_SHOW=$(usex show)
+ -DBUILD_SKETCHER=ON # needed by draft workspace
+ -DBUILD_SMESH=ON
+ -DBUILD_SPREADSHEET=ON
+ -DBUILD_START=ON
+ -DBUILD_SURFACE=$(usex surface)
+ -DBUILD_TECHDRAW=$(usex techdraw)
+ -DBUILD_TEST=ON # always build test workbench for run-time testing
+ -DBUILD_TUX=$(usex tux)
+ -DBUILD_VR=OFF
+ -DBUILD_WEB=ON # needed by start workspace
+ -DBUILD_WITH_CONDA=OFF
+
+ -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
+
+ -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
+ -DFREECAD_USE_FREETYPE=ON
+ -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+ -DFREECAD_USE_PCL=$(usex pcl)
+ -DFREECAD_USE_PYBIND11=ON
+ -DFREECAD_USE_QT_FILEDIALOG=ON
+ -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+ # 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}
+ )
+
+ if use debug; then
+ # BUILD_SANDBOX currently broken, see
+ # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=ON
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=OFF
+ )
+ fi
+
+ cmake_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=-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
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ export FREECAD_USER_HOME="${HOME}"
+ export FREECAD_USER_DATA="${T}"
+ export FREECAD_USER_TEMP="${T}"
+ nonfatal ./bin/FreeCADCmd --run-test 0
+ popd > /dev/null || die
+}
+
+src_install() {
+ cmake_src_install
+
+ dobin src/Tools/freecad-thumbnailer
+
+ 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
+ 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"
+
+ 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
+}
+
+pkg_postinst() {
+ xdg_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, 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_header "Computational utilities"
+ optfeature "BLAS library" sci-libs/openblas
+ optfeature "Statistical computation with Python" dev-python/pandas
+ 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 "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 "Triangulating meshes" sci-libs/gts
+ optfeature "Visualization" sci-visualization/paraview
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2023-05-07 8:44 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2023-05-07 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 17a66837b53ad90c947f254cd158e44a2e48577d
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun May 7 08:44:25 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun May 7 08:44:38 2023 +0000
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 <juippis <AT> 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} = *9999 ]]; 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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2023-02-23 17:30 Miroslav Šulc
0 siblings, 0 replies; 92+ messages in thread
From: Miroslav Šulc @ 2023-02-23 17:30 UTC (permalink / raw
To: gentoo-commits
commit: d57cf04d640532e3dcef251f68f31f2c2d832d07
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 17:29:42 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 17:30:31 2023 +0000
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 <fordfrog <AT> gentoo.org>
media-gfx/freecad/freecad-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index a006497fe1bd..b9d1e7ae4206 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2023-02-23 11:25 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2023-02-23 11:25 UTC (permalink / raw
To: gentoo-commits
commit: 05b09279f2d9a2d3012d051b79126ece16f50ea0
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Feb 21 11:58:27 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 11:25:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b09279
media-gfx/freecad: drop 0.20.1
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29700
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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 75555561 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..000000000000
--- 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} = *9999 ]]; 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-7.7.0:=[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,${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 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 )
-"
-
-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
-)
-
-DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
-
-CHECKREQS_DISK_BUILD="2G"
-
-pkg_setup() {
- check-reqs_pkg_setup
- python-single-r1_pkg_setup
- [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
-}
-
-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
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_ADDONMGR=$(usex addonmgr)
- -DBUILD_ARCH=ON
- -DBUILD_ASSEMBLY=OFF # deprecated
- -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 >=boost-1.77.0
- -DBUILD_FEM=$(usex fem)
- -DBUILD_FEM_NETGEN=OFF
- -DBUILD_FLAT_MESH=ON
- -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
- -DBUILD_FREETYPE=ON # automagic dep
- -DBUILD_GUI=$(usex !headless)
- -DBUILD_IDF=$(usex idf)
- -DBUILD_IMAGE=$(usex image)
- -DBUILD_IMPORT=ON # import module for various file formats
- -DBUILD_INSPECTION=$(usex inspection)
- -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
- -DBUILD_MATERIAL=$(usex material)
- -DBUILD_MESH=ON
- -DBUILD_MESH_PART=ON
- -DBUILD_OPENSCAD=$(usex openscad)
- -DBUILD_PART=ON
- -DBUILD_PART_DESIGN=$(usex part-design)
- -DBUILD_PATH=$(usex path)
- -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_SHOW=$(usex show)
- -DBUILD_SKETCHER=ON # needed by draft workspace
- -DBUILD_SMESH=ON
- -DBUILD_SPREADSHEET=ON
- -DBUILD_START=ON
- -DBUILD_SURFACE=$(usex surface)
- -DBUILD_TECHDRAW=$(usex techdraw)
- -DBUILD_TEST=ON # always build test workbench for run-time testing
- -DBUILD_TUX=$(usex tux)
- -DBUILD_VR=OFF
- -DBUILD_WEB=ON # needed by start workspace
- -DBUILD_WITH_CONDA=OFF
-
- -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
-
- -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
- -DFREECAD_USE_FREETYPE=ON
- -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
- -DFREECAD_USE_PCL=$(usex pcl)
- -DFREECAD_USE_PYBIND11=ON
- -DFREECAD_USE_QT_FILEDIALOG=ON
- -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
-
- # 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}
- )
-
- if use debug; then
- # BUILD_SANDBOX currently broken, see
- # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=ON
- )
- else
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=OFF
- )
- fi
-
- cmake_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
-# 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
-# configuration. Without those, there are sandbox violation, when it
-# tries to create /var/lib/portage/home/.FreeCAD directory.
-src_test() {
- pushd "${BUILD_DIR}" > /dev/null || die
- export FREECAD_USER_HOME="${HOME}"
- export FREECAD_USER_DATA="${T}"
- export FREECAD_USER_TEMP="${T}"
- nonfatal ./bin/FreeCADCmd --run-test 0
- popd > /dev/null || die
-}
-
-src_install() {
- cmake_src_install
-
- dobin src/Tools/freecad-thumbnailer
-
- 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
-
- 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
-}
-
-pkg_postinst() {
- xdg_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_header "Computational utilities"
- optfeature "BLAS library" sci-libs/openblas
- optfeature "Statistical computation with Python" dev-python/pandas
- 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 "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 "Triangulating meshes" sci-libs/gts
- optfeature "Visualization" sci-visualization/paraview
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index bc3069a7931c..17e33f46262b 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -33,10 +33,6 @@
The Python modules are available, without their GUI parts though,
if this is unset.
</flag>
- <flag name="headless">
- Build FreeCAD without a GUI, usable for server-side instances.
- The Python modules are still available, without their GUI parts though.
- </flag>
<flag name="idf">
Build the IDF module to provide file exchange capabilities with
IDF files
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2023-02-21 6:18 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2023-02-21 6:18 UTC (permalink / raw
To: gentoo-commits
commit: 137a709332b3732e738d7f7fed7a86f945fc06e6
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 06:15:53 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 06:18:09 2023 +0000
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 <juippis <AT> 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} = *9999 ]]; 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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2023-01-09 19:23 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2023-01-09 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 0c76aa67c52f41d8f9c420092477d218d68ba409
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Dec 14 06:50:38 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 19:23:41 2023 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28769
Signed-off-by: Joonas Niilola <juippis <AT> 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 75555561 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 000000000000..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} = *9999 ]]; 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
+ <sci-libs/opencascade-7.7.0:=[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:=[qt5,rendering] )
+ openscad? ( media-gfx/openscad )
+ pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] )
+ $(python_gen_cond_dep '
+ 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
+ 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 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 )
+"
+
+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
+)
+
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
+
+CHECKREQS_DISK_BUILD="2G"
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ python-single-r1_pkg_setup
+ [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
+}
+
+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
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ADDONMGR=$(usex addonmgr)
+ -DBUILD_ARCH=ON
+ -DBUILD_ASSEMBLY=OFF # deprecated
+ -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 >=boost-1.77.0
+ -DBUILD_FEM=$(usex fem)
+ -DBUILD_FEM_NETGEN=OFF
+ -DBUILD_FLAT_MESH=ON
+ -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
+ -DBUILD_FREETYPE=ON # automagic dep
+ -DBUILD_GUI=$(usex gui)
+ -DBUILD_IDF=$(usex idf)
+ -DBUILD_IMAGE=$(usex image)
+ -DBUILD_IMPORT=ON # import module for various file formats
+ -DBUILD_INSPECTION=$(usex inspection)
+ -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
+ -DBUILD_MATERIAL=$(usex material)
+ -DBUILD_MESH=ON
+ -DBUILD_MESH_PART=ON
+ -DBUILD_OPENSCAD=$(usex openscad)
+ -DBUILD_PART=ON
+ -DBUILD_PART_DESIGN=$(usex part-design)
+ -DBUILD_PATH=$(usex path)
+ -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_SHOW=$(usex show)
+ -DBUILD_SKETCHER=ON # needed by draft workspace
+ -DBUILD_SMESH=ON
+ -DBUILD_SPREADSHEET=ON
+ -DBUILD_START=ON
+ -DBUILD_SURFACE=$(usex surface)
+ -DBUILD_TECHDRAW=$(usex techdraw)
+ -DBUILD_TEST=ON # always build test workbench for run-time testing
+ -DBUILD_TUX=$(usex tux)
+ -DBUILD_VR=OFF
+ -DBUILD_WEB=ON # needed by start workspace
+ -DBUILD_WITH_CONDA=OFF
+
+ -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
+
+ -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
+ -DFREECAD_USE_FREETYPE=ON
+ -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+ -DFREECAD_USE_PCL=$(usex pcl)
+ -DFREECAD_USE_PYBIND11=ON
+ -DFREECAD_USE_QT_FILEDIALOG=ON
+ -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+ # 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}
+ )
+
+ if use debug; then
+ # BUILD_SANDBOX currently broken, see
+ # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=ON
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=OFF
+ )
+ fi
+
+ cmake_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=-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
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ export FREECAD_USER_HOME="${HOME}"
+ export FREECAD_USER_DATA="${T}"
+ export FREECAD_USER_TEMP="${T}"
+ nonfatal ./bin/FreeCADCmd --run-test 0
+ popd > /dev/null || die
+}
+
+src_install() {
+ cmake_src_install
+
+ dobin src/Tools/freecad-thumbnailer
+
+ 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
+ dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+ 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
+}
+
+pkg_postinst() {
+ xdg_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_header "Computational utilities"
+ optfeature "BLAS library" sci-libs/openblas
+ optfeature "Statistical computation with Python" dev-python/pandas
+ 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 "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 "Triangulating meshes" sci-libs/gts
+ optfeature "Visualization" sci-visualization/paraview
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-11-27 13:23 Piotr Karbowski
0 siblings, 0 replies; 92+ messages in thread
From: Piotr Karbowski @ 2022-11-27 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 734858c39ae95ae5fcdaa3178583d43b8ea52de4
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Nov 27 11:38:54 2022 +0000
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 13:23:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=734858c3
media-gfx/freecad: restrict to <sci-libs/opencascade-7.7.0
Several issues when trying to build against OCC 7.7.0.
They have been updated upstream already and there's an v0.20.2 version
planed for release, so just restrict the dependency for now. If you rely
on FreeCAD build against OCC 7.7.0, you can use the live ebuild.
Closes: https://bugs.gentoo.org/883073
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28447
Signed-off-by: Piotr Karbowski <slashbeast <AT> 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]
+ <sci-libs/opencascade-7.7.0:=[json,vtk]
sci-libs/orocos_kdl:=
sys-libs/zlib
virtual/glu
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-11-22 15:03 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2022-11-22 15:03 UTC (permalink / raw
To: gentoo-commits
commit: f85e159cd80a8d61e89a64cd4ec9e9abcbf88fcc
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Nov 1 09:08:08 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 15:03:18 2022 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28069
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/freecad/freecad-9999.ebuild | 10 ++++++----
media-gfx/freecad/metadata.xml | 7 +++++++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 95e48c37bdac..7a29fc5538d5 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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
</flag>
+ <flag name="gui">
+ 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.
+ </flag>
<flag name="headless">
Build FreeCAD without a GUI, usable for server-side instances.
The Python modules are still available, without their GUI parts though.
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-09-28 9:55 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2022-09-28 9:55 UTC (permalink / raw
To: gentoo-commits
commit: e4657caf5e32cca2b1e5de377e7523d38617b1ae
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 09:54:29 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 09:54:59 2022 +0000
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 <juippis <AT> 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} = *9999 ]]; 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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-09-02 16:50 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2022-09-02 16:50 UTC (permalink / raw
To: gentoo-commits
commit: 8c430fb9ee8ee3657576db75b54c276300763b13
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Sep 2 14:41:00 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 16:49:54 2022 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27114
Signed-off-by: Joonas Niilola <juippis <AT> 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-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index b9adba360983..eb4e9741c4cb 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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 @@
</flag>
</use>
<upstream>
- <bugs-to>https://www.freecadweb.org/tracker/</bugs-to>
+ <bugs-to>https://github.com/FreeCAD/FreeCAD/issues</bugs-to>
<remote-id type="github">FreeCAD/FreeCAD</remote-id>
- <doc lang="en">https://www.freecadweb.org/wiki/MainPage</doc>
+ <doc lang="en">https://wiki.freecad.org/Main_Page</doc>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-08-31 4:57 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2022-08-31 4:57 UTC (permalink / raw
To: gentoo-commits
commit: bd52133a3c1179c09c17861aabc26149be90c275
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Aug 10 07:31:56 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 04:57:27 2022 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26924
Signed-off-by: Joonas Niilola <juippis <AT> 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 000000000000..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} = *9999 ]]; 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}]
+ 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 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 )
+"
+
+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
+)
+
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
+
+CHECKREQS_DISK_BUILD="2G"
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ python-single-r1_pkg_setup
+ [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
+}
+
+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
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ADDONMGR=$(usex addonmgr)
+ -DBUILD_ARCH=ON
+ -DBUILD_ASSEMBLY=OFF # deprecated
+ -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 >=boost-1.77.0
+ -DBUILD_FEM=$(usex fem)
+ -DBUILD_FEM_NETGEN=OFF
+ -DBUILD_FLAT_MESH=ON
+ -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
+ -DBUILD_FREETYPE=ON # automagic dep
+ -DBUILD_GUI=$(usex !headless)
+ -DBUILD_IDF=$(usex idf)
+ -DBUILD_IMAGE=$(usex image)
+ -DBUILD_IMPORT=ON # import module for various file formats
+ -DBUILD_INSPECTION=$(usex inspection)
+ -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
+ -DBUILD_MATERIAL=$(usex material)
+ -DBUILD_MESH=ON
+ -DBUILD_MESH_PART=ON
+ -DBUILD_OPENSCAD=$(usex openscad)
+ -DBUILD_PART=ON
+ -DBUILD_PART_DESIGN=$(usex part-design)
+ -DBUILD_PATH=$(usex path)
+ -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_SHOW=$(usex show)
+ -DBUILD_SKETCHER=ON # needed by draft workspace
+ -DBUILD_SMESH=ON
+ -DBUILD_SPREADSHEET=ON
+ -DBUILD_START=ON
+ -DBUILD_SURFACE=$(usex surface)
+ -DBUILD_TECHDRAW=$(usex techdraw)
+ -DBUILD_TEST=ON # always build test workbench for run-time testing
+ -DBUILD_TUX=$(usex tux)
+ -DBUILD_VR=OFF
+ -DBUILD_WEB=ON # needed by start workspace
+ -DBUILD_WITH_CONDA=OFF
+
+ -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
+
+ -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
+ -DFREECAD_USE_FREETYPE=ON
+ -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+ -DFREECAD_USE_PCL=$(usex pcl)
+ -DFREECAD_USE_PYBIND11=ON
+ -DFREECAD_USE_QT_FILEDIALOG=ON
+ -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+ # 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}
+ )
+
+ if use debug; then
+ # BUILD_SANDBOX currently broken, see
+ # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=ON
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=OFF
+ )
+ fi
+
+ cmake_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
+# 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
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ export FREECAD_USER_HOME="${HOME}"
+ export FREECAD_USER_DATA="${T}"
+ export FREECAD_USER_TEMP="${T}"
+ nonfatal ./bin/FreeCADCmd --run-test 0
+ popd > /dev/null || die
+}
+
+src_install() {
+ cmake_src_install
+
+ dobin src/Tools/freecad-thumbnailer
+
+ 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
+
+ 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
+}
+
+pkg_postinst() {
+ xdg_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_header "Computational utilities"
+ optfeature "BLAS library" sci-libs/openblas
+ optfeature "Statistical computation with Python" dev-python/pandas
+ 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 "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 "Triangulating meshes" sci-libs/gts
+ optfeature "Visualization" sci-visualization/paraview
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-07-29 3:16 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2022-07-29 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 031bcc6d2bb135f6560b363c7189032e277d2df1
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Jul 25 17:56:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:17 2022 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26597
Signed-off-by: Sam James <sam <AT> gentoo.org>
...{freecad-0.20.ebuild => freecad-0.20-r1.ebuild} | 19 +-------
media-gfx/freecad/freecad-9999.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} = *9999 ]]; 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&t=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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index d10e47f1f6e1..b9adba360983 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -17,10 +17,7 @@ if [[ ${PV} = *9999 ]]; 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 designer 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"
@@ -69,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:=[vtk(+)]
+ sci-libs/opencascade:=[json,vtk(+)]
sci-libs/orocos_kdl:=
sys-libs/zlib
virtual/glu
@@ -120,7 +117,6 @@ REQUIRED_USE="
${PYTHON_REQUIRED_USE}
inspection? ( points )
path? ( robot )
- ship? ( image plot )
"
PATCHES=(
@@ -139,10 +135,6 @@ pkg_setup() {
}
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 desktop file
sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
@@ -178,13 +170,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
@@ -277,18 +267,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."
@@ -299,23 +277,23 @@ pkg_postinst() {
einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
optfeature_header "Computational utilities"
optfeature "BLAS library" sci-libs/openblas
- optfeature "statistical computation with Python" dev-python/pandas
- optfeature "scientific computation with Python" dev-python/scipy
- optfeature "symbolic math with Python" dev-python/sympy
+ optfeature "Statistical computation with Python" dev-python/pandas
+ 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 "dependency graphs" media-gfx/graphviz
+ optfeature "Dependency graphs" media-gfx/graphviz
optfeature "PBR Rendering" media-gfx/povray
optfeature_header "Import / Export"
- optfeature "interacting with git repositories" dev-python/GitPython
- optfeature "working with COLLADA documents" dev-python/pycollada
+ 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 "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
+ optfeature "Triangulating meshes" sci-libs/gts
+ optfeature "Visualization" sci-visualization/paraview
}
pkg_postrm() {
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-07-09 12:26 Matthew Smith
0 siblings, 0 replies; 92+ messages in thread
From: Matthew Smith @ 2022-07-09 12:26 UTC (permalink / raw
To: gentoo-commits
commit: 319168a5748b9c655645bbea81f7366e4249f761
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Jun 15 09:11:38 2022 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 12:26:30 2022 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26283
Signed-off-by: Matthew Smith <matthew <AT> 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 000000000000..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} = *9999 ]]; 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&t=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}]
+ 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 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.4-Gentoo-specific-don-t-check-vcs.patch
+ "${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+)
+
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
+
+CHECKREQS_DISK_BUILD="2G"
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ python-single-r1_pkg_setup
+ [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
+}
+
+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 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
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ADDONMGR=$(usex addonmgr)
+ -DBUILD_ARCH=ON
+ -DBUILD_ASSEMBLY=OFF # deprecated
+ -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 >=boost-1.77.0
+ -DBUILD_FEM=$(usex fem)
+ -DBUILD_FEM_NETGEN=OFF
+ -DBUILD_FLAT_MESH=ON
+ -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
+ -DBUILD_FREETYPE=ON # automagic dep
+ -DBUILD_GUI=$(usex !headless)
+ -DBUILD_IDF=$(usex idf)
+ -DBUILD_IMAGE=$(usex image)
+ -DBUILD_IMPORT=ON # import module for various file formats
+ -DBUILD_INSPECTION=$(usex inspection)
+ -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
+ -DBUILD_MATERIAL=$(usex material)
+ -DBUILD_MESH=ON
+ -DBUILD_MESH_PART=ON
+ -DBUILD_OPENSCAD=$(usex openscad)
+ -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
+ -DBUILD_SPREADSHEET=ON
+ -DBUILD_START=ON
+ -DBUILD_SURFACE=$(usex surface)
+ -DBUILD_TECHDRAW=$(usex techdraw)
+ -DBUILD_TEST=ON # always build test workbench for run-time testing
+ -DBUILD_TUX=$(usex tux)
+ -DBUILD_VR=OFF
+ -DBUILD_WEB=ON # needed by start workspace
+ -DBUILD_WITH_CONDA=OFF
+
+ -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
+
+ -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
+ -DFREECAD_USE_FREETYPE=ON
+ -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+ -DFREECAD_USE_PCL=$(usex pcl)
+ -DFREECAD_USE_PYBIND11=ON
+ -DFREECAD_USE_QT_FILEDIALOG=ON
+ -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+ # 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}
+ )
+
+ if use debug; then
+ # BUILD_SANDBOX currently broken, see
+ # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=ON
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=OFF
+ )
+ fi
+
+ cmake_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
+# 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
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ export FREECAD_USER_HOME="${HOME}"
+ export FREECAD_USER_DATA="${T}"
+ export FREECAD_USER_TEMP="${T}"
+ nonfatal ./bin/FreeCADCmd --run-test 0
+ popd > /dev/null || die
+}
+
+src_install() {
+ cmake_src_install
+
+ dobin src/Tools/freecad-thumbnailer
+
+ 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
+
+ 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
+}
+
+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."
+
+ # 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_header "Computational utilities"
+ optfeature "BLAS library" sci-libs/openblas
+ optfeature "Statistical computation with Python" dev-python/pandas
+ 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 "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 "Triangulating meshes" sci-libs/gts
+ optfeature "Visualization" sci-visualization/paraview
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-05-19 12:12 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2022-05-19 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 492ab26847ca2b338b3c166a6db82295d9de02d0
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 12:10:53 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu May 19 12:10:53 2022 +0000
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 <juippis <AT> 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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-04-18 11:35 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2022-04-18 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 0dae94fc4b20de9644ee5e2ff1418aa58bb29384
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Apr 9 10:32:02 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 11:35:10 2022 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24962
Signed-off-by: Joonas Niilola <juippis <AT> 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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-04-14 8:54 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2022-04-14 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 423e0819a86884988c9355e93ed9bd1d5813e267
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Apr 5 09:52:51 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 08:54:34 2022 +0000
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&t=67706 and
https://github.com/FreeCAD/FreeCAD/pull/6711
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24918
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/freecad/freecad-9999.ebuild | 8 +++++---
media-gfx/freecad/metadata.xml | 4 ++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index f977510288c5..d10e47f1f6e1 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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).
</flag>
+ <flag name="designer">
+ Build and install the Qt designer plugin, so the FreeCAD widgets
+ can be used from within designer.
+ </flag>
<flag name="drawing">
Build the Drawing workbench, a predecessor to the TechDraw workbench.
Users are encouraged to learn how to use the TechDraw workbench and
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-04-06 17:30 Piotr Karbowski
0 siblings, 0 replies; 92+ messages in thread
From: Piotr Karbowski @ 2022-04-06 17:30 UTC (permalink / raw
To: gentoo-commits
commit: 75319af4b4faa0e8c7d4fde6712fc7ea56693dfd
Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 6 17:29:37 2022 +0000
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Wed Apr 6 17:30:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75319af4
media-gfx/freecad: 0.19.4, 9999: Python 3.10 support added.
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
media-gfx/freecad/freecad-0.19.4.ebuild | 2 +-
media-gfx/freecad/freecad-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 1891cda52e3d..f977510288c5 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-04-02 12:58 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2022-04-02 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 477feaf640df94fe5627a00f668351617eded41d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 2 12:51:54 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 12:57:34 2022 +0000
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 <asturm <AT> gentoo.org>
media-gfx/freecad/freecad-0.19.4.ebuild | 2 +-
media-gfx/freecad/freecad-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 377cf7cb37ba..1891cda52e3d 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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() {
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-02-03 15:52 John Helmert III
0 siblings, 0 replies; 92+ messages in thread
From: John Helmert III @ 2022-02-03 15:52 UTC (permalink / raw
To: gentoo-commits
commit: 688c609c7edf5ac40dbdc89ef419187544e4319f
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Thu Feb 3 05:15:21 2022 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Thu Feb 3 15:51:13 2022 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24061
Signed-off-by: John Helmert III <ajak <AT> 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..000000000000
--- 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} = *9999 ]]; 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/opencascade-7.6.0:=[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}
- >=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
- "${FILESDIR}"/${P}-0002-fix-femtest-failure-with-yaml-load.patch
- "${FILESDIR}"/${P}-0003-fix-test-when-built-without-GUI.patch
- "${WORKDIR}"/${P}-0005-Make-smesh-compile-with-vtk9.patch
- "${FILESDIR}"/${P}-0006-add-boost-serialization-to-find_package.patch
- "${FILESDIR}"/${P}-0007-fix-build-failure-with-opencascade-7.5.2.patch
-)
-
-DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
-
-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"
-}
-
-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 desktop file
- sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_ADDONMGR=$(usex addonmgr)
- -DBUILD_ARCH=ON
- -DBUILD_ASSEMBLY=OFF # deprecated
- -DBUILD_CLOUD=$(usex cloud)
- -DBUILD_COMPLETE=OFF # deprecated
- -DBUILD_DRAFT=ON
- -DBUILD_DRAWING=ON
- -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for >=boost-1.77.0
- -DBUILD_FEM=$(usex fem)
- -DBUILD_FEM_NETGEN=OFF
- -DBUILD_FLAT_MESH=ON
- -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
- -DBUILD_FREETYPE=ON # automagic dep
- -DBUILD_GUI=$(usex !headless)
- -DBUILD_IDF=$(usex idf)
- -DBUILD_IMAGE=$(usex image)
- -DBUILD_IMPORT=ON # import module for various file formats
- -DBUILD_INSPECTION=$(usex inspection)
- -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
- -DBUILD_MATERIAL=$(usex material)
- -DBUILD_MESH=ON
- -DBUILD_MESH_PART=ON
- -DBUILD_OPENSCAD=$(usex openscad)
- -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
- -DBUILD_SPREADSHEET=ON
- -DBUILD_START=ON
- -DBUILD_SURFACE=$(usex surface)
- -DBUILD_TECHDRAW=$(usex techdraw)
- -DBUILD_TEST=ON # always build test workbench for run-time testing
- -DBUILD_TUX=$(usex tux)
- -DBUILD_VR=OFF
- -DBUILD_WEB=ON # needed by start workspace
- -DBUILD_WITH_CONDA=OFF
-
- -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
-
- -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
- -DFREECAD_USE_FREETYPE=ON
- -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
- -DFREECAD_USE_PCL=$(usex pcl)
- -DFREECAD_USE_PYBIND11=ON
- -DFREECAD_USE_QT_FILEDIALOG=ON
- -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
-
- # 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}
- )
-
- if use debug; then
- mycmakeargs+=(
- -DBUILD_SANDBOX=ON
- -DBUILD_TEMPLATE=ON
- )
- else
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=OFF
- )
- fi
-
- cmake_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
-# 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
-# configuration. Without those, there are sandbox violation, when it
-# tries to create /var/lib/portage/home/.FreeCAD directory.
-src_test() {
- pushd "${BUILD_DIR}" > /dev/null || die
- export FREECAD_USER_HOME="${HOME}"
- export FREECAD_USER_DATA="${T}"
- export FREECAD_USER_TEMP="${T}"
- nonfatal ./bin/FreeCADCmd --run-test 0
- popd > /dev/null || die
-}
-
-src_install() {
- cmake_src_install
-
- dobin src/Tools/freecad-thumbnailer
-
- if ! use headless; then
- dosym -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 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
-
- 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() {
- 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."
-
- # 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_header "Computational utilities"
- optfeature "BLAS library" sci-libs/openblas
- optfeature "Statistical computation with Python" dev-python/pandas
- 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 "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 "Triangulating meshes" sci-libs/gts
- optfeature "Visualization" sci-visualization/paraview
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-01-28 8:24 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2022-01-28 8:24 UTC (permalink / raw
To: gentoo-commits
commit: c0d511652d855d453231c9e301c1516586889131
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Jan 16 11:13:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 08:24:01 2022 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23825
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/freecad/Manifest | 1 -
media-gfx/freecad/freecad-9999.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-9999-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4144 BLAKE2B bfd9a0fcd9a6a5fb4c9ef2d5e88e69b869f908142cedf5dd1449b917d90e36187ce6227af99613efedd05eb3218d17e9e6df4430ea0413988340c91c111bbe4e SHA512 5d452eca6bc88fb50ae47a6b6127e39f3d17a60498627920b13273e6afaceaca64e47ade4d1fce18b3bfbcdf4eb13565244ecc575707f1aedf3bb1d6dfc7e89e
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 2852f295c8e1..97ada209ae61 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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} = *9999 ]]; 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
+ 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
+
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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-01-10 1:04 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2022-01-10 1:04 UTC (permalink / raw
To: gentoo-commits
commit: 30b2c7a4590ba71245e305c5584ad8b686f5aca6
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Dec 18 22:35:25 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 01:02:31 2022 +0000
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 <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> 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(+)]
+ <sci-libs/opencascade-7.6.0:=[vtk(+)]
sci-libs/orocos_kdl:=
sys-libs/zlib
virtual/glu
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2022-01-10 1:04 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2022-01-10 1:04 UTC (permalink / raw
To: gentoo-commits
commit: 6954d318554a2bc37ab6855b49f72af824a588d6
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Dec 19 08:18:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 01:02:32 2022 +0000
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 <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> 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-9999-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4136 BLAKE2B 207003dacd7f02bd4782ebb0d5f9a7093d8fd3ef8011301454dab03d7a79bab7b2fd623c7d8e11d1f6557803b40f1d206dc75c41b1520e1dd2467dda72d91868 SHA512 d7d6096c1cfb06e6218673a927c5791ec820dc13a23c89df6233109e288d98f86920141e01a8cb680e7cbb8c83c4c655a7a66d5578d284a144dc3f44c028ceb5
+DIST freecad-9999-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4144 BLAKE2B bfd9a0fcd9a6a5fb4c9ef2d5e88e69b869f908142cedf5dd1449b917d90e36187ce6227af99613efedd05eb3218d17e9e6df4430ea0413988340c91c111bbe4e SHA512 5d452eca6bc88fb50ae47a6b6127e39f3d17a60498627920b13273e6afaceaca64e47ade4d1fce18b3bfbcdf4eb13565244ecc575707f1aedf3bb1d6dfc7e89e
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-12-04 21:52 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-12-04 21:52 UTC (permalink / raw
To: gentoo-commits
commit: acca9d04991575dad5d9930110e6ed3ec199d859
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Dec 4 11:06:35 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 4 21:52:45 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23179
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/freecad/freecad-9999.ebuild | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index a4a2fa3acc6c..2852f295c8e1 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-11-30 12:50 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2021-11-30 12:50 UTC (permalink / raw
To: gentoo-commits
commit: 3c966730bf52e6d2169cb8d0a35133e92a13076b
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Nov 20 10:13:34 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 12:50:18 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23008
Signed-off-by: Joonas Niilola <juippis <AT> 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
- # <occ-7.5 uses different layout
- mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
- )
- fi
+ # 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
mycmakeargs+=(
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-11-30 12:50 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2021-11-30 12:50 UTC (permalink / raw
To: gentoo-commits
commit: e6c53e3e86537e972bea3fcc51d83edee653e3f2
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Nov 20 01:14:41 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 12:50:18 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/freecad/Manifest | 1 +
media-gfx/freecad/freecad-9999.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-9999-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4136 BLAKE2B 207003dacd7f02bd4782ebb0d5f9a7093d8fd3ef8011301454dab03d7a79bab7b2fd623c7d8e11d1f6557803b40f1d206dc75c41b1520e1dd2467dda72d91868 SHA512 d7d6096c1cfb06e6218673a927c5791ec820dc13a23c89df6233109e288d98f86920141e01a8cb680e7cbb8c83c4c655a7a66d5578d284a144dc3f44c028ceb5
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index df78793c7f3b..a4a2fa3acc6c 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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} = *9999 ]]; 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 '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
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() {
@@ -207,10 +210,10 @@ src_configure() {
-DBUILD_WEB=ON # needed by start workspace
-DBUILD_WITH_CONDA=OFF
- -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}
+ -DCMAKE_INSTALL_DATADIR=share/${PN}/data
+ -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+ -DCMAKE_INSTALL_INCLUDEDIR=include/${PN}
+ -DCMAKE_INSTALL_LIBDIR=$(get_libdir)/${PN}
-DFREECAD_BUILD_DEBIAN=OFF
@@ -235,22 +238,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
- # <occ-7.5 uses different layout
- mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
- )
- fi
+ # 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
# BUILD_SANDBOX currently broken, see
@@ -291,12 +286,6 @@ src_install() {
dobin src/Tools/freecad-thumbnailer
- if ! use headless; then
- dosym -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 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
-
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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-11-02 10:04 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-11-02 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 5851bd091fca1165c97a27e96232807548b5df84
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Oct 18 04:53:51 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 2 10:04:38 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> 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 00000000000..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} = *9999 ]]; 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? ( 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
+ "${WORKDIR}"/${P}-0005-Make-smesh-compile-with-vtk9.patch
+ "${FILESDIR}"/${P}-0006-add-boost-serialization-to-find_package.patch
+ "${FILESDIR}"/${P}-0007-fix-build-failure-with-opencascade-7.5.2.patch
+)
+
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
+
+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"
+}
+
+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 '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
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ADDONMGR=$(usex addonmgr)
+ -DBUILD_ARCH=ON
+ -DBUILD_ASSEMBLY=OFF # deprecated
+ -DBUILD_CLOUD=$(usex cloud)
+ -DBUILD_COMPLETE=OFF # deprecated
+ -DBUILD_DRAFT=ON
+ -DBUILD_DRAWING=ON
+ -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for >=boost-1.77.0
+ -DBUILD_FEM=$(usex fem)
+ -DBUILD_FEM_NETGEN=OFF
+ -DBUILD_FLAT_MESH=ON
+ -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
+ -DBUILD_FREETYPE=ON # automagic dep
+ -DBUILD_GUI=$(usex !headless)
+ -DBUILD_IDF=$(usex idf)
+ -DBUILD_IMAGE=$(usex image)
+ -DBUILD_IMPORT=ON # import module for various file formats
+ -DBUILD_INSPECTION=$(usex inspection)
+ -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
+ -DBUILD_MATERIAL=$(usex material)
+ -DBUILD_MESH=ON
+ -DBUILD_MESH_PART=ON
+ -DBUILD_OPENSCAD=$(usex openscad)
+ -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
+ -DBUILD_SPREADSHEET=ON
+ -DBUILD_START=ON
+ -DBUILD_SURFACE=$(usex surface)
+ -DBUILD_TECHDRAW=$(usex techdraw)
+ -DBUILD_TEST=ON # always build test workbench for run-time testing
+ -DBUILD_TUX=$(usex tux)
+ -DBUILD_VR=OFF
+ -DBUILD_WEB=ON # needed by start workspace
+ -DBUILD_WITH_CONDA=OFF
+
+ -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
+
+ -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
+ -DFREECAD_USE_FREETYPE=ON
+ -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+ -DFREECAD_USE_PCL=$(usex pcl)
+ -DFREECAD_USE_PYBIND11=ON
+ -DFREECAD_USE_QT_FILEDIALOG=ON
+ -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+ # 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
+ )
+
+ 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
+ # <occ-7.5 uses different layout
+ mycmakeargs+=(
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+ )
+ fi
+
+ if use debug; then
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=ON
+ -DBUILD_TEMPLATE=ON
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=OFF
+ )
+ fi
+
+ cmake_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
+# 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
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ export FREECAD_USER_HOME="${HOME}"
+ export FREECAD_USER_DATA="${T}"
+ export FREECAD_USER_TEMP="${T}"
+ nonfatal ./bin/FreeCADCmd --run-test 0
+ popd > /dev/null || die
+}
+
+src_install() {
+ cmake_src_install
+
+ dobin src/Tools/freecad-thumbnailer
+
+ if ! use headless; then
+ dosym -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 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+ 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() {
+ 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."
+
+ # 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_header "Computational utilities"
+ optfeature "BLAS library" sci-libs/openblas
+ optfeature "Statistical computation with Python" dev-python/pandas
+ 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 "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 "Triangulating meshes" sci-libs/gts
+ optfeature "Visualization" sci-visualization/paraview
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-11-02 10:04 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-11-02 10:04 UTC (permalink / raw
To: gentoo-commits
commit: ba49e1c413cad33d9c7a69afa8e8459cf773c0bd
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Oct 18 04:55:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 2 10:04:39 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22619
Signed-off-by: Sam James <sam <AT> 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..00000000000
--- 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} = *9999 ]]; 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? ( 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
- "${WORKDIR}"/${P}-0005-Make-smesh-compile-with-vtk9.patch
- "${FILESDIR}"/${P}-0006-add-boost-serialization-to-find_package.patch
- "${FILESDIR}"/${P}-0007-fix-build-failure-with-opencascade-7.5.2.patch
-)
-
-DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
-
-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"
-}
-
-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 '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
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_ADDONMGR=$(usex addonmgr)
- -DBUILD_ARCH=ON
- -DBUILD_ASSEMBLY=OFF # deprecated
- -DBUILD_CLOUD=$(usex cloud)
- -DBUILD_COMPLETE=OFF # deprecated
- -DBUILD_DRAFT=ON
- -DBUILD_DRAWING=ON
- -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0
- -DBUILD_FEM=$(usex fem)
- -DBUILD_FEM_NETGEN=OFF
- -DBUILD_FLAT_MESH=ON
- -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
- -DBUILD_FREETYPE=ON # automagic dep
- -DBUILD_GUI=$(usex !headless)
- -DBUILD_IDF=$(usex idf)
- -DBUILD_IMAGE=$(usex image)
- -DBUILD_IMPORT=ON # import module for various file formats
- -DBUILD_INSPECTION=$(usex inspection)
- -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
- -DBUILD_MATERIAL=$(usex material)
- -DBUILD_MESH=ON
- -DBUILD_MESH_PART=ON
- -DBUILD_OPENSCAD=$(usex openscad)
- -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
- -DBUILD_SPREADSHEET=ON
- -DBUILD_START=ON
- -DBUILD_SURFACE=$(usex surface)
- -DBUILD_TECHDRAW=$(usex techdraw)
- -DBUILD_TEST=ON # always build test workbench for run-time testing
- -DBUILD_TUX=$(usex tux)
- -DBUILD_VR=OFF
- -DBUILD_WEB=ON # needed by start workspace
- -DBUILD_WITH_CONDA=OFF
-
- -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
-
- -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
- -DFREECAD_USE_FREETYPE=ON
- -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
- -DFREECAD_USE_PCL=$(usex pcl)
- -DFREECAD_USE_PYBIND11=ON
- -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
-
- -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
- # <occ-7.5 uses different layout
- mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
- )
- fi
-
- if use debug; then
- mycmakeargs+=(
- -DBUILD_SANDBOX=ON
- -DBUILD_TEMPLATE=ON
- )
- else
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=OFF
- )
- fi
-
- cmake_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
-# 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
-# configuration. Without those, there are sandbox violation, when it
-# tries to create /var/lib/portage/home/.FreeCAD directory.
-src_test() {
- pushd "${BUILD_DIR}" > /dev/null || die
- export FREECAD_USER_HOME="${HOME}"
- export FREECAD_USER_DATA="${T}"
- export FREECAD_USER_TEMP="${T}"
- nonfatal ./bin/FreeCADCmd --run-test 0
- popd > /dev/null || die
-}
-
-src_install() {
- cmake_src_install
-
- if ! use headless; then
- 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
- dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
-
- 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() {
- 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."
-
- # 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_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 "Triangulating meshes" sci-libs/gts
- optfeature "Visualization" sci-visualization/paraview
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-07-10 9:17 Ionen Wolkens
0 siblings, 0 replies; 92+ messages in thread
From: Ionen Wolkens @ 2021-07-10 9:17 UTC (permalink / raw
To: gentoo-commits
commit: db575ff7122ddf31de0092d9a3fdc59dcdda9d63
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Jul 9 08:33:38 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 09:17:24 2021 +0000
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 9999 ebuilds.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21573
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../freecad/{freecad-0.19.2-r2.ebuild => freecad-0.19.2-r3.ebuild} | 2 +-
media-gfx/freecad/freecad-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 3d41d5d0ca1..cb6c6efe011 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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 '
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-06-21 22:26 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-06-21 22:26 UTC (permalink / raw
To: gentoo-commits
commit: 6f292cab1e5b58e3c87e1914fe93e48772f150c3
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Jun 20 17:08:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 22:25:58 2021 +0000
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&t=37806 for a list of
supported optional packages.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> 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() {
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-06-21 22:26 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-06-21 22:26 UTC (permalink / raw
To: gentoo-commits
commit: 6628a9ab320db0de0a112215db0d3d586f282838
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Jun 21 00:39:35 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 22:25:59 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21350
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/freecad/freecad-9999.ebuild | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index b96f2771615..3d41d5d0ca1 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -19,7 +19,8 @@ if [[ ${PV} = *9999 ]]; 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}]
- <sci-libs/opencascade-7.5.2:=[vtk(+)]
+ sci-libs/opencascade:=[vtk(+)]
sci-libs/orocos_kdl:=
sys-libs/zlib
virtual/glu
@@ -78,9 +79,9 @@ RDEPEND="
dev-libs/openssl:=
net-misc/curl
)
- fem? ( <sci-libs/vtk-9[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(+)] )
+ pcl? ( ~sci-libs/pcl-${PV}:=[opengl,openni2(+),qt5(+),vtk(+)] )
$(python_gen_cond_dep '
dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}]
dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
@@ -319,15 +320,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_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() {
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-06-21 22:26 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-06-21 22:26 UTC (permalink / raw
To: gentoo-commits
commit: 2c8e8d8d7adc1e9f230c73b4c9b02e8161cef3f1
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Jun 21 02:49:20 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 22:25:57 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> 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..00000000000
--- 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} = *9999 ]]; 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/opencascade-7.5.2:=[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-9[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_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 )
-
-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"
-}
-
-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 '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
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_ADDONMGR=$(usex addonmgr)
- -DBUILD_ARCH=ON
- -DBUILD_ASSEMBLY=OFF # deprecated
- -DBUILD_CLOUD=$(usex cloud)
- -DBUILD_COMPLETE=OFF # deprecated
- -DBUILD_DRAFT=ON
- -DBUILD_DRAWING=ON
- -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0
- -DBUILD_FEM=$(usex fem)
- -DBUILD_FEM_NETGEN=OFF
- -DBUILD_FLAT_MESH=ON
- -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
- -DBUILD_FREETYPE=ON # automagic dep
- -DBUILD_GUI=$(usex !headless)
- -DBUILD_IDF=$(usex idf)
- -DBUILD_IMAGE=$(usex image)
- -DBUILD_IMPORT=ON # import module for various file formats
- -DBUILD_INSPECTION=$(usex inspection)
- -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
- -DBUILD_MATERIAL=$(usex material)
- -DBUILD_MESH=ON
- -DBUILD_MESH_PART=ON
- -DBUILD_OPENSCAD=$(usex openscad)
- -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
- -DBUILD_SPREADSHEET=ON
- -DBUILD_START=ON
- -DBUILD_SURFACE=$(usex surface)
- -DBUILD_TECHDRAW=$(usex techdraw)
- -DBUILD_TEST=ON # always build test workbench for run-time testing
- -DBUILD_TUX=$(usex tux)
- -DBUILD_VR=OFF
- -DBUILD_WEB=ON # needed by start workspace
- -DBUILD_WITH_CONDA=OFF
-
- -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
-
- -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
- -DFREECAD_USE_FREETYPE=ON
- -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
- -DFREECAD_USE_PCL=$(usex pcl)
- -DFREECAD_USE_PYBIND11=ON
- -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
-
- -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
- # <occ-7.5 uses different layout
- mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
- )
- fi
-
- if use debug; then
- mycmakeargs+=(
- -DBUILD_SANDBOX=ON
- -DBUILD_TEMPLATE=ON
- )
- else
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=OFF
- )
- fi
-
- cmake_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
-# 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
-# configuration. Without those, there are sandbox violation, when it
-# tries to create /var/lib/portage/home/.FreeCAD directory.
-src_test() {
- pushd "${BUILD_DIR}" > /dev/null || die
- export FREECAD_USER_HOME="${HOME}"
- export FREECAD_USER_DATA="${T}"
- export FREECAD_USER_TEMP="${T}"
- nonfatal ./bin/FreeCADCmd --run-test 0
- popd > /dev/null || die
-}
-
-src_install() {
- cmake_src_install
-
- if ! use headless; then
- 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
- dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
-
- 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() {
- 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."
-
- 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 "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() {
- xdg_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-06-18 19:18 David Seifert
0 siblings, 0 replies; 92+ messages in thread
From: David Seifert @ 2021-06-18 19:18 UTC (permalink / raw
To: gentoo-commits
commit: d488ade34ffa25268cfe0d1eb0446c88d589b61b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 19:16:50 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 19:16:50 2021 +0000
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 <soap <AT> 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-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 3f5de2fa3a1..b96f2771615 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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}]
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-06-16 14:02 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-06-16 14:02 UTC (permalink / raw
To: gentoo-commits
commit: a1276d40cc56884b813e34ae2a4b3d8c74005c8d
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Jun 16 13:28:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 16 13:58:30 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21266
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/freecad/freecad-9999.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 490b29d0793..3f5de2fa3a1 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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(+)]
+ <sci-libs/opencascade-7.5.2:=[vtk(+)]
sci-libs/orocos_kdl:=
sys-libs/zlib
virtual/glu
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-06-15 14:42 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-06-15 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 0ed3c2582763576100bd183a69f83beb00b2dfd4
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Jun 11 07:42:09 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 14:39:51 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21242
Signed-off-by: Sam James <sam <AT> 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(+)]
+ <sci-libs/opencascade-7.5.2:=[vtk(+)]
sci-libs/orocos_kdl:=
sys-libs/zlib
virtual/glu
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-06-05 14:14 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2021-06-05 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 04dd713b4dbf8c7eb62a6598b1c826ed5e8e34f8
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 5 14:13:57 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jun 5 14:13:57 2021 +0000
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 <andrewammerlaan <AT> gentoo.org>
media-gfx/freecad/freecad-0.19.2.ebuild | 1 +
media-gfx/freecad/freecad-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 26f5cab4f42..490b29d0793 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-06-05 11:56 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2021-06-05 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 12f82ac6b59dcbb679a0a5a4b819ac0ba2f6193a
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 5 11:42:21 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jun 5 11:56:04 2021 +0000
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 <andrewammerlaan <AT> gentoo.org>
media-gfx/freecad/freecad-0.19.1.ebuild | 3 +++
media-gfx/freecad/freecad-0.19.2.ebuild | 3 +++
media-gfx/freecad/freecad-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 765ee01a7a0..26f5cab4f42 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-06-03 19:15 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-06-03 19:15 UTC (permalink / raw
To: gentoo-commits
commit: c54eb2086d44649278ca216a9e165a92b6f5ce12
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 2 23:55:15 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 3 19:14:53 2021 +0000
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 <sam <AT> gentoo.org>
media-gfx/freecad/freecad-0.19.1.ebuild | 2 +-
media-gfx/freecad/freecad-0.19.2.ebuild | 2 +-
media-gfx/freecad/freecad-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 8b29013224e..765ee01a7a0 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-05-31 19:26 Alexey Shvetsov
0 siblings, 0 replies; 92+ messages in thread
From: Alexey Shvetsov @ 2021-05-31 19:26 UTC (permalink / raw
To: gentoo-commits
commit: b83b3eaf0c8423672624c1cb06cc0ff5bc4aa360
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue May 18 18:40:01 2021 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon May 31 19:26:02 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Alexey Shvetsov <alexxy <AT> 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
# <occ-7.5 uses different layout
mycmakeargs+=(
- -DOCC_INCLUDEDIR="${CASROOT}"/include/opencascade
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
)
fi
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-05-31 19:26 Alexey Shvetsov
0 siblings, 0 replies; 92+ messages in thread
From: Alexey Shvetsov @ 2021-05-31 19:26 UTC (permalink / raw
To: gentoo-commits
commit: 04ff08820f7e8734963d046b496fbb03190b64c0
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue May 18 22:16:39 2021 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon May 31 19:26:09 2021 +0000
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&t=36071&start=30#p504595
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20879
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
media-gfx/freecad/freecad-9999.ebuild | 133 +++++++++++++++++++++++-----------
1 file changed, 90 insertions(+), 43 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 90acff50625..8b29013224e 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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} = *9999 ]]; 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/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
- mesh? ( sci-libs/hdf5:=[fortran,zlib] )
openscad? ( media-gfx/openscad )
pcl? ( >=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 )
- techdraw? ( spreadsheet drawing )
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.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=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
-CHECKREQS_DISK_BUILD="3G"
+CHECKREQS_DISK_BUILD="2G"
pkg_setup() {
check-reqs_pkg_setup
@@ -139,9 +138,20 @@ src_prepare() {
rm "${S}/cMake/FindCoin3D.cmake" || die
# Fix OpenCASCADE lookup
- 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
@@ -152,16 +162,16 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DBUILD_ADDONMGR=$(usex addonmgr)
- -DBUILD_ARCH=$(usex arch)
- -DBUILD_ASSEMBLY=OFF
+ -DBUILD_ARCH=ON
+ -DBUILD_ASSEMBLY=OFF # deprecated
-DBUILD_CLOUD=$(usex cloud)
-DBUILD_COMPLETE=OFF # deprecated
- -DBUILD_DRAFT=ON # basic workspace, enable it by default
- -DBUILD_DRAWING=$(usex drawing)
+ -DBUILD_DRAFT=ON
+ -DBUILD_DRAWING=ON
-DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0
-DBUILD_FEM=$(usex fem)
-DBUILD_FEM_NETGEN=OFF
- -DBUILD_FLAT_MESH=$(usex mesh)
+ -DBUILD_FLAT_MESH=ON
-DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
-DBUILD_FREETYPE=ON # automagic dep
-DBUILD_GUI=$(usex !headless)
@@ -171,10 +181,10 @@ src_configure() {
-DBUILD_INSPECTION=$(usex inspection)
-DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
-DBUILD_MATERIAL=$(usex material)
- -DBUILD_MESH=$(usex mesh)
- -DBUILD_MESH_PART=$(usex mesh)
+ -DBUILD_MESH=ON
+ -DBUILD_MESH_PART=ON
-DBUILD_OPENSCAD=$(usex openscad)
- -DBUILD_PART=ON # basic workspace, enable it by default
+ -DBUILD_PART=ON
-DBUILD_PART_DESIGN=$(usex part-design)
-DBUILD_PATH=$(usex path)
-DBUILD_PLOT=$(usex plot) # conflicts with possible external workbench
@@ -186,11 +196,12 @@ src_configure() {
-DBUILD_SHIP=$(usex ship) # conflicts with possible external workbench
-DBUILD_SHOW=$(usex show)
-DBUILD_SKETCHER=ON # needed by draft workspace
- -DBUILD_SMESH=$(usex mesh)
- -DBUILD_SPREADSHEET=$(usex spreadsheet)
- -DBUILD_START=ON # basic workspace, enable it by default
+ -DBUILD_SMESH=ON
+ -DBUILD_SPREADSHEET=ON
+ -DBUILD_START=ON
-DBUILD_SURFACE=$(usex surface)
-DBUILD_TECHDRAW=$(usex techdraw)
+ -DBUILD_TEST=ON # always build test workbench for run-time testing
-DBUILD_TUX=$(usex tux)
-DBUILD_VR=OFF
-DBUILD_WEB=ON # needed by start workspace
@@ -203,42 +214,74 @@ src_configure() {
-DFREECAD_BUILD_DEBIAN=OFF
- -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
-DFREECAD_USE_FREETYPE=ON
-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
-DFREECAD_USE_PCL=$(usex pcl)
- -DFREECAD_USE_PYBIND11=$(usex mesh)
+ -DFREECAD_USE_PYBIND11=ON
-DFREECAD_USE_QT_FILEDIALOG=ON
-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
- -DPython3_EXECUTABLE=${PYTHON}
+ # 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
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+ -DPython3_EXECUTABLE=${PYTHON}
-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/}
+ mycmakeargs+=(
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
+ )
+ else
+ # <occ-7.5 uses different layout
+ mycmakeargs+=(
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+ )
+ fi
+
if use debug; then
+ # BUILD_SANDBOX currently broken, see
+ # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
mycmakeargs+=(
- # sandbox needs mesh support
- -DBUILD_SANDBOX=$(usex mesh)
+ -DBUILD_SANDBOX=OFF
-DBUILD_TEMPLATE=ON
- -DBUILD_TEST=ON
)
else
mycmakeargs+=(
-DBUILD_SANDBOX=OFF
-DBUILD_TEMPLATE=OFF
- -DBUILD_TEST=OFF
)
fi
cmake_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
+# 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
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ export FREECAD_USER_HOME="${HOME}"
+ export FREECAD_USER_DATA="${T}"
+ export FREECAD_USER_TEMP="${T}"
+ nonfatal ./bin/FreeCADCmd --run-test 0
+ popd > /dev/null || die
+}
+
src_install() {
cmake_src_install
@@ -249,6 +292,10 @@ src_install() {
dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
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() {
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-05-24 12:30 Andrew Ammerlaan
0 siblings, 0 replies; 92+ messages in thread
From: Andrew Ammerlaan @ 2021-05-24 12:30 UTC (permalink / raw
To: gentoo-commits
commit: fcd3ebfb7145a2ba44d65702a99d3145004bda10
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 12:29:19 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 24 12:30:11 2021 +0000
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 <andrewammerlaan <AT> gentoo.org>
media-gfx/freecad/freecad-0.19.1.ebuild | 1 +
media-gfx/freecad/freecad-0.19.2.ebuild | 1 +
media-gfx/freecad/freecad-9999.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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 47d3587ffec..90acff50625 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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() {
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-05-06 21:45 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-05-06 21:45 UTC (permalink / raw
To: gentoo-commits
commit: ba902ec3a01181390af7c460b0f07fd9f80f616c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 6 21:43:41 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 6 21:44:18 2021 +0000
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 <sam <AT> 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
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-05-06 21:45 Sam James
0 siblings, 0 replies; 92+ messages in thread
From: Sam James @ 2021-05-06 21:45 UTC (permalink / raw
To: gentoo-commits
commit: d8e72a84aebb1ac6094257935e5c5a589da1870c
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Thu May 6 21:37:40 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 6 21:42:42 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20708
Signed-off-by: Sam James <sam <AT> 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
+ # <occ-7.5 uses different layout
+ mycmakeargs+=(
+ -DOCC_INCLUDEDIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+ )
+ fi
+
if use debug; then
mycmakeargs+=(
-DBUILD_SANDBOX=ON
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-03-16 17:12 Michał Górny
0 siblings, 0 replies; 92+ messages in thread
From: Michał Górny @ 2021-03-16 17:12 UTC (permalink / raw
To: gentoo-commits
commit: 325332a72779baa8d0f2f3733675e8f0e218a655
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 14:09:29 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 16:42:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=325332a7
media-gfx/freecad: metadata.xml, description → name
Signed-off-by: Michał Górny <mgorny <AT> 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 @@
</maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
- <description>Gentoo Proxy Maintainers</description>
+ <name>Gentoo Proxy Maintainers</name>
</maintainer>
<use>
<flag name="addonmgr">
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-03-14 11:41 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2021-03-14 11:41 UTC (permalink / raw
To: gentoo-commits
commit: bbdef3fd3ee7165b750f41175238a415e5f81cc5
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Mar 13 14:33:51 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 11:41:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdef3fd
media-gfx/freecad: several updates with 9999
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19914
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/freecad/freecad-9999.ebuild | 33 +++++++++++++++++----------------
media-gfx/freecad/metadata.xml | 3 ---
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index e2cb13d51fc..47d3587ffec 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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} = *9999 ]]; 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() {
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 599d1643a22..a4419122627 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -18,9 +18,6 @@
Build the architecture workbench for working with architectural
elements
</flag>
- <flag name="ccache">
- Use <pkg>dev-util/ccache</pkg> to build the package.
- </flag>
<flag name="cloud">
Build the Cloud workbench, to access cloud providers (mostly
Amazon S3).
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2021-02-15 9:04 Joonas Niilola
0 siblings, 0 replies; 92+ messages in thread
From: Joonas Niilola @ 2021-02-15 9:04 UTC (permalink / raw
To: gentoo-commits
commit: e05f68215cf3a932447ffb3f0c3f066e4998c178
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sat Jan 16 00:58:17 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 09:03:53 2021 +0000
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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19076
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/freecad/freecad-9999.ebuild | 283 ++++++++++++++++++++++++++++++++++
media-gfx/freecad/metadata.xml | 2 +-
2 files changed, 284 insertions(+), 1 deletion(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
new file mode 100644
index 00000000000..e2cb13d51fc
--- /dev/null
+++ b/media-gfx/freecad/freecad-9999.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} = *9999 ]]; 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/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+ mesh? ( sci-libs/hdf5:=[fortran,zlib] )
+ 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-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=(
+ "${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
+)
+
+DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+
+CHECKREQS_DISK_BUILD="7G"
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ python-single-r1_pkg_setup
+ [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
+}
+
+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
+ sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+ -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+ -i cMake/FindOpenCasCade.cmake || die
+
+ # Fix desktop file
+ sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ADDONMGR=$(usex addonmgr)
+ -DBUILD_ARCH=$(usex arch)
+ -DBUILD_ASSEMBLY=OFF
+ -DBUILD_CLOUD=$(usex cloud)
+ -DBUILD_COMPLETE=OFF # deprecated
+ -DBUILD_DRAFT=ON # basic workspace, enable it by default
+ -DBUILD_DRAWING=$(usex drawing)
+ -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0
+ -DBUILD_FEM=$(usex fem)
+ -DBUILD_FEM_NETGEN=OFF
+ -DBUILD_FLAT_MESH=$(usex mesh)
+ -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
+ -DBUILD_FREETYPE=ON # automagic dep
+ -DBUILD_GUI=$(usex !headless)
+ -DBUILD_IDF=$(usex idf)
+ -DBUILD_IMAGE=$(usex image)
+ -DBUILD_IMPORT=ON # import module for various file formats
+ -DBUILD_INSPECTION=$(usex inspection)
+ -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
+ -DBUILD_MATERIAL=$(usex material)
+ -DBUILD_MESH=$(usex mesh)
+ -DBUILD_MESH_PART=$(usex mesh)
+ -DBUILD_OPENSCAD=$(usex openscad)
+ -DBUILD_PART=ON # basic workspace, enable it by default
+ -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=$(usex mesh)
+ -DBUILD_SPREADSHEET=$(usex spreadsheet)
+ -DBUILD_START=ON # basic workspace, enable it by default
+ -DBUILD_SURFACE=$(usex surface)
+ -DBUILD_TECHDRAW=$(usex techdraw)
+ -DBUILD_TUX=$(usex tux)
+ -DBUILD_VR=OFF
+ -DBUILD_WEB=ON # needed by start workspace
+ -DBUILD_WITH_CONDA=OFF
+
+ -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
+
+ -DFREECAD_USE_CCACHE=$(usex ccache)
+ -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
+ -DFREECAD_USE_FREETYPE=ON
+ -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+ -DFREECAD_USE_PCL=$(usex pcl)
+ -DFREECAD_USE_PYBIND11=$(usex mesh)
+ -DFREECAD_USE_QT_FILEDIALOG=ON
+ -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+ -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 use debug; then
+ mycmakeargs+=(
+ # sandbox needs mesh support
+ -DBUILD_SANDBOX=$(usex mesh)
+ -DBUILD_TEMPLATE=ON
+ -DBUILD_TEST=ON
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_SANDBOX=OFF
+ -DBUILD_TEMPLATE=OFF
+ -DBUILD_TEST=OFF
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if ! use headless; then
+ dosym ../$(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
+
+ python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+}
+
+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."
+
+ 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 "PBR Rendering" media-gfx/povray
+ optfeature "FEM mesh generator" sci-libs/gmsh
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index a36a8d876fb..599d1643a22 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>waebbl@gmail.com</email>
+ <email>waebbl-gentoo@posteo.net</email>
<name>Bernd Waibel</name>
</maintainer>
<maintainer type="project">
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2018-05-11 19:36 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2018-05-11 19:36 UTC (permalink / raw
To: gentoo-commits
commit: b874d61060be798e6b6efb75b86953169bcd6cdd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 11 18:35:40 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 11 19:36:24 2018 +0000
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..00000000000
--- 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} == *9999 ]]; 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
-
- 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
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2018-03-13 9:33 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2018-03-13 9:33 UTC (permalink / raw
To: gentoo-commits
commit: 3de09d76b875dc7ce1754b880d44038ea9e2f3ec
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 09:24:33 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 09:33:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de09d76
media-gfx/freecad: Drop bogus dev-java/xerces DEPEND
Thanks-to: Christoph Steup <steup <AT> 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}]
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2018-03-13 9:33 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2018-03-13 9:33 UTC (permalink / raw
To: gentoo-commits
commit: db39186a84fc276d2fc94a3166b97ec3fd0b581f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 09:27:42 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 09:33:24 2018 +0000
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:
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2018-03-13 9:33 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2018-03-13 9:33 UTC (permalink / raw
To: gentoo-commits
commit: a9c5924be41e9457cdee147b28326b717e8fff40
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 09:17:13 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 09:33:24 2018 +0000
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 00000000000..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} == *9999 ]]; 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
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2018-03-13 9:33 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2018-03-13 9:33 UTC (permalink / raw
To: gentoo-commits
commit: 078fd3d958f15505a7466f40df954f00822b3a57
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 09:25:42 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 09:33:24 2018 +0000
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/"
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2018-03-02 22:08 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2018-03-02 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 417a8bd818405105bc096c1445a68fdd8f4604a3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 2 21:52:24 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 22:08:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=417a8bd8
media-gfx/freecad: Drop bogus dev-java/xerces DEPEND
Thanks-to: Christoph Steup <steup <AT> 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}]
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2018-03-02 22:08 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2018-03-02 22:08 UTC (permalink / raw
To: gentoo-commits
commit: b055f5b8a2f097b72bc00e6e980ee61b823cb99d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 2 22:03:42 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 22:08:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b055f5b8
media-gfx/freecad: Drop 0.17_pre and 9999
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-9999.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..00000000000
--- 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} == *9999 ]]; 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
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
deleted file mode 100644
index 13355e49800..00000000000
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ /dev/null
@@ -1,134 +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 gnome2-utils fortran-2 python-single-r1
-
-DESCRIPTION="Qt based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/"
-
-if [[ ${PV} == *9999 ]]; 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}"
-
-#dev-qt/qtgui:4[-egl] and dev-qt/qtopengl:4[-egl] : Bug 564978
-#dev-python/pyside[svg] : Bug 591012
-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}]"
-
-# 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
-
-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=/usr/share/${P}
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DCMAKE_INSTALL_INCLUDEDIR=/usr/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
- xdg_desktop_database_update
-
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2018-03-02 22:08 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2018-03-02 22:08 UTC (permalink / raw
To: gentoo-commits
commit: fd83e9d3c1b1a7a619908701ad9dadd0eb503553
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 2 21:55:36 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 22:08:15 2018 +0000
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..00000000000
--- 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} == *9999 ]]; 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
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2018-03-02 22:08 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2018-03-02 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 7de3981f2f76697156b56e92b24f8d05beeeaa2b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 2 21:57:16 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 22:08:15 2018 +0000
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/"
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2018-01-05 0:35 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2018-01-05 0:35 UTC (permalink / raw
To: gentoo-commits
commit: 970ae83d488e7cf0c237d68b0a2a6ef35c30959e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 19:59:32 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 00:34:27 2018 +0000
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
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-12-29 19:06 Miroslav Šulc
0 siblings, 0 replies; 92+ messages in thread
From: Miroslav Šulc @ 2017-12-29 19:06 UTC (permalink / raw
To: gentoo-commits
commit: a6ae8d1452396e5c06820e26565d1a1b5ccec6e3
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 19:04:58 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 19:06:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ae8d14
media-gfx/freecad-9999: several fixes
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-gfx/freecad/freecad-9999.ebuild | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index d6e044a1e51..13355e49800 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.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
}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-12-29 19:06 Miroslav Šulc
0 siblings, 0 replies; 92+ messages in thread
From: Miroslav Šulc @ 2017-12-29 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 5e2a5df7c49975be9ecf39a04f336286dcd7acc9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 19:06:01 2017 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 19:06:37 2017 +0000
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
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-11-06 1:58 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2017-11-06 1:58 UTC (permalink / raw
To: gentoo-commits
commit: 82ecce779a48319853f3ef403fa2b6b3f813b43e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 19:18:34 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 01:57:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82ecce77
media-gfx/freecad: Sync live ebuild w/ recent changes
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-gfx/freecad/freecad-9999.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 3890e6216c8..e39d3974bf7 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -23,7 +23,6 @@ SLOT="0"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-#sci-libs/orocos_kdl waiting for Bug 604130 (keyword ~x86)
#dev-qt/qtgui:4[-egl] and dev-qt/qtopengl:4[-egl] : Bug 564978
#dev-python/pyside[svg] : Bug 591012
COMMON_DEPEND="
@@ -43,6 +42,7 @@ COMMON_DEPEND="
media-libs/coin
media-libs/freetype
|| ( sci-libs/opencascade:6.9.1[vtk] sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
+ sci-libs/orocos_kdl
sys-libs/zlib
virtual/glu"
RDEPEND="${COMMON_DEPEND}
@@ -77,14 +77,13 @@ src_configure() {
#-DOCC_* defined with cMake/FindOpenCasCade.cmake
#-DCOIN3D_* defined with cMake/FindCoin3D.cmake
#-DSOQT_ not used
- #-DFREECAD_USE_EXTERNAL_KDL="ON" waiting for Bug 604130 (keyword ~x86)
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="OFF"
+ -DFREECAD_USE_EXTERNAL_KDL="ON"
)
# TODO to remove embedded dependencies:
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-11-06 1:58 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2017-11-06 1:58 UTC (permalink / raw
To: gentoo-commits
commit: c7919db53c1507c4b4dc1514ebf10596dd6506f2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 19:11:28 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 01:57:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7919db5
media-gfx/freecad: Update DESCRIPTION, HOMEPAGE
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-gfx/freecad/freecad-0.16.6712.ebuild | 4 ++--
media-gfx/freecad/freecad-0.17_pre.ebuild | 4 ++--
media-gfx/freecad/freecad-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild b/media-gfx/freecad/freecad-0.16.6712.ebuild
index e1f0300bd89..47739ae3578 100644
--- a/media-gfx/freecad/freecad-0.16.6712.ebuild
+++ b/media-gfx/freecad/freecad-0.16.6712.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 )
inherit cmake-utils eutils xdg-utils fortran-2 python-single-r1
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="http://www.freecadweb.org/"
+DESCRIPTION="Qt based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
diff --git a/media-gfx/freecad/freecad-0.17_pre.ebuild b/media-gfx/freecad/freecad-0.17_pre.ebuild
index e1f0300bd89..47739ae3578 100644
--- a/media-gfx/freecad/freecad-0.17_pre.ebuild
+++ b/media-gfx/freecad/freecad-0.17_pre.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 )
inherit cmake-utils eutils xdg-utils fortran-2 python-single-r1
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="http://www.freecadweb.org/"
+DESCRIPTION="Qt based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index b7e08d6c582..a9032d1b3e8 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 )
inherit cmake-utils eutils fdo-mime fortran-2 python-single-r1
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="http://www.freecadweb.org/"
+DESCRIPTION="Qt based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-11-06 1:58 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2017-11-06 1:58 UTC (permalink / raw
To: gentoo-commits
commit: e3c14220dd985121802124e9666f8959fa7789c5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 19:15:22 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 01:57:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c14220
media-gfx/freecad: Switch to xdg-utils
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-gfx/freecad/freecad-9999.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index a9032d1b3e8..3890e6216c8 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils eutils fdo-mime fortran-2 python-single-r1
+inherit cmake-utils eutils xdg-utils fortran-2 python-single-r1
DESCRIPTION="Qt based Computer Aided Design application"
HOMEPAGE="https://www.freecadweb.org/"
@@ -121,9 +121,9 @@ src_install() {
}
pkg_postinst() {
- fdo-mime_mime_database_update
+ xdg_mimeinfo_database_update
}
pkg_postrm() {
- fdo-mime_mime_database_update
+ xdg_mimeinfo_database_update
}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-11-06 1:58 Andreas Sturmlechner
0 siblings, 0 replies; 92+ messages in thread
From: Andreas Sturmlechner @ 2017-11-06 1:58 UTC (permalink / raw
To: gentoo-commits
commit: 0ac12fb9162942c2d7e4e0dd9448f77b75748613
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 19:23:19 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 01:57:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac12fb9
media-gfx/freecad: Compact sci-libs/opencascade DEPENDs
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-gfx/freecad/freecad-0.16.6712.ebuild | 2 +-
media-gfx/freecad/freecad-0.17_pre.ebuild | 2 +-
media-gfx/freecad/freecad-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild b/media-gfx/freecad/freecad-0.16.6712.ebuild
index 47739ae3578..46964014555 100644
--- a/media-gfx/freecad/freecad-0.16.6712.ebuild
+++ b/media-gfx/freecad/freecad-0.16.6712.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND="
dev-qt/qtwebkit:4
media-libs/coin
media-libs/freetype
- || ( sci-libs/opencascade:6.9.1[vtk] sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
+ sci-libs/opencascade:*[vtk(+)]
sci-libs/orocos_kdl
sys-libs/zlib
virtual/glu"
diff --git a/media-gfx/freecad/freecad-0.17_pre.ebuild b/media-gfx/freecad/freecad-0.17_pre.ebuild
index 47739ae3578..46964014555 100644
--- a/media-gfx/freecad/freecad-0.17_pre.ebuild
+++ b/media-gfx/freecad/freecad-0.17_pre.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND="
dev-qt/qtwebkit:4
media-libs/coin
media-libs/freetype
- || ( sci-libs/opencascade:6.9.1[vtk] sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
+ sci-libs/opencascade:*[vtk(+)]
sci-libs/orocos_kdl
sys-libs/zlib
virtual/glu"
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index e39d3974bf7..d6e044a1e51 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND="
dev-qt/qtwebkit:4
media-libs/coin
media-libs/freetype
- || ( sci-libs/opencascade:6.9.1[vtk] sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
+ sci-libs/opencascade:*[vtk(+)]
sci-libs/orocos_kdl
sys-libs/zlib
virtual/glu"
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-07-26 17:08 Alexey Shvetsov
0 siblings, 0 replies; 92+ messages in thread
From: Alexey Shvetsov @ 2017-07-26 17:08 UTC (permalink / raw
To: gentoo-commits
commit: dc0d03e974f1d33a402ac4e18e993defc9c4e834
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 16:10:03 2017 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 17:04:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc0d03e9
media-gfx/freecad: now uses external kdl
Package-Manager: Portage-2.3.6, Repoman-2.3.3
media-gfx/freecad/freecad-0.16-r1.ebuild | 132 +++++++++++++++++++++++++++++++
1 file changed, 132 insertions(+)
diff --git a/media-gfx/freecad/freecad-0.16-r1.ebuild b/media-gfx/freecad/freecad-0.16-r1.ebuild
new file mode 100644
index 00000000000..e1f0300bd89
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.16-r1.ebuild
@@ -0,0 +1,132 @@
+# 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="http://www.freecadweb.org/"
+
+if [[ ${PV} == *9999 ]]; 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:6.9.1[vtk] sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
+ 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
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-07-26 17:08 Alexey Shvetsov
0 siblings, 0 replies; 92+ messages in thread
From: Alexey Shvetsov @ 2017-07-26 17:08 UTC (permalink / raw
To: gentoo-commits
commit: 9fbb45f9277667146be091927e21802ac0f2f5d6
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 16:11:19 2017 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 17:04:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbb45f9
media-gfx/freecad: Version bump for 0.16.x series
Package-Manager: Portage-2.3.6, Repoman-2.3.3
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 04eee41d403..b529ef9b5e1 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1,3 @@
DIST freecad-0.15.4671.tar.gz 93680347 SHA256 8dda8f355cb59866a55c9c6096f39a3ebc5347892284db4c305352cc9be03bbc SHA512 695081117b5511bbc0b7335b63a8760e164987a6dff2c5b0dc86b6b0a93bb7d7b83aa9f4fab1d66d7d2c917a42b0135af78553b463579873a1d1e52e3dd9aecb WHIRLPOOL 0c351ad9ee360dfd9af54af9cc348a6ba3d8c15b6743667f6943e41aa252cec9bd2149baa32fceeceac65660a9b629aefba3c80a5c3a84c45a8d502323547287
+DIST freecad-0.16.6712.tar.gz 111706423 SHA256 97aa130addeb0f3c0bf79e4828fbd242b76cc92603771d6b7aeb9dbd9f111a92 SHA512 ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e WHIRLPOOL 2c6f9e3afeb83befbaeb8d51ddf8272ab21473f8ef73095eebe5985a4f1979bb67767c3fca30ebdc853dfbdcd207e2a58e41f323d6ca8ff9502ee2aef9b33850
DIST freecad-0.16.tar.gz 111706127 SHA256 6cc71ab4b0dc60b493d3aaa4b42f1ce1af9d4fcd539309ab0792804579e18e09 SHA512 bc9dc8122cabd9a84f2b955746818e0d77ae90e68747ec96521099472b7803df9ff794ed823d6eb29352bd0538b8f01cf81c306ff427f1af2ee049f8f7096dbb WHIRLPOOL 8d90a4213808dcd7ce7adeaeac8a30351e06b217e31326817cb034ec02dcfe7be0ea71cb5bf297e1bab3a8a6c6ac24848f51a0453f9bf09162e700bc52f9cf4d
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 00000000000..e1f0300bd89
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.16.6712.ebuild
@@ -0,0 +1,132 @@
+# 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="http://www.freecadweb.org/"
+
+if [[ ${PV} == *9999 ]]; 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:6.9.1[vtk] sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
+ 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
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-07-26 17:08 Alexey Shvetsov
0 siblings, 0 replies; 92+ messages in thread
From: Alexey Shvetsov @ 2017-07-26 17:08 UTC (permalink / raw
To: gentoo-commits
commit: 648ec22de718bb436f7a69ab80dfd736339e68cc
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 16:28:27 2017 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 17:04:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=648ec22d
media-gfx/freecad: Add 0.17_pre snapshot
Package-Manager: Portage-2.3.6, Repoman-2.3.3
media-gfx/freecad/Manifest | 1 +
media-gfx/freecad/freecad-0.17_pre.ebuild | 132 ++++++++++++++++++++++++++++++
2 files changed, 133 insertions(+)
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index b529ef9b5e1..54f7f4203d2 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,3 +1,4 @@
DIST freecad-0.15.4671.tar.gz 93680347 SHA256 8dda8f355cb59866a55c9c6096f39a3ebc5347892284db4c305352cc9be03bbc SHA512 695081117b5511bbc0b7335b63a8760e164987a6dff2c5b0dc86b6b0a93bb7d7b83aa9f4fab1d66d7d2c917a42b0135af78553b463579873a1d1e52e3dd9aecb WHIRLPOOL 0c351ad9ee360dfd9af54af9cc348a6ba3d8c15b6743667f6943e41aa252cec9bd2149baa32fceeceac65660a9b629aefba3c80a5c3a84c45a8d502323547287
DIST freecad-0.16.6712.tar.gz 111706423 SHA256 97aa130addeb0f3c0bf79e4828fbd242b76cc92603771d6b7aeb9dbd9f111a92 SHA512 ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e WHIRLPOOL 2c6f9e3afeb83befbaeb8d51ddf8272ab21473f8ef73095eebe5985a4f1979bb67767c3fca30ebdc853dfbdcd207e2a58e41f323d6ca8ff9502ee2aef9b33850
DIST freecad-0.16.tar.gz 111706127 SHA256 6cc71ab4b0dc60b493d3aaa4b42f1ce1af9d4fcd539309ab0792804579e18e09 SHA512 bc9dc8122cabd9a84f2b955746818e0d77ae90e68747ec96521099472b7803df9ff794ed823d6eb29352bd0538b8f01cf81c306ff427f1af2ee049f8f7096dbb WHIRLPOOL 8d90a4213808dcd7ce7adeaeac8a30351e06b217e31326817cb034ec02dcfe7be0ea71cb5bf297e1bab3a8a6c6ac24848f51a0453f9bf09162e700bc52f9cf4d
+DIST freecad-0.17_pre.tar.gz 111704401 SHA256 25648fbaac8a96d7e63d8881fbc79f1829eff2852927e427cfe6d5f4f60a4f95 SHA512 a826a549d842ba322f7ec5f786d402e81f5b916008be450bacefb7ee976e203427130938c036cc6fca6ea11a8df0ab9b4a39f3bdfedc3cc1a7d31e7a5d11e142 WHIRLPOOL 959c90ad8bc70f063a98bbd03c2bf3c84c8f8bd0ea534120811d59cf9b8f017bdca62538ff226bfc4b326155b435cd948fe5a207a97a237e971a96c99a8756c6
diff --git a/media-gfx/freecad/freecad-0.17_pre.ebuild b/media-gfx/freecad/freecad-0.17_pre.ebuild
new file mode 100644
index 00000000000..e1f0300bd89
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.17_pre.ebuild
@@ -0,0 +1,132 @@
+# 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="http://www.freecadweb.org/"
+
+if [[ ${PV} == *9999 ]]; 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:6.9.1[vtk] sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
+ 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
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-04-30 19:46 Davide Pesavento
0 siblings, 0 replies; 92+ messages in thread
From: Davide Pesavento @ 2017-04-30 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 951a1a4612e396525d93840d8b48bfdee79c8a0f
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 19:46:12 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 19:46:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=951a1a46
media-gfx/freecad: restrict shiboken, pyside{,-tools} to SLOT 0
For future compatibility with PySide2
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-gfx/freecad/freecad-0.15.4671.ebuild | 6 +++---
media-gfx/freecad/freecad-0.16.ebuild | 6 +++---
media-gfx/freecad/freecad-9999.ebuild | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/media-gfx/freecad/freecad-0.15.4671.ebuild b/media-gfx/freecad/freecad-0.15.4671.ebuild
index 35b24037ca0..32e4afa2735 100644
--- a/media-gfx/freecad/freecad-0.15.4671.ebuild
+++ b/media-gfx/freecad/freecad-0.15.4671.ebuild
@@ -21,8 +21,8 @@ COMMON_DEPEND="dev-cpp/eigen:3
dev-libs/boost
dev-libs/xerces-c[icu]
dev-python/matplotlib
- dev-python/pyside[X]
- dev-python/shiboken
+ dev-python/pyside:0[X]
+ dev-python/shiboken:0
dev-qt/designer:4
dev-qt/qtgui:4
dev-qt/qtopengl:4
@@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
dev-python/pivy
dev-python/numpy"
DEPEND="${COMMON_DEPEND}
- dev-python/pyside-tools
+ dev-python/pyside-tools:0
>=dev-lang/swig-2.0.4-r1:0"
# https://bugs.gentoo.org/show_bug.cgi?id=352435
diff --git a/media-gfx/freecad/freecad-0.16.ebuild b/media-gfx/freecad/freecad-0.16.ebuild
index 4f6ed4bea1f..cbe390dc0c6 100644
--- a/media-gfx/freecad/freecad-0.16.ebuild
+++ b/media-gfx/freecad/freecad-0.16.ebuild
@@ -33,8 +33,8 @@ COMMON_DEPEND="
dev-libs/boost:=[python,${PYTHON_USEDEP}]
dev-libs/xerces-c[icu]
dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/pyside[X,svg,${PYTHON_USEDEP}]
- dev-python/shiboken[${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]
@@ -51,7 +51,7 @@ RDEPEND="${COMMON_DEPEND}
dev-qt/assistant:4"
DEPEND="${COMMON_DEPEND}
>=dev-lang/swig-2.0.4-r1:0
- dev-python/pyside-tools[${PYTHON_USEDEP}]"
+ dev-python/pyside-tools:0[${PYTHON_USEDEP}]"
PATCHES=(
"${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 68d3225d12a..b7e08d6c582 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -33,8 +33,8 @@ COMMON_DEPEND="
dev-libs/boost:=[python,${PYTHON_USEDEP}]
dev-libs/xerces-c[icu]
dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/pyside[X,svg,${PYTHON_USEDEP}]
- dev-python/shiboken[${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]
@@ -51,7 +51,7 @@ RDEPEND="${COMMON_DEPEND}
dev-qt/assistant:4"
DEPEND="${COMMON_DEPEND}
>=dev-lang/swig-2.0.4-r1:0
- dev-python/pyside-tools[${PYTHON_USEDEP}]"
+ dev-python/pyside-tools:0[${PYTHON_USEDEP}]"
# https://bugs.gentoo.org/show_bug.cgi?id=352435
# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-04-13 19:33 Patrice Clement
0 siblings, 0 replies; 92+ messages in thread
From: Patrice Clement @ 2017-04-13 19:33 UTC (permalink / raw
To: gentoo-commits
commit: ce1c247d32885029fa7834f27f7c1802584fd177
Author: bdouxx <bdouxx-git <AT> yahoo <DOT> fr>
AuthorDate: Mon Feb 20 20:44:12 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 19:32:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce1c247d
media-gfx/freecad: fix wrong path declared as S.
Gentoo-Bug: https://bugs.gentoo.org/609476
Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/4048
media-gfx/freecad/freecad-9999.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 0dcd26ef652..7337a4ec850 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -64,8 +64,6 @@ RESTRICT="mirror"
# salome-smesh - science overlay
# zipio++ - not in portage yet
-S="${WORKDIR}/FreeCAD-${PV}"
-
DOCS=( README.md ChangeLog.txt )
pkg_setup() {
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-01-20 14:21 David Seifert
0 siblings, 0 replies; 92+ messages in thread
From: David Seifert @ 2017-01-20 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 084ad17aa72c29953102c18908feb4284ffa40e4
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 14:21:02 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 14:21:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084ad17a
media-gfx/freecad: Point EGIT_REPO_URI to correct URL
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/freecad/freecad-0.16.ebuild | 2 +-
media-gfx/freecad/freecad-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/freecad/freecad-0.16.ebuild b/media-gfx/freecad/freecad-0.16.ebuild
index a828e81..09d0121 100644
--- a/media-gfx/freecad/freecad-0.16.ebuild
+++ b/media-gfx/freecad/freecad-0.16.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.freecadweb.org/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
+ 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"
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 5a117b7..16ae94a 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.freecadweb.org/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
+ 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"
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-01-18 21:19 David Seifert
0 siblings, 0 replies; 92+ messages in thread
From: David Seifert @ 2017-01-18 21:19 UTC (permalink / raw
To: gentoo-commits
commit: d06b7207c4aac1a061284f3569fb129b8660bb3d
Author: bdouxx <bdouxx-git <AT> yahoo <DOT> fr>
AuthorDate: Wed Dec 28 21:03:03 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 21:19:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06b7207
media-gfx/freecad: Version bump to 0.16
Gentoo-bug: 580256, 580642, 591012
* change SRC_URI to github
Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3266
media-gfx/freecad/Manifest | 1 +
media-gfx/freecad/freecad-0.16.ebuild | 138 ++++++++++++++++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index ef0b503..04eee41 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1 +1,2 @@
DIST freecad-0.15.4671.tar.gz 93680347 SHA256 8dda8f355cb59866a55c9c6096f39a3ebc5347892284db4c305352cc9be03bbc SHA512 695081117b5511bbc0b7335b63a8760e164987a6dff2c5b0dc86b6b0a93bb7d7b83aa9f4fab1d66d7d2c917a42b0135af78553b463579873a1d1e52e3dd9aecb WHIRLPOOL 0c351ad9ee360dfd9af54af9cc348a6ba3d8c15b6743667f6943e41aa252cec9bd2149baa32fceeceac65660a9b629aefba3c80a5c3a84c45a8d502323547287
+DIST freecad-0.16.tar.gz 111706127 SHA256 6cc71ab4b0dc60b493d3aaa4b42f1ce1af9d4fcd539309ab0792804579e18e09 SHA512 bc9dc8122cabd9a84f2b955746818e0d77ae90e68747ec96521099472b7803df9ff794ed823d6eb29352bd0538b8f01cf81c306ff427f1af2ee049f8f7096dbb WHIRLPOOL 8d90a4213808dcd7ce7adeaeac8a30351e06b217e31326817cb034ec02dcfe7be0ea71cb5bf297e1bab3a8a6c6ac24848f51a0453f9bf09162e700bc52f9cf4d
diff --git a/media-gfx/freecad/freecad-0.16.ebuild b/media-gfx/freecad/freecad-0.16.ebuild
new file mode 100644
index 00000000..a828e81
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.16.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils fdo-mime fortran-2 python-single-r1
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="http://www.freecadweb.org/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mdadams/jasper.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=""
+
+#sci-libs/orocos_kdl waiting for Bug 604130 (keyword ~x86)
+#dev-qt/qtgui:4[-egl] and dev-qt/qtopengl:4[-egl] : Bug 564978
+#dev-python/pyside[svg] : Bug 591012
+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[X,svg,${PYTHON_USEDEP}]
+ dev-python/shiboken[${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:6.9.1[vtk] sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
+ 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[${PYTHON_USEDEP}]"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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
+ #-DFREECAD_USE_EXTERNAL_KDL="ON" waiting for Bug 604130 (keyword ~x86)
+ 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="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
+
+ 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() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2017-01-18 21:19 David Seifert
0 siblings, 0 replies; 92+ messages in thread
From: David Seifert @ 2017-01-18 21:19 UTC (permalink / raw
To: gentoo-commits
commit: 8617c76a7dfd76788e943867a4101f7c68fb10f0
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 19:51:46 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 21:19:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8617c76a
media-gfx/freecad: Update live ebuild
Gentoo-bug: 569498
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/freecad/freecad-9999.ebuild | 124 ++++++++++++++++------------------
1 file changed, 57 insertions(+), 67 deletions(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index aca47ad..5a117b7 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -1,91 +1,95 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils eutils git-r3 fortran-2 multilib python-single-r1 fdo-mime
+inherit cmake-utils eutils fdo-mime fortran-2 python-single-r1
DESCRIPTION="QT based Computer Aided Design application"
HOMEPAGE="http://www.freecadweb.org/"
-EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mdadams/jasper.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"
-KEYWORDS=""
+
IUSE=""
-COMMON_DEPEND=">dev-cpp/eigen-3.2.2:3
- dev-libs/boost
+#sci-libs/orocos_kdl waiting for Bug 604130 (keyword ~x86)
+#dev-qt/qtgui:4[-egl] and dev-qt/qtopengl:4[-egl] : Bug 564978
+#dev-python/pyside[svg] : Bug 591012
+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
- dev-python/pyside[X,svg]
- dev-python/shiboken
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/pyside[X,svg,${PYTHON_USEDEP}]
+ dev-python/shiboken[${PYTHON_USEDEP}]
dev-qt/designer:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
+ dev-qt/qtgui:4[-egl]
+ dev-qt/qtopengl:4[-egl]
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
media-libs/coin
- || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
+ media-libs/freetype
+ || ( sci-libs/opencascade:6.9.1[vtk] sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
sys-libs/zlib
- virtual/glu
- ${PYTHON_DEPS}"
+ virtual/glu"
RDEPEND="${COMMON_DEPEND}
- dev-qt/assistant:4
- dev-python/pivy
- dev-python/numpy"
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pivy[${PYTHON_USEDEP}]
+ dev-qt/assistant:4"
DEPEND="${COMMON_DEPEND}
- dev-python/pyside-tools
- >=dev-lang/swig-2.0.4-r1:0"
+ >=dev-lang/swig-2.0.4-r1:0
+ dev-python/pyside-tools[${PYTHON_USEDEP}]"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# https://bugs.gentoo.org/show_bug.cgi?id=352435
# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist mirror"
+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_prepare() {
- einfo remove bundled libs
- rm -rf src/3rdParty/{boost,Pivy*}
-
- epatch "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
-
- #bug 518996
- sed -e "/LibDir = /s:'lib':'"$(get_libdir)"':g" \
- -i src/App/FreeCADInit.py || die
-
+ [[ -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
+ #-DFREECAD_USE_EXTERNAL_KDL="ON" waiting for Bug 604130 (keyword ~x86)
local mycmakeargs=(
-DOCC_INCLUDE_DIR="${CASROOT}"/inc
- -DOCC_INCLUDE_PATH="${CASROOT}"/inc
- -DOCC_LIBRARY="${CASROOT}"/lib/libTKernel.so
- -DOCC_LIBRARY_DIR="${CASROOT}"/lib
- -DOCC_LIB_PATH="${CASROOT}"/lib
- -DCOIN3D_INCLUDE_DIRS="${EROOT}"usr/include/coin
- -DCOIN3D_LIBRARY="${EROOT}"usr/$(get_libdir)/libCoin.so
- -DSOQT_LIBRARY="${EROOT}"usr/$(get_libdir)/libSoQt.so
- -DSOQT_INCLUDE_PATH="${EROOT}"usr/include/coin
- -DCMAKE_INSTALL_PREFIX="${EROOT}"usr/$(get_libdir)/${P}
- -DCMAKE_INSTALL_DATADIR="${EROOT}"usr/share/${P}/
- -DCMAKE_INSTALL_DOCDIR="${EROOT}"usr/share/doc/${P}/
- -DCMAKE_INSTALL_INCLUDEDIR="${EROOT}"usr/include/${P}/
- -DFREECAD_USE_EXTERNAL_PIVY="ON"
- -DFREECAD_BUILD_FEM="OFF"
+ -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="OFF"
)
# TODO to remove embedded dependencies:
@@ -96,43 +100,29 @@ src_configure() {
# (external salomesmesh is available in "science" overlay)
cmake-utils_src_configure
- ewarn "${P} will be built against opencascade version ${CASROOT}"
+ einfo "${P} will be built against opencascade version ${CASROOT}"
}
src_install() {
cmake-utils_src_install
- prune_libtool_files
-
- make_wrapper FreeCAD \
- "${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCAD \
- "" "${EROOT}"usr/$(get_libdir)/${P}/lib
- make_wrapper FreeCADCmd \
- "${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCADCmd \
- "" "${EROOT}"usr/$(get_libdir)/${P}/lib
-
make_desktop_entry FreeCAD "FreeCAD" "" "" "MimeType=application/x-extension-fcstd;"
- dodoc README.md ChangeLog.txt
-
# 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}"
+ 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
-
- # disable compression of QT assistant help files
- >> "${ED}"usr/share/doc/${P}/freecad.qhc.ecompress.skip
- >> "${ED}"usr/share/doc/${P}/freecad.qch.ecompress.skip
+ popd || die
- python_optimize "${ED}"usr/{$(get_libdir),share}/${P}/Mod/
+ python_optimize "${ED%/}"/usr/{,share/${P}/}Mod/
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2016-02-20 12:45 Michael Weber
0 siblings, 0 replies; 92+ messages in thread
From: Michael Weber @ 2016-02-20 12:45 UTC (permalink / raw
To: gentoo-commits
commit: 8dfee4631a8fcc333642d387bd93b3b06bbf8cab
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 12:41:15 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 12:41:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dfee463
media-gfx/freecad: Require >dev-cpp/eigen-3.2.2:3 (thanks Grégory Salvan, bug 575104).
Package-Manager: portage-2.2.27
media-gfx/freecad/freecad-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index b0cdc37..aca47ad 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="dev-cpp/eigen:3
+COMMON_DEPEND=">dev-cpp/eigen-3.2.2:3
dev-libs/boost
dev-libs/xerces-c[icu]
dev-python/matplotlib
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2015-09-18 15:26 Michael Weber
0 siblings, 0 replies; 92+ messages in thread
From: Michael Weber @ 2015-09-18 15:26 UTC (permalink / raw
To: gentoo-commits
commit: de8e6963f76f9326e0b5f5e1e20dcb0c8ceca9ec
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 15:26:28 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 15:26:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8e6963
media-gfx/freecad: add dev-python/pyside[svg] (thanks Jon Gerdes, bug 560494).
Package-Manager: portage-2.2.20.1
media-gfx/freecad/freecad-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index ec475f5..b0cdc37 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -21,7 +21,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
dev-libs/boost
dev-libs/xerces-c[icu]
dev-python/matplotlib
- dev-python/pyside[X]
+ dev-python/pyside[X,svg]
dev-python/shiboken
dev-qt/designer:4
dev-qt/qtgui:4
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2015-08-11 9:32 Michael Weber
0 siblings, 0 replies; 92+ messages in thread
From: Michael Weber @ 2015-08-11 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 48bf6cacb9a11ae4882b5a1c5afe9023f9cae0db
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 09:32:23 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 09:32:23 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48bf6cac
media-gfx/freecad: drop sci-libs/gts dep.
Package-Manager: portage-2.2.20
media-gfx/freecad/freecad-0.12.5284-r4.ebuild | 1 -
media-gfx/freecad/freecad-0.13.1830-r1.ebuild | 1 -
media-gfx/freecad/freecad-0.14.3702-r1.ebuild | 1 -
3 files changed, 3 deletions(-)
diff --git a/media-gfx/freecad/freecad-0.12.5284-r4.ebuild b/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
index d5910bb..9918055 100644
--- a/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
+++ b/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
@@ -33,7 +33,6 @@ RDEPEND="dev-cpp/eigen:3
dev-qt/qtxmlpatterns:4
media-libs/SoQt
media-libs/coin[doc]
- sci-libs/gts
sci-libs/opencascade:6.7.1
sys-libs/zlib
virtual/glu"
diff --git a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
index f95a00f..2d7151b 100644
--- a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
@@ -32,7 +32,6 @@ COMMON_DEPEND="dev-cpp/eigen:3
dev-qt/qtxmlpatterns:4
media-libs/SoQt
media-libs/coin[doc]
- sci-libs/gts
sci-libs/opencascade:6.7.1
sys-libs/zlib
virtual/glu
diff --git a/media-gfx/freecad/freecad-0.14.3702-r1.ebuild b/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
index 0b6dc75..4e04bfc 100644
--- a/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
@@ -34,7 +34,6 @@ COMMON_DEPEND="dev-cpp/eigen:3
media-libs/SoQt
media-libs/coin[doc]
net-libs/ptlib
- sci-libs/gts
sci-libs/opencascade:6.7.1
sys-libs/zlib
virtual/glu
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2015-08-11 9:18 Michael Weber
0 siblings, 0 replies; 92+ messages in thread
From: Michael Weber @ 2015-08-11 9:18 UTC (permalink / raw
To: gentoo-commits
commit: 029323a5b8ec6af3a4cd8ba96ffd162e38e4b5f1
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 09:17:55 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 09:17:55 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=029323a5
media-gfx/freecad: remove old sci-libs/opencascade.
Package-Manager: portage-2.2.20
media-gfx/freecad/freecad-0.12.5284-r4.ebuild | 2 +-
media-gfx/freecad/freecad-0.13.1830-r1.ebuild | 2 +-
media-gfx/freecad/freecad-0.14.3702-r1.ebuild | 2 +-
media-gfx/freecad/freecad-0.15.4671.ebuild | 2 +-
media-gfx/freecad/freecad-9999.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-gfx/freecad/freecad-0.12.5284-r4.ebuild b/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
index 8d09d98..d5910bb 100644
--- a/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
+++ b/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
@@ -34,7 +34,7 @@ RDEPEND="dev-cpp/eigen:3
media-libs/SoQt
media-libs/coin[doc]
sci-libs/gts
- || ( sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+ sci-libs/opencascade:6.7.1
sys-libs/zlib
virtual/glu"
DEPEND="${RDEPEND}
diff --git a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
index 25787a8..f95a00f 100644
--- a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
media-libs/SoQt
media-libs/coin[doc]
sci-libs/gts
- || ( sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+ sci-libs/opencascade:6.7.1
sys-libs/zlib
virtual/glu
${PYTHON_DEPS}"
diff --git a/media-gfx/freecad/freecad-0.14.3702-r1.ebuild b/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
index c1158cb..0b6dc75 100644
--- a/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
media-libs/coin[doc]
net-libs/ptlib
sci-libs/gts
- || ( sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+ sci-libs/opencascade:6.7.1
sys-libs/zlib
virtual/glu
${PYTHON_DEPS}"
diff --git a/media-gfx/freecad/freecad-0.15.4671.ebuild b/media-gfx/freecad/freecad-0.15.4671.ebuild
index 0246c84..3822f2c 100644
--- a/media-gfx/freecad/freecad-0.15.4671.ebuild
+++ b/media-gfx/freecad/freecad-0.15.4671.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
media-libs/coin
- || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+ || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
sys-libs/zlib
virtual/glu
${PYTHON_DEPS}"
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 5001cf3..cd258aa 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
media-libs/coin
- || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+ || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
sys-libs/zlib
virtual/glu
${PYTHON_DEPS}"
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2015-08-11 9:08 Michael Weber
0 siblings, 0 replies; 92+ messages in thread
From: Michael Weber @ 2015-08-11 9:08 UTC (permalink / raw
To: gentoo-commits
commit: 4033eceb79cb5ecba2795d7c6511d57fa89abf98
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 09:05:53 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 09:05:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4033eceb
media-gfx/freecad: fix typo
Package-Manager: portage-2.2.20
media-gfx/freecad/freecad-0.15.4671.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/freecad/freecad-0.15.4671.ebuild b/media-gfx/freecad/freecad-0.15.4671.ebuild
index a0b4954..0246c84 100644
--- a/media-gfx/freecad/freecad-0.15.4671.ebuild
+++ b/media-gfx/freecad/freecad-0.15.4671.ebuild
@@ -113,7 +113,7 @@ src_install() {
make_desktop_entry FreeCAD "FreeCAD" "" "" "MimeType=application/x-extension-fcstd;"
- dodoc README.linux ChangeLog.txt
+ dodoc README.Linux ChangeLog.txt
# install mimetype for FreeCAD files
insinto /usr/share/mime/packages
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2015-08-11 9:08 Michael Weber
0 siblings, 0 replies; 92+ messages in thread
From: Michael Weber @ 2015-08-11 9:08 UTC (permalink / raw
To: gentoo-commits
commit: e9e1f71725ec276dcf357290cab9dde094ab8462
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 09:08:25 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 09:08:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e1f717
media-gfx/freecad: adjust boost prior 1.57
Package-Manager: portage-2.2.20
media-gfx/freecad/freecad-0.12.5284-r4.ebuild | 2 +-
media-gfx/freecad/freecad-0.13.1830-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/freecad/freecad-0.12.5284-r4.ebuild b/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
index bb186a2..8d09d98 100644
--- a/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
+++ b/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
@@ -19,7 +19,7 @@ IUSE=""
RDEPEND="dev-cpp/eigen:3
dev-games/ode
- dev-libs/boost
+ <dev-libs/boost-1.57
dev-libs/libf2c
dev-libs/libspnav[X]
dev-libs/xerces-c[icu]
diff --git a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
index eb1577f..25787a8 100644
--- a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
@@ -19,7 +19,7 @@ IUSE=""
COMMON_DEPEND="dev-cpp/eigen:3
dev-games/ode
- dev-libs/boost
+ <dev-libs/boost-1.57
dev-libs/libf2c
dev-libs/libspnav[X]
dev-libs/xerces-c[icu]
^ permalink raw reply related [flat|nested] 92+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2015-08-11 6:18 Michael Weber
0 siblings, 0 replies; 92+ messages in thread
From: Michael Weber @ 2015-08-11 6:18 UTC (permalink / raw
To: gentoo-commits
commit: 5834aaf5c6172fa56030b47490ba587f75b264c9
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 06:17:44 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 06:17:58 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5834aaf5
media-gfx/freecad: Fix Readme.md installation, depend on pyside-tools (bug 550612, thanks Kfir Lavi). Update COIN3D varname.
Package-Manager: portage-2.2.20
media-gfx/freecad/freecad-0.15.4671.ebuild | 1 -
media-gfx/freecad/freecad-9999.ebuild | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/media-gfx/freecad/freecad-0.15.4671.ebuild b/media-gfx/freecad/freecad-0.15.4671.ebuild
index cc77948..63375fb 100644
--- a/media-gfx/freecad/freecad-0.15.4671.ebuild
+++ b/media-gfx/freecad/freecad-0.15.4671.ebuild
@@ -22,7 +22,6 @@ COMMON_DEPEND="dev-cpp/eigen:3
dev-libs/xerces-c[icu]
dev-python/matplotlib
dev-python/pyside[X]
- dev-python/pyside-tools
dev-python/shiboken
dev-qt/designer:4
dev-qt/qtgui:4
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index fca8ff2..6b494f9 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -23,7 +23,6 @@ COMMON_DEPEND="dev-cpp/eigen:3
dev-libs/xerces-c[icu]
dev-python/matplotlib
dev-python/pyside[X]
- dev-python/pyside-tools
dev-python/shiboken
dev-qt/designer:4
dev-qt/qtgui:4
@@ -78,7 +77,7 @@ src_configure() {
-DOCC_LIBRARY="${CASROOT}"/lib/libTKernel.so
-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-DOCC_LIB_PATH="${CASROOT}"/lib
- -DCOIN3D_INCLUDE_DIR="${EROOT}"usr/include/coin
+ -DCOIN3D_INCLUDE_DIRS="${EROOT}"usr/include/coin
-DCOIN3D_LIBRARY="${EROOT}"usr/$(get_libdir)/libCoin.so
-DSOQT_LIBRARY="${EROOT}"usr/$(get_libdir)/libSoQt.so
-DSOQT_INCLUDE_PATH="${EROOT}"usr/include/coin
@@ -116,7 +115,7 @@ src_install() {
newicon src/Main/icon.ico ${PN}.ico
make_desktop_entry FreeCAD
- dodoc README.Linux ChangeLog.txt
+ dodoc README.md ChangeLog.txt
# disable compression of QT assistant help files
>> "${ED}"usr/share/doc/${P}/freecad.qhc.ecompress.skip
^ permalink raw reply related [flat|nested] 92+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/
@ 2015-08-09 14:03 Michael Weber
0 siblings, 0 replies; 92+ messages in thread
From: Michael Weber @ 2015-08-09 14:03 UTC (permalink / raw
To: gentoo-commits
commit: 8755b0b69aff157136f52029b9646d86789f14f3
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 14:03:54 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 14:03:54 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8755b0b6
media-gfx/freecad: use sci-libs/opencascade[(+)vtk] (bug 557022, thanks Helmut Jarausch).
Package-Manager: portage-2.2.20
media-gfx/freecad/freecad-0.15.4671.ebuild | 2 +-
media-gfx/freecad/freecad-9999.ebuild | 18 +++---------------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/media-gfx/freecad/freecad-0.15.4671.ebuild b/media-gfx/freecad/freecad-0.15.4671.ebuild
index a188353..cc77948 100644
--- a/media-gfx/freecad/freecad-0.15.4671.ebuild
+++ b/media-gfx/freecad/freecad-0.15.4671.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
media-libs/coin
- || ( sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+ || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
sys-libs/zlib
virtual/glu
${PYTHON_DEPS}"
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index eac0344..fca8ff2 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -30,11 +30,8 @@ COMMON_DEPEND="dev-cpp/eigen:3
dev-qt/qtopengl:4
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
- media-libs/SoQt
- media-libs/coin[doc]
- net-libs/ptlib
- sci-libs/gts
- || ( sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+ media-libs/coin
+ || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
sys-libs/zlib
virtual/glu
${PYTHON_DEPS}"
@@ -75,15 +72,6 @@ src_prepare() {
}
src_configure() {
- local my_occ_env=${EROOT}etc/env.d/50opencascade
- if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then
- my_occ_env=${EROOT}etc/env.d/51opencascade
- fi
- export CASROOT=$(awk -F '=' '$1 == "CASROOT" {print $2}' $my_occ_env)
- #my_occ_ver=$(echo $CASROOT |
- # awk '{print gensub(".*opencascade-([0-9.]*).*","\\1","$0")}')
- # or just $(eselect opencascade show)
-
local mycmakeargs=(
-DOCC_INCLUDE_DIR="${CASROOT}"/inc
-DOCC_INCLUDE_PATH="${CASROOT}"/inc
@@ -128,7 +116,7 @@ src_install() {
newicon src/Main/icon.ico ${PN}.ico
make_desktop_entry FreeCAD
- dodoc README ChangeLog.txt
+ dodoc README.Linux ChangeLog.txt
# disable compression of QT assistant help files
>> "${ED}"usr/share/doc/${P}/freecad.qhc.ecompress.skip
^ permalink raw reply related [flat|nested] 92+ messages in thread
end of thread, other threads:[~2024-09-15 15:42 UTC | newest]
Thread overview: 92+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-04 21:52 [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-15 15:42 Andrew Ammerlaan
2024-09-14 19:59 Alexey Shvetsov
2024-04-15 9:42 Andrew Ammerlaan
2024-04-15 8:38 Joonas Niilola
2024-03-27 2:57 Sam James
2024-03-24 13:54 Andrew Ammerlaan
2024-03-23 11:21 Andrew Ammerlaan
2024-03-09 10:17 Andrew Ammerlaan
2024-03-09 7:23 Andrew Ammerlaan
2024-01-05 13:12 Andrew Ammerlaan
2024-01-05 10:23 Andrew Ammerlaan
2023-11-25 9:11 Miroslav Šulc
2023-11-20 19:43 Andrew Ammerlaan
2023-05-08 8:19 Joonas Niilola
2023-05-08 8:19 Joonas Niilola
2023-05-07 8:44 Joonas Niilola
2023-02-23 17:30 Miroslav Šulc
2023-02-23 11:25 Andrew Ammerlaan
2023-02-21 6:18 Joonas Niilola
2023-01-09 19:23 Joonas Niilola
2022-11-27 13:23 Piotr Karbowski
2022-11-22 15:03 Joonas Niilola
2022-09-28 9:55 Joonas Niilola
2022-09-02 16:50 Joonas Niilola
2022-08-31 4:57 Joonas Niilola
2022-07-29 3:16 Sam James
2022-07-09 12:26 Matthew Smith
2022-05-19 12:12 Joonas Niilola
2022-04-18 11:35 Joonas Niilola
2022-04-14 8:54 Joonas Niilola
2022-04-06 17:30 Piotr Karbowski
2022-04-02 12:58 Andreas Sturmlechner
2022-02-03 15:52 John Helmert III
2022-01-28 8:24 Sam James
2022-01-10 1:04 Sam James
2022-01-10 1:04 Sam James
2021-12-04 21:52 Sam James
2021-11-30 12:50 Joonas Niilola
2021-11-30 12:50 Joonas Niilola
2021-11-02 10:04 Sam James
2021-11-02 10:04 Sam James
2021-07-10 9:17 Ionen Wolkens
2021-06-21 22:26 Sam James
2021-06-21 22:26 Sam James
2021-06-21 22:26 Sam James
2021-06-18 19:18 David Seifert
2021-06-16 14:02 Sam James
2021-06-15 14:42 Sam James
2021-06-05 14:14 Andrew Ammerlaan
2021-06-05 11:56 Andrew Ammerlaan
2021-06-03 19:15 Sam James
2021-05-31 19:26 Alexey Shvetsov
2021-05-31 19:26 Alexey Shvetsov
2021-05-24 12:30 Andrew Ammerlaan
2021-05-06 21:45 Sam James
2021-05-06 21:45 Sam James
2021-03-16 17:12 Michał Górny
2021-03-14 11:41 Joonas Niilola
2021-02-15 9:04 Joonas Niilola
2018-05-11 19:36 Andreas Sturmlechner
2018-03-13 9:33 Andreas Sturmlechner
2018-03-13 9:33 Andreas Sturmlechner
2018-03-13 9:33 Andreas Sturmlechner
2018-03-13 9:33 Andreas Sturmlechner
2018-03-02 22:08 Andreas Sturmlechner
2018-03-02 22:08 Andreas Sturmlechner
2018-03-02 22:08 Andreas Sturmlechner
2018-03-02 22:08 Andreas Sturmlechner
2018-01-05 0:35 Andreas Sturmlechner
2017-12-29 19:06 Miroslav Šulc
2017-12-29 19:06 Miroslav Šulc
2017-11-06 1:58 Andreas Sturmlechner
2017-11-06 1:58 Andreas Sturmlechner
2017-11-06 1:58 Andreas Sturmlechner
2017-11-06 1:58 Andreas Sturmlechner
2017-07-26 17:08 Alexey Shvetsov
2017-07-26 17:08 Alexey Shvetsov
2017-07-26 17:08 Alexey Shvetsov
2017-04-30 19:46 Davide Pesavento
2017-04-13 19:33 Patrice Clement
2017-01-20 14:21 David Seifert
2017-01-18 21:19 David Seifert
2017-01-18 21:19 David Seifert
2016-02-20 12:45 Michael Weber
2015-09-18 15:26 Michael Weber
2015-08-11 9:32 Michael Weber
2015-08-11 9:18 Michael Weber
2015-08-11 9:08 Michael Weber
2015-08-11 9:08 Michael Weber
2015-08-11 6:18 Michael Weber
2015-08-09 14:03 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox