Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/
Date: Tue, 04 May 2021 22:03:02
Message-Id: 1620165707.da53808432edde9896401246635ea5e3c153c4fb.sam@gentoo
1 commit: da53808432edde9896401246635ea5e3c153c4fb
2 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
3 AuthorDate: Mon Apr 19 05:52:08 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue May 4 22:01:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da538084
7
8 sci-libs/opencascade: fix Qt dependency
9
10 Changes a dependency on dev-qt/linguist-tool
11
12 Closes: https://bugs.gentoo.org/783810
13 Package-Manager: Portage-3.0.18, Repoman-3.0.3
14 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
15 Closes: https://github.com/gentoo/gentoo/pull/20449
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 sci-libs/opencascade/opencascade-7.4.0-r4.ebuild | 18 ++++++++----------
19 1 file changed, 8 insertions(+), 10 deletions(-)
20
21 diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
22 index 2c5adfb7524..7a53a10d350 100644
23 --- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
24 +++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
25 @@ -9,19 +9,21 @@ EAPI=7
26
27 inherit check-reqs cmake flag-o-matic java-pkg-opt-2
28
29 +MY_PV="$(ver_rs 1- '_')"
30 +
31 DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
32 HOMEPAGE="https://www.opencascade.com"
33 -MY_PV="$(ver_rs 1- '_')"
34 SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
35 +S="${WORKDIR}/occt-V${MY_PV}"
36
37 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
38 SLOT="${PV}"
39 KEYWORDS="~amd64 ~arm64 ~x86"
40 -# gl2ps
41 -IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk"
42 +IUSE="debug doc +examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk"
43
44 REQUIRED_USE="
45 inspector? ( qt5 )
46 + qt5? ( examples )
47 ?? ( optimize tbb )
48 "
49
50 @@ -56,10 +58,8 @@ RDEPEND="
51 "
52 DEPEND="${RDEPEND}"
53 BDEPEND="
54 - doc? (
55 - app-doc/doxygen
56 - qt5? ( dev-qt/linguist-tools:5 )
57 - )
58 + doc? ( app-doc/doxygen )
59 + qt5? ( dev-qt/linguist-tools:5 )
60 "
61
62 # There's no easy way to test. Testing needs a rather big environment
63 @@ -71,8 +71,6 @@ CHECKREQS_DISK_BUILD="3584M"
64
65 CMAKE_BUILD_TYPE=Release
66
67 -S="${WORKDIR}/occt-V${MY_PV}"
68 -
69 PATCHES=(
70 "${FILESDIR}/${P}-find-qt.patch"
71 "${FILESDIR}/${P}-fix-install.patch"
72 @@ -116,7 +114,7 @@ src_configure() {
73 cmake_src_configure
74
75 # prepare /etc/env.d file
76 - sed -e 's|VAR_CASROOT|'${EROOT%}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
77 + sed -e 's|VAR_CASROOT|'${ESYSROOT}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
78 sed -i -e 's|ros/lib|ros/'$(get_libdir)'|' "${T}/${PV}" || die
79
80 # use TBB for memory allocation optimizations?