Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/
Date: Wed, 07 Jul 2021 20:05:57
Message-Id: 1625688284.33e9d55403254a688035003145520574f27f1b7d.ionen@gentoo
1 commit: 33e9d55403254a688035003145520574f27f1b7d
2 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
3 AuthorDate: Tue Jul 6 19:25:15 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 7 20:04:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e9d554
7
8 sci-libs/vtk: add subslot
9
10 Add a subslot to trigger automatic rebuilds on consumers on up- or
11 downgrades of the package.
12
13 Package-Manager: Portage-3.0.20, Repoman-3.0.3
14 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
15 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
16
17 sci-libs/vtk/vtk-8.2.0-r4.ebuild | 16 ++++++++--------
18 sci-libs/vtk/vtk-9.0.1.ebuild | 2 +-
19 2 files changed, 9 insertions(+), 9 deletions(-)
20
21 diff --git a/sci-libs/vtk/vtk-8.2.0-r4.ebuild b/sci-libs/vtk/vtk-8.2.0-r4.ebuild
22 index 5573bf1a4a7..2051e4d46bd 100644
23 --- a/sci-libs/vtk/vtk-8.2.0-r4.ebuild
24 +++ b/sci-libs/vtk/vtk-8.2.0-r4.ebuild
25 @@ -8,21 +8,21 @@ WEBAPP_OPTIONAL=yes
26 WEBAPP_MANUAL_SLOT=yes
27
28 # Short package version
29 -SPV="$(ver_cut 1-2)"
30 +MY_PV="$(ver_cut 1-2)"
31 inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake virtualx webapp
32
33 DESCRIPTION="The Visualization Toolkit"
34 HOMEPAGE="https://www.vtk.org/"
35 SRC_URI="
36 - https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
37 - doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
38 + https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz
39 + doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz )
40 examples? (
41 - https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
42 - https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
43 + https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz
44 + https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
45 )"
46
47 LICENSE="BSD LGPL-2"
48 -SLOT="0"
49 +SLOT="0/${MY_PV}"
50 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
51 IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
52 mysql odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
53 @@ -181,7 +181,7 @@ src_configure() {
54 -Wno-dev
55 -DVTK_DIR="${S}"
56 -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
57 - -DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${SPV}"
58 + -DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${MY_PV}"
59 -DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
60 -DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
61 -DVTK_CUSTOM_LIBRARY_SUFFIX=""
62 @@ -357,7 +357,7 @@ src_install() {
63 # environment
64 cat >> "${T}"/40${PN} <<- EOF || die
65 VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
66 - VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
67 + VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${MY_PV}
68 VTKHOME=${EPREFIX}/usr
69 EOF
70 doenvd "${T}"/40${PN}
71
72 diff --git a/sci-libs/vtk/vtk-9.0.1.ebuild b/sci-libs/vtk/vtk-9.0.1.ebuild
73 index 8c86ad38458..fde829fd737 100644
74 --- a/sci-libs/vtk/vtk-9.0.1.ebuild
75 +++ b/sci-libs/vtk/vtk-9.0.1.ebuild
76 @@ -30,7 +30,7 @@ SRC_URI="
77 S="${WORKDIR}/VTK-${PV}"
78
79 LICENSE="BSD LGPL-2"
80 -SLOT="0"
81 +SLOT="0/${MY_PV}"
82 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
83 # Note: external xdmf2 has no recognized target
84 IUSE="+X all-modules boost cuda doc examples ffmpeg gdal imaging java