From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1278501-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6E8EA1382C5 for <garchives@archives.gentoo.org>; Tue, 4 May 2021 22:03:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B66F1E0880; Tue, 4 May 2021 22:03:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6046BE0880 for <gentoo-commits@lists.gentoo.org>; Tue, 4 May 2021 22:03:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7499E340DAF for <gentoo-commits@lists.gentoo.org>; Tue, 4 May 2021 22:02:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78EDA74F for <gentoo-commits@lists.gentoo.org>; Tue, 4 May 2021 22:02:52 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1620165707.da53808432edde9896401246635ea5e3c153c4fb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/opencascade/opencascade-7.4.0-r4.ebuild X-VCS-Directories: sci-libs/opencascade/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: da53808432edde9896401246635ea5e3c153c4fb X-VCS-Branch: master Date: Tue, 4 May 2021 22:02:52 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9d2b79e2-b67f-4673-9085-860fbb069f11 X-Archives-Hash: ed76d51cd14e3056a5bcd383e2bf72ca commit: da53808432edde9896401246635ea5e3c153c4fb Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> AuthorDate: Mon Apr 19 05:52:08 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 4 22:01:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da538084 sci-libs/opencascade: fix Qt dependency Changes a dependency on dev-qt/linguist-tool Closes: https://bugs.gentoo.org/783810 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/20449 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-libs/opencascade/opencascade-7.4.0-r4.ebuild | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild index 2c5adfb7524..7a53a10d350 100644 --- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild +++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild @@ -9,19 +9,21 @@ EAPI=7 inherit check-reqs cmake flag-o-matic java-pkg-opt-2 +MY_PV="$(ver_rs 1- '_')" + DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange" HOMEPAGE="https://www.opencascade.com" -MY_PV="$(ver_rs 1- '_')" SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz" +S="${WORKDIR}/occt-V${MY_PV}" LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" SLOT="${PV}" KEYWORDS="~amd64 ~arm64 ~x86" -# gl2ps -IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk" +IUSE="debug doc +examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk" REQUIRED_USE=" inspector? ( qt5 ) + qt5? ( examples ) ?? ( optimize tbb ) " @@ -56,10 +58,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - doc? ( - app-doc/doxygen - qt5? ( dev-qt/linguist-tools:5 ) - ) + doc? ( app-doc/doxygen ) + qt5? ( dev-qt/linguist-tools:5 ) " # There's no easy way to test. Testing needs a rather big environment @@ -71,8 +71,6 @@ CHECKREQS_DISK_BUILD="3584M" CMAKE_BUILD_TYPE=Release -S="${WORKDIR}/occt-V${MY_PV}" - PATCHES=( "${FILESDIR}/${P}-find-qt.patch" "${FILESDIR}/${P}-fix-install.patch" @@ -116,7 +114,7 @@ src_configure() { cmake_src_configure # prepare /etc/env.d file - sed -e 's|VAR_CASROOT|'${EROOT%}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die + sed -e 's|VAR_CASROOT|'${ESYSROOT}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die sed -i -e 's|ros/lib|ros/'$(get_libdir)'|' "${T}/${PV}" || die # use TBB for memory allocation optimizations?