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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D5E1A158086 for ; Sat, 4 Dec 2021 21:52:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35E902BC052; Sat, 4 Dec 2021 21:52:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B9A22BC052 for ; Sat, 4 Dec 2021 21:52:59 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 138943430B8 for ; Sat, 4 Dec 2021 21:52:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 570C7209 for ; Sat, 4 Dec 2021 21:52:56 +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: <1638654764.febb7b197dd214a577942eddcc0096984ec0b8d3.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-0.19.2-r5.ebuild X-VCS-Directories: media-gfx/freecad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: febb7b197dd214a577942eddcc0096984ec0b8d3 X-VCS-Branch: master Date: Sat, 4 Dec 2021 21:52:56 +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: ce63aadf-8728-4feb-b5e4-2fd8ff41c83d X-Archives-Hash: d8b9361248b175d6a383cf84c2cd33a1 commit: febb7b197dd214a577942eddcc0096984ec0b8d3 Author: Bernd Waibel posteo net> AuthorDate: Fri Dec 3 23:11:36 2021 +0000 Commit: Sam James gentoo 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 posteo.net> Signed-off-by: Sam James gentoo.org> media-gfx/freecad/freecad-0.19.2-r5.ebuild | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/media-gfx/freecad/freecad-0.19.2-r5.ebuild b/media-gfx/freecad/freecad-0.19.2-r5.ebuild index df0faac7f980..c9287ed91fa5 100644 --- a/media-gfx/freecad/freecad-0.19.2-r5.ebuild +++ b/media-gfx/freecad/freecad-0.19.2-r5.ebuild @@ -223,17 +223,6 @@ src_configure() { # Use the version of shiboken2 that matches the selected python version -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" -DPython3_EXECUTABLE=${PYTHON} - - -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo - ) - - # bug https://bugs.gentoo.org/788274 - local OCC_P=$(best_version sci-libs/opencascade[vtk]) - OCC_P=${OCC_P#sci-libs/} - OCC_P=${OCC_P%-r*} - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} ) if use debug; then