sci-libs/vtk: Sort (R)DEPENDs

Package-Manager: Portage-2.3.13, Repoman-2.3.4

2 files changed, 28 insertions, 25 deletions

diff --git a/sci-libs/vtk/vtk-6.1.0-r4.ebuild b/sci-libs/vtk/vtk-6.1.0-r4.ebuild
index d93b08dc870f..13badd6cfd51 100644
--- a/sci-libs/vtk/vtk-6.1.0-r4.ebuild
+++ b/sci-libs/vtk/vtk-6.1.0-r4.ebuild
@@ -77,6 +77,7 @@ RDEPEND="
 	mpi? (
 		virtual/mpi[cxx,romio]
 		python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
+	)
 	mysql? ( virtual/mysql )
 	odbc? ( dev-db/unixODBC )
 	offscreen? ( media-libs/mesa[osmesa] )
@@ -84,7 +85,6 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		dev-python/sip[${PYTHON_USEDEP}]
-		)
 	)
 	qt5? (
 		dev-qt/designer:5
@@ -94,7 +94,8 @@ RDEPEND="
 		dev-qt/qtsql:5
 		dev-qt/qtwebkit:5
 		python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-		)
+	)
+	R? ( dev-lang/R )
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
@@ -108,10 +109,11 @@ RDEPEND="
 			)
 		)
 	xdmf2? ( sci-libs/xdmf2 )
-	R? ( dev-lang/R )"
+"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.5 )"
+	java? ( >=virtual/jdk-1.5 )
+"
 
 S="${WORKDIR}"/VTK-${PV}
 
@@ -125,9 +127,9 @@ PATCHES=(
 	"${FILESDIR}"/${P}-memset.patch
 	"${FILESDIR}"/${P}-gdal2.patch
 	"${FILESDIR}"/${P}-gcc67.patch
-	)
+)
 
-RESTRICT=test
+RESTRICT="test"
 
 pkg_setup() {
 	use java && java-pkg-opt-2_pkg_setup
diff --git a/sci-libs/vtk/vtk-7.1.0.ebuild b/sci-libs/vtk/vtk-7.1.0.ebuild
index 0ed71fe076f3..8c9bff9d54a5 100644
--- a/sci-libs/vtk/vtk-7.1.0.ebuild
+++ b/sci-libs/vtk/vtk-7.1.0.ebuild
@@ -43,10 +43,24 @@ REQUIRED_USE="
 	"
 
 RDEPEND="
-	boost? ( dev-libs/boost:=[mpi?] )
 	dev-libs/expat
 	dev-libs/jsoncpp:=
 	dev-libs/libxml2:2
+	>=media-libs/freetype-2.5.4
+	media-libs/libpng:0=
+	media-libs/libtheora
+	media-libs/mesa
+	media-libs/tiff:0
+	sci-libs/exodusii
+	sci-libs/hdf5:=
+	sci-libs/netcdf-cxx:3
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	boost? ( dev-libs/boost:=[mpi?] )
 	examples? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -56,11 +70,6 @@ RDEPEND="
 	gdal? ( sci-libs/gdal )
 	java? ( >=virtual/jdk-1.7:* )
 	kaapi? ( <sci-libs/xkaapi-3 )
-	>=media-libs/freetype-2.5.4
-	media-libs/libpng:0=
-	media-libs/mesa
-	media-libs/libtheora
-	media-libs/tiff:0
 	mpi? (
 		virtual/mpi[cxx,romio]
 		python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
@@ -83,16 +92,10 @@ RDEPEND="
 		python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
 	)
 	R? ( dev-lang/R )
-	sci-libs/exodusii
-	sci-libs/hdf5:=
-	sci-libs/netcdf-cxx:3
-	sys-libs/zlib
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
 	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
-	virtual/jpeg:0
-	virtual/opengl
 	web? (
 		${WEBAPP_DEPEND}
 		dev-python/autobahn[${PYTHON_USEDEP}]
@@ -100,21 +103,19 @@ RDEPEND="
 		dev-python/zope-interface[${PYTHON_USEDEP}]
 	)
 	xdmf2? ( sci-libs/xdmf2 )
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt"
-
+"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+"
 
 S="${WORKDIR}"/VTK-${PV}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.0-glext.patch
 	"${FILESDIR}"/${PN}-6.1.0-memset.patch
-	)
+)
 
-RESTRICT=test
+RESTRICT="test"
 
 pkg_setup() {
 	use java && java-pkg-opt-2_pkg_setup