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/vtk/
Date: Wed, 02 Jun 2021 01:24:45
Message-Id: 1622597003.4342b5087bd84cbe64de318c152b5425ec7f8d7b.sam@gentoo
1 commit: 4342b5087bd84cbe64de318c152b5425ec7f8d7b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 2 01:23:23 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 2 01:23:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4342b508
7
8 sci-libs/vtk: delete README from bundled vtkm for now
9
10 Avoids collision with paraview. We'll ideally try to get paraview
11 building with system VTK again but VTK takes a while to build so
12 anything to prevent collisions for users now is important while
13 we investigate that possibility.
14
15 Bug: https://bugs.gentoo.org/253881
16 Bug: https://bugs.gentoo.org/793221
17 Signed-off-by: Sam James <sam <AT> gentoo.org>
18
19 sci-libs/vtk/vtk-9.0.1.ebuild | 5 +++++
20 1 file changed, 5 insertions(+)
21
22 diff --git a/sci-libs/vtk/vtk-9.0.1.ebuild b/sci-libs/vtk/vtk-9.0.1.ebuild
23 index 848e2fce63d..8c86ad38458 100644
24 --- a/sci-libs/vtk/vtk-9.0.1.ebuild
25 +++ b/sci-libs/vtk/vtk-9.0.1.ebuild
26 @@ -515,6 +515,11 @@ src_install() {
27 doenvd "${T}"/40${PN}
28
29 use web && webapp_src_install
30 +
31 + # Temporary!
32 + # Avoid collision with paraview.
33 + # bug #793221
34 + rm -rf "${ED}"/usr/share/vtkm-1.5/VTKm{LICENSE.txt,README.md} || die
35 }
36
37 # webapp.eclass exports these but we want it optional #534036