commit: 9cc2b9ffedb5a5844feb9d499b14626d63b4fd2a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 6 08:39:09 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 6 09:41:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc2b9ff
sci-libs/vtk: Fix EAPI-7 bump and break up python_gen_cond_dep scope
Sorting, BDEPEND, quotes and indendation
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/vtk/vtk-8.2.0.ebuild | 63 ++++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 30 deletions(-)
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
index 3a04f54a0aa..c9ab9cf4bdb 100644
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -7,10 +7,9 @@ PYTHON_COMPAT=( python3_{6,7} )
WEBAPP_OPTIONAL=yes
WEBAPP_MANUAL_SLOT=yes
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
toolchain-funcs cmake-utils virtualx webapp
-
# Short package version
SPV="$(ver_cut 1-2)"
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
toolchain-funcs cmake-utils virtualx webapp
DESCRIPTION="The Visualization Toolkit"
HOMEPAGE="https://www.vtk.org/";
@@ -23,12 +22,11 @@ SRC_URI="
)"
LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
-IUSE="
- all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi
- odbc offscreen postgres python qt5 rendering tbb theora tk tcl
- video_cards_nvidia views web R +X xdmf2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi
+ odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
+ video_cards_nvidia views web +X xdmf2"
REQUIRED_USE="
all-modules? ( python xdmf2 boost )
@@ -49,8 +47,8 @@ RDEPEND="
dev-libs/jsoncpp:=
dev-libs/libxml2:2
dev-libs/pugixml
- media-libs/glew:0=
>=media-libs/freetype-2.5.4
+ media-libs/glew:0=
>=media-libs/libharu-2.3.0-r2
media-libs/libpng:0=
media-libs/libtheora
@@ -74,9 +72,32 @@ RDEPEND="
ffmpeg? ( media-video/ffmpeg )
gdal? ( sci-libs/gdal )
java? ( >=virtual/jdk-1.7:* )
+ mpi? (
+ virtual/mpi[cxx,romio]
+ $(python_gen_cond_dep '
+ python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+ ')
+ )
odbc? ( dev-db/unixODBC )
offscreen? ( media-libs/mesa[osmesa] )
postgres? ( dev-db/postgresql:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ qt5? (
+ dev-qt/designer:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtsql:5
+ dev-qt/qtx11extras:5
+ $(python_gen_cond_dep '
+ python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+ ')
+ )
R? ( dev-lang/R )
tbb? ( dev-cpp/tbb )
tcl? ( dev-lang/tcl:0= )
@@ -96,32 +117,14 @@ RDEPEND="
')
)
xdmf2? ( sci-libs/xdmf2 )
- $(python_gen_cond_dep "
- mpi? (
- virtual/mpi[cxx,romio]
- python? ( dev-python/mpi4py[\${PYTHON_MULTI_USEDEP}] )
- )
- python? (
- ${PYTHON_DEPS}
- dev-python/sip[\${PYTHON_MULTI_USEDEP}]
- )
- qt5? (
- dev-qt/designer:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtsql:5
- dev-qt/qtx11extras:5
- python? ( dev-python/PyQt5[\${PYTHON_MULTI_USEDEP}] )
- )
- ")"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
S="${WORKDIR}"/VTK-${PV}
PATCHES=(
- "${FILESDIR}"/vtk-8.1.0-openmpi-4-compatibility.patch
+ "${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
)
RESTRICT="test"
