sci-libs/vtk: Add support to build all modules, #500814

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 40d15211793827b7ce57430539256d193399bf65..a7a773c7b6e0965061aa35c031f69c0780b826f0 100644 (file)
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.120 2014/12/26 12:19:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.121 2014/12/26 18:15:01 jlec Exp $
+
+  26 Dec 2014; Justin Lecher <jlec@gentoo.org> vtk-6.1.0.ebuild, metadata.xml:
+  Add support to build all modules, #500814
 
 *vtk-6.1.0 (26 Dec 2014)
 

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index e402b5c3c691d7a3536bdd5a9a777ebde2dc669d..cecc79b0c404b63894fb419ee737cd2c864860fd 100644 (file)
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX vtk-5.10.1-ffmpeg-1.patch 1626 SHA256 312402db11bbc47d1596a5c58ee127af6a5807dda2331df402ebcfe7e999ea7c SHA512 34a59c7229a9dbd63d2c346906536fc1d53965489ecb148b57fd2b4b71e7b428d3bd162aa008cc92d72c006720217bf9c72863f761b7cd9b7e2241be8c52f327 WHIRLPOOL 5319732317a82df89d37914f831bf516e66ff58cd5a4a7d2ae777d732590af6ec5f8dd9d90a59ac8f46c1e228483081ade46e0ee02c2bb6ce713fbfc4ce3c669
 AUX vtk-5.10.1-libav-9.patch 3474 SHA256 688b58df16c0fada2ef5ccca8c53a8029bd6b3a6eaaddec3a210ac880cba2120 SHA512 f22d8c215aa23b9e719598b034657a61092d326dd7e2ef0e7e68a1ff0d33e1a6523e0ae85fbc2a1e72c869a295b257563daef0842f67b27716ab2652d03bb447 WHIRLPOOL 2a0cf463926b4e06df02942a0f63aeb0a659da6f1ba85a456485691199de48d418ce2c222f39a3b69876961491bf3bcacb8b1272793e3f7785771cd474e8cb75
 AUX vtk-5.10.1-tcl8.6.patch 2339 SHA256 b4f3800267e77589267b6121820f0df4764b970dee75f256cdfb13a721ee1163 SHA512 0f7c53bbc2012ab2d2ad296adc305dcd3fcdb1cc47e8015c656b8b2cc626dcc0e61149bdaeb66945c19c6533a610a41cfc03d3b117d6959c2b7e32ae3da77564 WHIRLPOOL 6a8c3548cee051e97a975efe62f40c24aaa26e3d1a7afa2cde50ff19913ba6cb8eaf5fe9f0ce8febb7a1f0482b48917b5d26505bc2f40d3d560cada7865d25a2
@@ -35,6 +38,25 @@ DIST vtk-6.0.0.tar.gz 24170173 SHA256 426df543cffeacf21154dddcd2a6efbd91a586570a
 DIST vtkDocHtml-6.0.0.tar.gz 204228463 SHA256 f5324c4c197b0cacd19bf1e5721bb012d753d49526e224d9f2dd7412f34e4434 SHA512 b6d5660f3ae6046c63b22b613cab6822f45f6b30a09522277e32f941c75dc48e8c92abc4d7f02b17e3f4d8e625de6dce7f000acc79e2d588a13d1577c139291a WHIRLPOOL b951c4ee62639c6bada2e02c2fceddbdb730c76d80c61a6ed013d8d9878b78a697158f41f53d68b5d62e4baa1f9ecb88e2437490da7610970622a40ecb14db1f
 DIST vtkDocHtml-6.1.0.tar.gz 230827905 SHA256 e35d0f5b7905e5c827d8daa71ee61b14dc080445efad91f97583a2b9303c1813 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60 WHIRLPOOL bc1714223259953a605612c0da124ece60604989458b7de5cf24b37d0f4c339f50c07a13d899f218364e61a35f8e1ace126eda5e83acbc3fe4930b041df0f55d
 EBUILD vtk-6.0.0.ebuild 8955 SHA256 3239e4a33b4b76e6fb768ca45e44be9dfc94020d68cef2d5b2b3180e0b3f0f43 SHA512 e2bb3b2b23c897f3763c2048f5023f757086040bf16e59e2a14e67315b7f3b0513d0608c5b1bf4b1908b6af50e30aef3a9a287ea55f3fa58a60ff601549e1aaf WHIRLPOOL d973a364e1573d527da4e9d1595e137a621096a900b64bb0ca8d1939a2d26e6e26ddbc04a2783437b3a4e24fe901e3cdb60128868b68a24bf5d32212292b9cb0
-EBUILD vtk-6.1.0.ebuild 9986 SHA256 4ed96e1bf915fd48f2ff83ed5e36835775d2e9de8fbd8a499db14897225e21d0 SHA512 4c6d9e64a36c5291ed621c6f491a6815131a970dbdd7f66110bed77174d7f462a7370157f848ab801ab4562c122acb42691021d4dc8202f7d0330d2ffc348285 WHIRLPOOL 8f559e3d06ca635c8d6388d461caed834b48fc23b5ba725f0af3620858bc5e88f99e212a551fa38864f0853700ca2039de21b9982b4d033c9e247ae7901bdefe
-MISC ChangeLog 19612 SHA256 35fd7be045e359b1fefca0fe8dd40732d8be8d1e4b940056c840daa442084b88 SHA512 98b278ea4962d3bc0d5061fdccacc25c447217d110ffead167f6056d0a16b6070fcdc39a84b42c009e1cfdc5642d91d52e426a3c985fb93c0e6749660a433776 WHIRLPOOL c86b379cd408ec51d8a6391d4d71a04a81951f3a3457f0c424fb8fe5cdc2059229539ddc06b9d5c970c209ebed516643d6b67e8ad11ddcc975b6afd86f431c45
-MISC metadata.xml 1019 SHA256 6e123587285b568e31b9f66a1d79bb8c341a9e2e2046ce191539b9968328d5d0 SHA512 9f9f1dcdce0d322fd0eab91ea26f7cd042484e9d9631515964c63f707d9a4144197bb40000c9ff86f3c0500c38aade303875193794233f4aa8475ec4f2736c10 WHIRLPOOL bf720dd4b4ad35767a30859327c13faeb8ce7ac2cede94d80ac5c9699ab7e86cdc3cd412f0dfe033d5fd9dd9e995eab102c927eccd0920cd7fb2d2fbd5bf4976
+EBUILD vtk-6.1.0.ebuild 10295 SHA256 cba4aff9ffeabba43a46c4455e666e65695d479bf76407547abfa5d0c1b2fba9 SHA512 8935e7595217970b80fb965604695535a7a6d99453fca1eaa915b46705bcc667a9a454e04aeb859894a106e34ad1507cfab56c2074193668582176575ea966c3 WHIRLPOOL fbbc45df31530ab2c9188f8f6af1461d660a9f978121fb3354929b92d0a0bfb9355706533d08a30ecc4693123e9c214e338fc43e80d6f52685e96f5ec2e7526a
+MISC ChangeLog 19736 SHA256 c1fd1817304977ceb75a9aedcc0a37ebc30629fc988028ac52e6e4073d7cc810 SHA512 797fff0fb59d139c9f482c60360dead485cb4c7a74f6dff025861323fbeeb0a49bc31badee051f2b4e8eb7bcb0cedfc426e982367177c61608a3e23fc7fb87e8 WHIRLPOOL 18dbd3efa1ed457f49fae30da94ea3ea30d7ac132ad7aa969ed3c3a8930e3ba3cfb27fd214f9e37d00b50ee30ecf692255917fa277151305968d1f8721868dae
+MISC metadata.xml 1135 SHA256 4ded3033a3776deccd061166fbbe5cc43dc2c2a4a2d6b6cb34e850f7cdcc8c63 SHA512 f673c721db73ad0d7e7453d9344d1daf5558ba9cb00ffd3ccbd22d2bb512f80c9259b837834f30991443eaf44fb33f5cf39f790f84b8cd3b62aec9b5d467dab0 WHIRLPOOL f8d98412e37a0e86697c8752da55c2588f92730d7f5d3dd59d7c2503af68ad0694b754f98f87a1e7239a2537807e0ee8eceb23ea089cb5f704bdcc7642e1e90b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJUnaXPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirEqwQAJvNfEPhPCrHM6vUFpDMajJh
+F0gd0JZkesK4FIqnmTGCvFe9keMO+eYO4rj+Y9yIU0gyxRHYuceYOverFcnhDMPN
+xEG2C9DZRJrT1M3QWMxV9I+/IzAax54Cnu5r0m186MxGb6Q1IwVQRATh+54ZR1HZ
+t82G7xmVaFq4KWjL8ErePAKsKqF6miHrQtT+eqeGjKuLhqsvGB3UPxX2/kKcfh/o
+Sr7T8oMxrKJPh/PcApZDyz0JzuE9zbsm9BmeJQmQknPB3HGw/fYzUrd/YrrcCv+J
+ztbPDpTXr+/DwASOwQfppporuTwjAc51fmCjPPnbJXX12Cdm4aRpVJWEWaVK0b91
+iD4+lc5F95RQtqClWhh4mJZnIHrFiVKZ1FyCQxFeLHHaic09mYMBniFbZvh+Vb5I
+MHTKWR1yl8Bfv6hUsrRk4kASKQ3KGkFBgDXZflmXUukg6mZHLXZxEKumX2Fyo7oL
+02SMNIigeQUO7adXrKKCg1QbBUh3bj7WZuyCwxPPOM2OfrYr/BaKwJdDwZFVGyzs
+gAI5uU7C7lLv5l7Jisd2M7YjTjLHSWpTgdL9BBMv2nqZ8lrWqSPvqNefiSWFuJZp
+o15r/PoXcxWDzfqYvrQpFW5Kavhq8RQ5dilzYplBGHFiJ8PZIPFv2t12hixw/zTO
+wZtBlS+5W6rC0jn4Q/Vm
+=lyob
+-----END PGP SIGNATURE-----

diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index 5288039a7459a76aab036c426ac5efed3570caad..acf505463593ff78c3e8f4407d6d4c0591dab408 100644 (file)
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -8,6 +8,7 @@
     <name>Justin Lecher</name>
   </maintainer>
   <use>
+    <flag name="all-modules">Build all modules</flag>
     <flag name="boost">Add support for boost</flag>
     <flag name="cg">Use nvidia's cg shaders</flag>
     <flag name="gdal">Support for gdal formated data</flag>
@@ -19,6 +20,7 @@
     <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
     <flag name="views">Building Views modules</flag>
     <flag name="web">Install web component</flag>
+    <flag name="xdmf2">Support for xdmf2 formated data</flag>
     <flag name="R">Enable support for dev-lang/R</flag>
   </use>
 </pkgmetadata>

diff --git a/sci-libs/vtk/vtk-6.1.0.ebuild b/sci-libs/vtk/vtk-6.1.0.ebuild
index f29167caeeff309caca87cc43d73303ba68a67c3..3103cd874868b11519ccfef5cee6efdca7033e51 100644 (file)
--- a/sci-libs/vtk/vtk-6.1.0.ebuild
+++ b/sci-libs/vtk/vtk-6.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v 1.1 2014/12/26 12:19:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v 1.2 2014/12/26 18:15:01 jlec Exp $
 
 EAPI=5
 
@@ -29,11 +29,12 @@ LICENSE="BSD LGPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="
-       aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi mysql
-       odbc offscreen postgres python qt4 rendering smp tbb test theora tk tcl
-       video_cards_nvidia views web R +X"
+       all-modules aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi
+       mysql odbc offscreen postgres python qt4 rendering smp tbb test theora tk tcl
+       video_cards_nvidia views web xdmf2 R +X"
 
 REQUIRED_USE="
+       all-modules? ( python xdmf2 )
        java? ( qt4 )
        python? ( ${PYTHON_REQUIRED_USE} )
        tcl? ( rendering )
@@ -73,7 +74,9 @@ RDEPEND="
        gdal? ( sci-libs/gdal )
        java? ( >=virtual/jre-1.5 )
        kaapi? ( <sci-libs/xkaapi-3 )
-       mpi? ( virtual/mpi[cxx,romio] )
+       mpi? (
+               virtual/mpi[cxx,romio]
+               python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
        mysql? ( virtual/mysql )
        odbc? ( dev-db/unixODBC )
        offscreen? ( media-libs/mesa[osmesa] )
@@ -81,6 +84,7 @@ RDEPEND="
        python? (
                ${PYTHON_DEPS}
                dev-python/sip[${PYTHON_USEDEP}]
+               )
        )
        qt4? (
                dev-qt/designer:4
@@ -103,6 +107,7 @@ RDEPEND="
                        dev-python/zope-interface[${PYTHON_USEDEP}]
                        )
                )
+       xdmf2? ( sci-libs/xdmf2 )
        R? ( dev-lang/R )"
 DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )
@@ -136,9 +141,11 @@ src_prepare() {
                -i CMake/FindLIBPROJ4.cmake || die
 
        local x
-       # missing: alglib exodusII freerange ftgl jsoncpp libproj4 mrmpi verdict xdmf2
-       for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png tiff zlib; do
+       # missing: VPIC alglib exodusII freerange ftgl libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
+       for x in expat freetype gl2ps hdf5 jpeg jsoncpp libxml2 netcdf oggtheora png tiff zlib; do
+               ebegin "Dropping bundled ${x}"
                rm -r ThirdParty/${x}/vtk${x} || die
+               eend $?
        done
        rm -r \
                ThirdParty/AutobahnPython/autobahn \
@@ -186,7 +193,8 @@ src_configure() {
                -DVTK_USE_SYSTEM_PNG=ON
                -DVTK_USE_SYSTEM_TIFF=ON
                -DVTK_USE_SYSTEM_TWISTED=ON
-#              -DVTK_USE_SYSTEM_XDMF2=ON
+               -DVTK_USE_SYSTEM_XDMF2=OFF
+               -DVTK_USE_SYSTEM_XDMF3=OFF
                -DVTK_USE_SYSTEM_ZLIB=ON
                -DVTK_USE_SYSTEM_ZOPE=ON
                -DVTK_USE_SYSTEM_LIBRARIES=ON
@@ -205,6 +213,7 @@ src_configure() {
                $(cmake-utils_use_build doc DOCUMENTATION)
                $(cmake-utils_use_build examples EXAMPLES)
                $(cmake-utils_use_build test VTK_BUILD_ALL_MODULES_FOR_TESTS)
+               $(cmake-utils_use all-modules VTK_BUILD_ALL_MODULES)
                $(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
                $(cmake-utils_use imaging VTK_Group_Imaging)
                $(cmake-utils_use mpi VTK_Group_MPI)
@@ -218,7 +227,6 @@ src_configure() {
                $(cmake-utils_use python VTK_WRAP_PYTHON)
                $(cmake-utils_use python VTK_WRAP_PYTHON_SIP)
                $(cmake-utils_use tcl VTK_WRAP_TCL)
-#              -DVTK_BUILD_ALL_MODULES=ON
        )
 
        mycmakeargs+=(
@@ -237,8 +245,9 @@ src_configure() {
        # IO
        mycmakeargs+=(
                $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
-               $(cmake-utils_use gdal vtkIOGDAL)
-               $(cmake-utils_use json vtkIOGeoJSON)
+               $(cmake-utils_use gdal Module_vtkIOGDAL)
+               $(cmake-utils_use json Module_vtkIOGeoJSON)
+               $(cmake-utils_use xdmf2 Module_vtkIOXdmf2)
        )
        # Apple stuff, does it really work?
        mycmakeargs+=( $(cmake-utils_use aqua VTK_USE_COCOA) )