commit:     dbfd4f89bc8988466b385e7c07a0d1e13d4edb5e
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Tue Oct 29 19:57:31 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 20:24:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbfd4f89

media-gfx/freecad: Fail on test failure and fix typos

Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/freecad/freecad-1.0.0-r1.ebuild | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/media-gfx/freecad/freecad-1.0.0-r1.ebuild 
b/media-gfx/freecad/freecad-1.0.0-r1.ebuild
index 2a6600b9cb2b..074cd2d5246c 100644
--- a/media-gfx/freecad/freecad-1.0.0-r1.ebuild
+++ b/media-gfx/freecad/freecad-1.0.0-r1.ebuild
@@ -31,7 +31,7 @@ IUSE="debug designer +gui pcl qt5 smesh spacenav test X"
 # cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
 # To get their dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-IUSE+=" addonmgr cloud fem idf inspection netgen openscad points robot surface 
techdraw"
+IUSE+=" addonmgr cloud fem idf inspection netgen openscad points robot surface 
+techdraw"
 
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
@@ -40,6 +40,7 @@ REQUIRED_USE="
        inspection? ( points )
        openscad? ( smesh )
        python_single_target_python3_12? ( gui? ( !qt5 ) )
+       test? ( techdraw )
 "
 # There is no py3.12 support planned for pyside2
 
@@ -285,18 +286,18 @@ 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
+# 2. We don't need virtualx.eclass and its dependencies
+# The environment variables are needed, so that FreeCAD knows
+# where to save its temporary files, and where to look and write its
+# configuration. Without those, there is a 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
+       cd "${BUILD_DIR}" || die
+
+       local -x FREECAD_USER_HOME="${HOME}"
+       local -x FREECAD_USER_DATA="${T}"
+       local -x FREECAD_USER_TEMP="${T}"
+       ./bin/FreeCADCmd --run-test 0 || die
 }
 
 src_install() {

Reply via email to