[arch-commits] Commit in vtk/trunk (PKGBUILD)

[Andrzej Giniewicz]

    Date: Thursday, December 4, 2014 @ 12:11:16
  Author: aginiewicz
Revision: 123439

upgpkg: vtk 6.1.0-4

vtk: get rid of bundled twisted and zope-interface, FS#43000

Modified:
  vtk/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-04 11:01:22 UTC (rev 123438)
+++ PKGBUILD	2014-12-04 11:11:16 UTC (rev 123439)
@@ -11,13 +11,13 @@
 pkgname=vtk
 pkgver=6.1.0
 _majorver=6.1
-pkgrel=3
+pkgrel=4
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org/'
 license=('BSD')
 depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt5-tools' 'lesstif' 'mariadb' 'hdf5' 'libgl')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'python2' 'tk' 'wget' 'python2-matplotlib' 'openmpi' 'gdal' 'unixodbc')
+makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'python2' 'tk' 'wget' 'python2-matplotlib' 'openmpi' 'gdal' 'unixodbc' 'python2-twisted')
 optdepends=('python2: python bindings'
             'java-runtime: java bindings'
             'tk: tcl bindings'
@@ -26,7 +26,9 @@
             'openmpi: parallel support'
             'gdal: module IO/GDAL'
             'unixodbc: module IO/ODBC'
-            'python2-matplotlib: for Matplotlib rendering')
+            'python2-matplotlib: for Matplotlib rendering'
+            'python2-twisted: for vtkWeb')
+provides=('python2-autobahn') # TODO: move it from AUR to make it an optdepend of vtkWeb instead of twisted
 source=("http://www.vtk.org/files/release/${_majorver}/VTK-${pkgver}.tar.gz"
         "http://www.vtk.org/files/release/${_majorver}/VTKData-${pkgver}.tar.gz"
         "http://www.vtk.org/files/release/${_majorver}/VTKLargeData-${pkgver}.tar.gz"
@@ -99,13 +101,14 @@
 
   # Move the vtk.jar to the arch-specific location
   install -dv "${pkgdir}/usr/share/java/vtk"
-  mv -v "${pkgdir}/usr/lib/vtk.jar" \
-    "${pkgdir}/usr/share/java/vtk"
+  mv -v "${pkgdir}/usr/lib/vtk.jar" "${pkgdir}/usr/share/java/vtk"
   rm -rf "${pkgdir}/usr/lib/vtk-${_majorver}/java"
 
   # Install license
   install -dv "${pkgdir}/usr/share/licenses/vtk"
-  install -m644 "${srcdir}/VTK-$pkgver/Copyright.txt" \
-    "${pkgdir}/usr/share/licenses/vtk"
+  install -m644 "${srcdir}/VTK-$pkgver/Copyright.txt" "${pkgdir}/usr/share/licenses/vtk"
+
+  # Get rid of twisted and zope-interface (FS#43000), because adding them as makedepends was not enough
+  rm -rf "${pkgdir}"/usr/lib/python2.7/site-packages/{twisted,zope}
 }