From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9728415821F for ; Sun, 24 Nov 2024 20:25:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA4C4E0866; Sun, 24 Nov 2024 20:25:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B5DFFE0866 for ; Sun, 24 Nov 2024 20:25:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06E5F33BEE9 for ; Sun, 24 Nov 2024 20:25:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4130D1F64 for ; Sun, 24 Nov 2024 20:25:10 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1732479865.dbfd4f89bc8988466b385e7c07a0d1e13d4edb5e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/freecad/freecad-1.0.0-r1.ebuild X-VCS-Directories: media-gfx/freecad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: dbfd4f89bc8988466b385e7c07a0d1e13d4edb5e X-VCS-Branch: master Date: Sun, 24 Nov 2024 20:25:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a9d24ce6-7446-41e3-9452-ac02da5b361d X-Archives-Hash: 0a229c989884a5e70fd823b518c60d5c commit: dbfd4f89bc8988466b385e7c07a0d1e13d4edb5e Author: Chris Mayo gmail com> AuthorDate: Tue Oct 29 19:57:31 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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() {