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 82053158086 for ; Tue, 30 Nov 2021 12:50:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 017262BC03D; Tue, 30 Nov 2021 12:50:28 +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 C36BC2BC03D for ; Tue, 30 Nov 2021 12:50:27 +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 80E73342F44 for ; Tue, 30 Nov 2021 12:50:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E43071F4 for ; Tue, 30 Nov 2021 12:50:24 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1638276618.3c966730bf52e6d2169cb8d0a35133e92a13076b.juippis@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-r4.ebuild media-gfx/freecad/freecad-0.19.2-r5.ebuild X-VCS-Directories: media-gfx/freecad/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 3c966730bf52e6d2169cb8d0a35133e92a13076b X-VCS-Branch: master Date: Tue, 30 Nov 2021 12:50:24 +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: 5380c8b0-98f9-4d12-9012-1b473c6daa8b X-Archives-Hash: 7b5ec3e67d74712ebd038deae3c2238a commit: 3c966730bf52e6d2169cb8d0a35133e92a13076b Author: Bernd Waibel posteo net> AuthorDate: Sat Nov 20 10:13:34 2021 +0000 Commit: Joonas Niilola gentoo 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 posteo.net> Closes: https://github.com/gentoo/gentoo/pull/23008 Signed-off-by: Joonas Niilola gentoo.org> ...d-0.19.2-r4.ebuild => freecad-0.19.2-r5.ebuild} | 48 ++++++---------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/media-gfx/freecad/freecad-0.19.2-r4.ebuild b/media-gfx/freecad/freecad-0.19.2-r5.ebuild similarity index 90% rename from media-gfx/freecad/freecad-0.19.2-r4.ebuild rename to media-gfx/freecad/freecad-0.19.2-r5.ebuild index 24dc6a703399..df0faac7f980 100644 --- a/media-gfx/freecad/freecad-0.19.2-r4.ebuild +++ b/media-gfx/freecad/freecad-0.19.2-r5.ebuild @@ -47,7 +47,6 @@ unset module RDEPEND=" ${PYTHON_DEPS} - >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] @@ -79,7 +78,7 @@ RDEPEND=" dev-libs/openssl:= net-misc/curl ) - fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] ) + fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) $(python_gen_cond_dep ' @@ -94,7 +93,10 @@ RDEPEND=" fem? ( dev-python/ply[${PYTHON_USEDEP}] ) ') " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + >=dev-cpp/eigen-3.3.1:3 +" BDEPEND="dev-lang/swig" # To get required dependencies: @@ -143,22 +145,6 @@ src_prepare() { # but cmake ships a working one, so we use this. rm "${S}/cMake/FindCoin3D.cmake" || die - # Fix OpenCASCADE lookup - local OCC_P=$(best_version sci-libs/opencascade[vtk]) - OCC_P=${OCC_P#sci-libs/} - local OCC_PV=${OCC_P#opencascade-} - OCC_PV=$(ver_cut 1-2 ${OCC_PV}) - # check for CASROOT needed to ensure occ-7.5 is eselected and profile resourced - if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then - sed -e 's|/usr/include/opencascade|'${CASROOT}'/include/'${OCC_P}'|' \ - -e 's|/usr/lib|'${CASROOT}'/'$(get_libdir)'/'${OCC_P}' NO_DEFAULT_PATH|' \ - -i cMake/FindOpenCasCade.cmake || die - else - sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \ - -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \ - -i cMake/FindOpenCasCade.cmake || die - fi - # Fix desktop file sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die @@ -241,22 +227,14 @@ src_configure() { -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo ) - if has_version ">=sci-libs/opencascade-7.5"; then - # bug https://bugs.gentoo.org/788274 - local OCC_P=$(best_version sci-libs/opencascade[vtk]) - OCC_P=${OCC_P#sci-libs/} - OCC_P=${OCC_P%-r*} - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} - ) - else - #