Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/
Date: Sat, 17 Jul 2021 18:18:27
Message-Id: 1626545825.5c2fe7c8a0c22b766f7da750daa2caf6881393fa.soap@gentoo
1 commit: 5c2fe7c8a0c22b766f7da750daa2caf6881393fa
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 17 18:17:05 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 17 18:17:05 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2fe7c8
7
8 sci-libs/vtk: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 sci-libs/vtk/vtk-8.2.0-r4.ebuild | 24 ++++++++++++------------
13 sci-libs/vtk/vtk-9.0.1.ebuild | 8 ++++----
14 2 files changed, 16 insertions(+), 16 deletions(-)
15
16 diff --git a/sci-libs/vtk/vtk-8.2.0-r4.ebuild b/sci-libs/vtk/vtk-8.2.0-r4.ebuild
17 index 2051e4d46bd..2cfd6476f0a 100644
18 --- a/sci-libs/vtk/vtk-8.2.0-r4.ebuild
19 +++ b/sci-libs/vtk/vtk-8.2.0-r4.ebuild
20 @@ -3,7 +3,7 @@
21
22 EAPI=7
23
24 -PYTHON_COMPAT=( python3_{7,8,9} )
25 +PYTHON_COMPAT=( python3_{8,9} )
26 WEBAPP_OPTIONAL=yes
27 WEBAPP_MANUAL_SLOT=yes
28
29 @@ -80,7 +80,7 @@ RDEPEND="
30 mpi? (
31 virtual/mpi[cxx,romio]
32 $(python_gen_cond_dep '
33 - python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
34 + python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
35 ')
36 )
37 mysql? ( dev-db/mysql-connector-c )
38 @@ -90,7 +90,7 @@ RDEPEND="
39 python? (
40 ${PYTHON_DEPS}
41 $(python_gen_cond_dep '
42 - dev-python/sip:5[${PYTHON_MULTI_USEDEP}]
43 + dev-python/sip:5[${PYTHON_USEDEP}]
44 ')
45 )
46 qt5? (
47 @@ -101,7 +101,7 @@ RDEPEND="
48 dev-qt/qtsql:5
49 dev-qt/qtx11extras:5
50 $(python_gen_cond_dep '
51 - python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
52 + python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
53 ')
54 )
55 R? ( dev-lang/R )
56 @@ -112,14 +112,14 @@ RDEPEND="
57 web? (
58 ${WEBAPP_DEPEND}
59 $(python_gen_cond_dep '
60 - dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
61 - dev-python/constantly[${PYTHON_MULTI_USEDEP}]
62 - dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
63 - dev-python/incremental[${PYTHON_MULTI_USEDEP}]
64 - dev-python/six[${PYTHON_MULTI_USEDEP}]
65 - dev-python/twisted[${PYTHON_MULTI_USEDEP}]
66 - dev-python/txaio[${PYTHON_MULTI_USEDEP}]
67 - dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
68 + dev-python/autobahn[${PYTHON_USEDEP}]
69 + dev-python/constantly[${PYTHON_USEDEP}]
70 + dev-python/hyperlink[${PYTHON_USEDEP}]
71 + dev-python/incremental[${PYTHON_USEDEP}]
72 + dev-python/six[${PYTHON_USEDEP}]
73 + dev-python/twisted[${PYTHON_USEDEP}]
74 + dev-python/txaio[${PYTHON_USEDEP}]
75 + dev-python/zope-interface[${PYTHON_USEDEP}]
76 ')
77 )
78 "
79
80 diff --git a/sci-libs/vtk/vtk-9.0.1.ebuild b/sci-libs/vtk/vtk-9.0.1.ebuild
81 index fde829fd737..6e0717f814c 100644
82 --- a/sci-libs/vtk/vtk-9.0.1.ebuild
83 +++ b/sci-libs/vtk/vtk-9.0.1.ebuild
84 @@ -7,7 +7,7 @@ EAPI=7
85 # - add USE flag for remote modules? Those modules can be downloaded
86 # properly before building.
87
88 -PYTHON_COMPAT=( python3_{7,8,9} )
89 +PYTHON_COMPAT=( python3_{8,9} )
90 WEBAPP_OPTIONAL=yes
91 WEBAPP_MANUAL_SLOT=yes
92
93 @@ -107,9 +107,9 @@ RDEPEND="
94 web? ( ${WEBAPP_DEPEND} )
95 $(python_gen_cond_dep '
96 python? (
97 - boost? ( dev-libs/boost:=[mpi?,python?,${PYTHON_MULTI_USEDEP}] )
98 - gdal? ( sci-libs/gdal:=[python?,${PYTHON_MULTI_USEDEP}] )
99 - mpi? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
100 + boost? ( dev-libs/boost:=[mpi?,python?,${PYTHON_USEDEP}] )
101 + gdal? ( sci-libs/gdal:=[python?,${PYTHON_USEDEP}] )
102 + mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
103 )
104 ')
105 "