From: Markus Dittrich Date: Tue, 24 Apr 2007 14:12:10 +0000 (+0000) Subject: Version bump and removed old versions. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c7239a8536418e0ebb302d68d5191376c546de1;p=gentoo.git Version bump and removed old versions. Package-Manager: portage-2.1.2.4 --- diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog index 074e20923dad..091386422c47 100644 --- a/sci-libs/vtk/ChangeLog +++ b/sci-libs/vtk/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-libs/vtk # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.28 2007/04/16 08:20:44 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.29 2007/04/24 14:12:10 markusle Exp $ + +*vtk-5.0.3 (23 Apr 2007) + + 23 Apr 2007; Markus Dittrich + -files/vtk-qt-gentoo.patch, -vtk-5.0.0.ebuild, -vtk-5.0.1.ebuild, + +vtk-5.0.3.ebuild: + Version bump and removed old versions. Thanks much to Sebastien + Fabbro for his ebuild. 16 Apr 2007; Christian Faulhammer vtk-5.0.0.ebuild: moved from USE tcltk to tk, see bug 17808 diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 3f903598d2f9..c45496cb768b 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,53 +1,30 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX vtk-5.0.1-python2.5-gentoo.patch 419 RMD160 1efc90044670b8b57903a5374a73e566bf11879f SHA1 fb686e6d3f64a297cfcfc8375ee7e3d7e01146d2 SHA256 b548640a70834ef8d8d6e738b5d407d133135903789de35ef7e9fcf9ef1314d2 MD5 789db4f040cbaffcc7a92a835bb24d2c files/vtk-5.0.1-python2.5-gentoo.patch 419 RMD160 1efc90044670b8b57903a5374a73e566bf11879f files/vtk-5.0.1-python2.5-gentoo.patch 419 SHA256 b548640a70834ef8d8d6e738b5d407d133135903789de35ef7e9fcf9ef1314d2 files/vtk-5.0.1-python2.5-gentoo.patch 419 -AUX vtk-qt-gentoo.patch 593 RMD160 29e308fb44d79c8f204c47e508da909a390637af SHA1 769b7bffa534ce66be373e04bad169beeca2c3a9 SHA256 7976a5a10bb8f9621077841f8582fcc309837976266f353b3a3e9880d208eefd -MD5 ad3de5a28c8340c62a91d856af824772 files/vtk-qt-gentoo.patch 593 -RMD160 29e308fb44d79c8f204c47e508da909a390637af files/vtk-qt-gentoo.patch 593 -SHA256 7976a5a10bb8f9621077841f8582fcc309837976266f353b3a3e9880d208eefd files/vtk-qt-gentoo.patch 593 -DIST vtk-5.0.0.tar.gz 8305569 RMD160 5aec714c4d30ff0d60e0e89454345b176dc1fd18 SHA1 d0715c55aa35307d605642587240423a98b86b6a SHA256 335e7272ab6a35bbf9acba8db19a12507a705f75990099c2303bd83658d8bb6c -DIST vtk-5.0.1.tar.gz 8338236 RMD160 96874bf9ffc4162ae2a67018d8f8ccc32a529c7c SHA1 613d18576503acd9ebacec40683aa427622fc6e7 SHA256 1f7f6bb4df16e2c64a4493dd758b1de5fc6bf9260b7c5e96d316ad0da5fcfeff DIST vtk-5.0.2.tar.gz 8339510 RMD160 81b22986a31203e0d9434a159b2470936147a59f SHA1 0a574f481c65a3d188c48dfc4e284aa8f70bad84 SHA256 045f71e609f14877a1dc59cb9b2d697565ae727fdeab09d76a7c62d4a1f4421d -DIST vtkdata-5.0.0.tar.gz 22368991 RMD160 0ace18af83e4de48721ae0be8e04dec8dbac94f4 SHA1 ffd5e9d2a4f5d4a7dbf342d5f645bf46c4787653 SHA256 72e2b590d6aa5eeaa5b9ce8c90df76ba3f50cdd6b2c1e3923eb14faa1e8a35a4 -DIST vtkdata-5.0.1.tar.gz 22397812 RMD160 892777c3a5cda139f2843488a22c8628208e6306 SHA1 51f93126c0ffa9dc0582c13d336fb770b38a5428 SHA256 05080dd5c1edcb33edaa55bce13667c0fdaf35e8e679d9c0be76eecc35f1d7db +DIST vtk-5.0.3.tar.gz 8324346 RMD160 bc844d562d69bb8e74452ba238986522de9fea9e SHA1 a0c514f6a2b3735e779b1eb5d53b27ae9ef129b6 SHA256 3ba05f6cb33cfcfb9d448c332b9292d6fca836fd979249d086762a7ac1c65d5c DIST vtkdata-5.0.2.tar.gz 22397793 RMD160 93e649caaaef4e37aa4f9807c4d2b8420cd07cfd SHA1 ab853dfe0e8a48001a8db24d74799954965dffc3 SHA256 2a5f58d2fa5eb877ff5cc271baddec2e9ed90f83ba2d9b3ba46d7d1dc987c7f5 -EBUILD vtk-5.0.0.ebuild 8283 RMD160 b0ad14d1095fa42cfe2f11bf803b40b80a56e127 SHA1 e2674ddcc3b84029b354db5e9e157c692163fb4a SHA256 b13b413047a8df1c5b1df7cca90c4c42b43c8ba46c71df7653a287958653fdce -MD5 b007879c2dd623bb3428eca5eb36e95b vtk-5.0.0.ebuild 8283 -RMD160 b0ad14d1095fa42cfe2f11bf803b40b80a56e127 vtk-5.0.0.ebuild 8283 -SHA256 b13b413047a8df1c5b1df7cca90c4c42b43c8ba46c71df7653a287958653fdce vtk-5.0.0.ebuild 8283 -EBUILD vtk-5.0.1.ebuild 8408 RMD160 e3a86ff058bc4e1431df318e22e07c4a1b1b3f8c SHA1 e06d027fdc9e5879c5e3802010dcd17df6bc3c02 SHA256 a14ae5e0ba087e1605bb66232b8e11e4ec36dd10819288c36a8ca413b3e3267b -MD5 46a89aee9de0e18640e8144fac7107eb vtk-5.0.1.ebuild 8408 -RMD160 e3a86ff058bc4e1431df318e22e07c4a1b1b3f8c vtk-5.0.1.ebuild 8408 -SHA256 a14ae5e0ba087e1605bb66232b8e11e4ec36dd10819288c36a8ca413b3e3267b vtk-5.0.1.ebuild 8408 +DIST vtkdata-5.0.3.tar.gz 22399159 RMD160 574afa369e58448641ec418bc4a046cb6c895eb9 SHA1 2fa9d63f95c6b294365b04912a780865f1eae9a8 SHA256 c46e6ac5728b44df3a150faf47cf3c144a3284e15bb29ff685bf4b182b1db32a EBUILD vtk-5.0.2.ebuild 8371 RMD160 259b238fa303851c651f7a6cb0c36ab4514449d8 SHA1 dee67adb3346742815e70a119a30fe4ec0df96a9 SHA256 4001ba54ffe6c8fc2291d527b8f6d5f68a01d4cbd1e7767085efd98b00374c44 MD5 3ab1a3c117bfaf08a05d31daed7b4518 vtk-5.0.2.ebuild 8371 RMD160 259b238fa303851c651f7a6cb0c36ab4514449d8 vtk-5.0.2.ebuild 8371 SHA256 4001ba54ffe6c8fc2291d527b8f6d5f68a01d4cbd1e7767085efd98b00374c44 vtk-5.0.2.ebuild 8371 -MISC ChangeLog 5088 RMD160 2f3241f84bc9c78cde938de0b70c4b5504e4e247 SHA1 7ea31a67e08c55926adbfd15995fdb13dc0ee938 SHA256 9c581019c7517723790cfc8dca3cd97df468ea9194037aa0c1f737269cd0aa77 -MD5 ca2c57ea539f83562e82fd3f4d42b6bc ChangeLog 5088 -RMD160 2f3241f84bc9c78cde938de0b70c4b5504e4e247 ChangeLog 5088 -SHA256 9c581019c7517723790cfc8dca3cd97df468ea9194037aa0c1f737269cd0aa77 ChangeLog 5088 +EBUILD vtk-5.0.3.ebuild 8166 RMD160 1548c5025e62b7bd0833dc0e456378e654298db3 SHA1 7c8d34cee70daf5ec0e07ee33334574dad4b05fc SHA256 2b2715a023de7af68c07f782b11235558f85e46f8ba8eb0318a070ee5875f4d4 +MD5 7121693407e92412bd43eac46ad20ed1 vtk-5.0.3.ebuild 8166 +RMD160 1548c5025e62b7bd0833dc0e456378e654298db3 vtk-5.0.3.ebuild 8166 +SHA256 2b2715a023de7af68c07f782b11235558f85e46f8ba8eb0318a070ee5875f4d4 vtk-5.0.3.ebuild 8166 +MISC ChangeLog 5374 RMD160 aa900838bd193cb7b8f3c65cab1e5e455e1aa352 SHA1 36aa83dfa248bc272e148c2e4409bd3a6cbe0960 SHA256 38a8c2e90ebea16f251e90cb2ad650d2366c33762b9a062ec0aaaa569ae54e98 +MD5 11a68df607dec71b5026b446f11fa4ce ChangeLog 5374 +RMD160 aa900838bd193cb7b8f3c65cab1e5e455e1aa352 ChangeLog 5374 +SHA256 38a8c2e90ebea16f251e90cb2ad650d2366c33762b9a062ec0aaaa569ae54e98 ChangeLog 5374 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 metadata.xml 254 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701 metadata.xml 254 -MD5 d5b69fd9f59f78b6e311c0d8aa26837c files/digest-vtk-5.0.0 479 -RMD160 8776721f7471b276b1eafb6d19789003922001e3 files/digest-vtk-5.0.0 479 -SHA256 3a6c9807913e0fa464e7a1c161d111b61a9210522f75014765c4440bb39fa486 files/digest-vtk-5.0.0 479 -MD5 deb493f98779a365e72fa1438e9c4ec4 files/digest-vtk-5.0.1 479 -RMD160 e042cdaebb396cdeff3a3ed663e9e8de28bc3486 files/digest-vtk-5.0.1 479 -SHA256 b180e1ee179e494d6cc1b4a8fe3f987295ee6f01cd52eea7016a4497a3d81fb4 files/digest-vtk-5.0.1 479 MD5 b63aefed7133840a43a2f8465add74ca files/digest-vtk-5.0.2 479 RMD160 20216a2f476d58729223ce009392aa37dc481a3d files/digest-vtk-5.0.2 479 SHA256 0e1fc67835b6131e42c5c7784ee1ec5a49abcd6a66badef097a17a13a7d9bc10 files/digest-vtk-5.0.2 479 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFGIzHmNQqtfCuFneMRAg/MAJ0RrRFuSeTNgaU2z+2EE6NNtbBpFQCdE9w6 -uWjEuJZyfyCqg4WtW+pADmc= -=SAhY ------END PGP SIGNATURE----- +MD5 5d248723ad0634ca4b01cbcd2470244f files/digest-vtk-5.0.3 479 +RMD160 860f573fd6f49723d26573dd0144851282193134 files/digest-vtk-5.0.3 479 +SHA256 046d68ec061e885060742f5f3e872c12c038fa57d44d188c523f54e000b84a55 files/digest-vtk-5.0.3 479 diff --git a/sci-libs/vtk/files/digest-vtk-5.0.0 b/sci-libs/vtk/files/digest-vtk-5.0.0 deleted file mode 100644 index 34f78830df55..000000000000 --- a/sci-libs/vtk/files/digest-vtk-5.0.0 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 98a9cd026fcea70291af9a42a44ebba9 vtk-5.0.0.tar.gz 8305569 -RMD160 5aec714c4d30ff0d60e0e89454345b176dc1fd18 vtk-5.0.0.tar.gz 8305569 -SHA256 335e7272ab6a35bbf9acba8db19a12507a705f75990099c2303bd83658d8bb6c vtk-5.0.0.tar.gz 8305569 -MD5 5d0ab094b60a640180be40a1540cffed vtkdata-5.0.0.tar.gz 22368991 -RMD160 0ace18af83e4de48721ae0be8e04dec8dbac94f4 vtkdata-5.0.0.tar.gz 22368991 -SHA256 72e2b590d6aa5eeaa5b9ce8c90df76ba3f50cdd6b2c1e3923eb14faa1e8a35a4 vtkdata-5.0.0.tar.gz 22368991 diff --git a/sci-libs/vtk/files/digest-vtk-5.0.1 b/sci-libs/vtk/files/digest-vtk-5.0.1 deleted file mode 100644 index e03ed4810f3a..000000000000 --- a/sci-libs/vtk/files/digest-vtk-5.0.1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 c745e4baa1235850a13c983fd8b28b68 vtk-5.0.1.tar.gz 8338236 -RMD160 96874bf9ffc4162ae2a67018d8f8ccc32a529c7c vtk-5.0.1.tar.gz 8338236 -SHA256 1f7f6bb4df16e2c64a4493dd758b1de5fc6bf9260b7c5e96d316ad0da5fcfeff vtk-5.0.1.tar.gz 8338236 -MD5 2f1365c33ee5505298d34a93cf91b07d vtkdata-5.0.1.tar.gz 22397812 -RMD160 892777c3a5cda139f2843488a22c8628208e6306 vtkdata-5.0.1.tar.gz 22397812 -SHA256 05080dd5c1edcb33edaa55bce13667c0fdaf35e8e679d9c0be76eecc35f1d7db vtkdata-5.0.1.tar.gz 22397812 diff --git a/sci-libs/vtk/files/digest-vtk-5.0.3 b/sci-libs/vtk/files/digest-vtk-5.0.3 new file mode 100644 index 000000000000..bf87db5f63b2 --- /dev/null +++ b/sci-libs/vtk/files/digest-vtk-5.0.3 @@ -0,0 +1,6 @@ +MD5 0148a3d3c46d0599ab63e79f7f406609 vtk-5.0.3.tar.gz 8324346 +RMD160 bc844d562d69bb8e74452ba238986522de9fea9e vtk-5.0.3.tar.gz 8324346 +SHA256 3ba05f6cb33cfcfb9d448c332b9292d6fca836fd979249d086762a7ac1c65d5c vtk-5.0.3.tar.gz 8324346 +MD5 4752aa5a363eae72abf3cb5c1f0fe4d9 vtkdata-5.0.3.tar.gz 22399159 +RMD160 574afa369e58448641ec418bc4a046cb6c895eb9 vtkdata-5.0.3.tar.gz 22399159 +SHA256 c46e6ac5728b44df3a150faf47cf3c144a3284e15bb29ff685bf4b182b1db32a vtkdata-5.0.3.tar.gz 22399159 diff --git a/sci-libs/vtk/files/vtk-qt-gentoo.patch b/sci-libs/vtk/files/vtk-qt-gentoo.patch deleted file mode 100644 index ffe91e0f8329..000000000000 --- a/sci-libs/vtk/files/vtk-qt-gentoo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur VTK-old/Examples/GUI/Qt/Events/GUI.ui VTK/Examples/GUI/Qt/Events/GUI.ui ---- VTK-old/Examples/GUI/Qt/Events/GUI.ui 2005-01-28 15:23:54.000000000 -0500 -+++ VTK/Examples/GUI/Qt/Events/GUI.ui 2006-09-08 08:26:59.000000000 -0400 -@@ -186,9 +186,4 @@ - init() - destroy() - -- -- -- qvtkwidget.h -- qvtkwidget.h -- - diff --git a/sci-libs/vtk/vtk-5.0.0.ebuild b/sci-libs/vtk/vtk-5.0.0.ebuild deleted file mode 100644 index 4e73cabffb1c..000000000000 --- a/sci-libs/vtk/vtk-5.0.0.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.0.ebuild,v 1.11 2007/04/16 08:20:44 opfer Exp $ - -# TODO: need to fix Examples/CMakeLists.txt to build other examples - -inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg python qt3 - -# Short package version -SPV="$(get_version_component_range 1-2)" - -DESCRIPTION="The Visualization Toolkit" -HOMEPAGE="http://www.vtk.org" -SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz - examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz )" - -LICENSE="BSD" -KEYWORDS="~x86" -SLOT="0" -IUSE="doc examples java mpi patented python tk threads qt3 qt4" -RDEPEND="java? ( =virtual/jdk-1.4* ) - mpi? ( sys-cluster/mpich ) - python? ( >=dev-lang/python-2.0 ) - tk? ( >=dev-lang/tk-8.2.3 ) - dev-libs/expat - media-libs/jpeg - media-libs/libpng - media-libs/tiff - virtual/opengl - || ( x11-libs/libXmu virtual/x11 )" - -DEPEND="${RDEPEND} - >=dev-util/cmake-2.2.3 - qt3? ( $(qt_min_version 3.3.4) ) - qt4? ( >=x11-libs/qt-4.1.0 )" - -S="${WORKDIR}"/VTK - - -pkg_setup() { - if use qt3 && use qt4; then - echo - ewarn "qt3 and qt4 support for vtk are mutually exclusive and" - ewarn "qt4 support has therefore been enabled by default." - echo - fi - java-pkg_pkg_setup -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-qt-gentoo.patch -} - -src_compile() { - # gcc versions 3.2.x seem to have sse-related bugs that are - # triggered by VTK when compiling for pentium3/4 - if [ "$(gcc-major-version)" -eq 3 -a "$(gcc-minor-version)" -eq 2 -a \ - "$(get-flag -march)" == "-march=pentium4" ]; then - filter-mfpmath sse - filter-flags "-msse -msse2" - echo "$(get-flag -march)" - fi - - # Fix Examples cmake file - sed -e "s/MAKEPROGRAM/CMAKE_MAKE_PROGRAM/g" \ - -i ${S}/Examples/CMakeLists.txt || \ - die "Failed to fix examples CMakeList.txt" - - # build list of config variable define's to pass to cmake - local CMAKE_VARIABLES="" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_SKIP_RPATH:BOOL=YES" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_DIR:PATH=${S}" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_INSTALL_PREFIX:PATH=/usr" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_SHARED_LIBS:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_JPEG:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_PNG:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_TIFF:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_ZLIB:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_EXPAT:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_TESTING:BOOL=OFF" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_HYBRID:BOOL=ON" - - use examples && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_DATA_ROOT:PATH=/usr/share/${PN}/data -DBUILD_EXAMPLES:BOOL=ON" - if use java; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_JAVA:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_AWT_INCLUDE_PATH:PATH=`java-config -O`/include" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_INCLUDE_PATH:PATH=`java-config -O`/include" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_INCLUDE_PATH2:PATH=`java-config -O`/include/linux" - if [ "${ARCH}" == "amd64" ]; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/${ARCH}/libjawt.so" - else - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so" - fi - fi - - if use mpi; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_MPI:BOOL=ON" - use !threads && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_PARALLEL:BOOL=ON" - fi - - if use python; then - python_version - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_PYTHON:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPYTHON_INCLUDE_PATH:PATH=/usr/include/python${PYVER}" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPYTHON_LIBRARY:PATH=/usr/$(get_libdir)/libpython${PYVER}.so" - fi - - if use qt3 || use qt4 ; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_GUISUPPORT:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_QVTK:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_CPP:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_UI:BOOL=ON" - fi - - if use qt3; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR:PATH=/qt/3/plugins/${PN}" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DDESIRED_QT_VERSION:STRING=3" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_MOC_EXECUTABLE:FILEPATH=/usr/qt/3/bin/moc" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_UIC_EXECUTABLE:FILEPATH=/usr/qt/3/bin/uic" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_INCLUDE_DIR:PATH=/usr/qt/3/include" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_QMAKE_EXECUTABLE:PATH=/usr/qt/3/bin/qmake" - fi - - if use qt4; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR:PATH=/$(get_libdir)/qt4/plugins/${PN}" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DDESIRED_QT_VERSION:STRING=4" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_MOC_EXECUTABLE:FILEPATH=/usr/bin/moc" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_UIC_EXECUTABLE:FILEPATH=/usr/bin/uic" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_INCLUDE_DIR:PATH=/usr/include/qt4" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake" - fi - - if use tk; then - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_TCL:BOOL=ON" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_TK:BOOL=ON" - else - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_TCL:BOOL=OFF" - CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_TK:BOOL=OFF" - fi - - use threads && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_PARALLEL:BOOL=ON" - use patented && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_PATENTED:BOOL=ON" - use doc && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DDOCUMENTATION_HTML_HELP:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON" - - # run cmake twice to achieve proper - # configuration with cmake 2.2.x - cmake ${CMAKE_VARIABLES} . && cmake ${CMAKE_VARIABLES} . \ - || die "cmake configuration failed" - - # fix java.lang.OutOfMemoryError on amd64 (see bug #123178) - if use java && [ "${ARCH}" == "amd64" ]; then - sed -e "s/javac/javac -J-Xmx256m/" \ - -i "${S}"/Wrapping/Java/CMakeFiles/VTKBuildAll.dir/build.make \ - || die "Failed to patch javac" - fi - - emake -j1 || die "emake failed" -} - -src_install() { - # remove portage paths from dynamically created Type - # headers - sed -e "s:${S}/Common/::" \ - -e "s:${S}/Rendering/::" \ - -i "${S}"/Utilities/InstallOnly/*.cmake || \ - die "Failed to fix cmake files" - - make DESTDIR=${D} install || die "make install failed" - - # install docs - dohtml "${S}"/README.html || die "Failed to install docs" - - # install python modules - if use python; then - cd "${S}"/Wrapping/Python - docinto vtk_python - distutils_src_install - fi - - # install jar - use java && java-pkg_dojar "${S}"/bin/vtk.jar - - # install Tcl docs - docinto vtk_tcl - dodoc "${S}"/Wrapping/Tcl/README || \ - die "Failed to install Tcl docs" - - # install examples - if use examples; then - dodir /usr/share/${PN} || \ - die "Failed to create examples directory" - cp -pPR ${S}/Examples ${D}/usr/share/${PN}/examples || \ - die "Failed to copy example files" - - # fix example's permissions - find ${D}/usr/share/${PN}/examples -type d -exec \ - chmod 0755 {} \; || \ - die "Failed to fix example directories permissions" - find ${D}/usr/share/${PN}/examples -type f -exec \ - chmod 0644 {} \; || \ - die "Failed to fix example files permissions" - - cp -pPR ${WORKDIR}/VTKData ${D}/usr/share/${PN}/data || \ - die "Failed to copy data files" - - # fix data's permissions - find ${D}/usr/share/${PN}/data -type d -exec \ - chmod 0755 {} \; || \ - die "Failed to fix data directories permissions" - find ${D}/usr/share/${PN}/data -type f -exec \ - chmod 0644 {} \; || \ - die "Failed to fix data files permissions" - fi - - # environment - echo "VTK_DATA_ROOT=/usr/share/${PN}/data" >> ${T}/40${PN} - echo "VTK_DIR=/usr/lib/${PN}-${SPV}" >> ${T}/40${PN} - if use java; then - echo "CLASSPATH=/usr/share/${PN}/lib/${PN}.jar" >> ${T}/40${PN} - fi - doenvd ${T}/40${PN} -} - -pkg_postinst() { - if use patented; then - ewarn "Using patented code in VTK may require a license." - ewarn "For more information, please read:" - ewarn "http://public.kitware.com/cgi-bin/vtkfaq?req=show&file=faq07.005.htp" - fi -} diff --git a/sci-libs/vtk/vtk-5.0.1.ebuild b/sci-libs/vtk/vtk-5.0.3.ebuild similarity index 91% rename from sci-libs/vtk/vtk-5.0.1.ebuild rename to sci-libs/vtk/vtk-5.0.3.ebuild index 208a7e3a62d6..70e24b8a8ce9 100644 --- a/sci-libs/vtk/vtk-5.0.1.ebuild +++ b/sci-libs/vtk/vtk-5.0.3.ebuild @@ -1,8 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.1.ebuild,v 1.5 2006/11/18 15:49:25 markusle Exp $ - -# TODO: need to fix Examples/CMakeLists.txt to build other examples +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.3.ebuild,v 1.1 2007/04/24 14:12:10 markusle Exp $ inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 @@ -15,15 +13,16 @@ SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz )" LICENSE="BSD" -KEYWORDS="~x86" +KEYWORDS="~amd64 ~x86" SLOT="0" IUSE="doc examples mpi patented python tcl tk threads qt3 qt4" -RDEPEND="java? ( =virtual/jdk-1.4* ) - mpi? ( sys-cluster/mpich ) +RDEPEND="java? ( =virtual/jdk-1.5* ) + mpi? ( virtual/mpi ) python? ( >=dev-lang/python-2.0 ) tcl? ( >=dev-lang/tcl-8.2.3 ) tk? ( >=dev-lang/tk-8.2.3 ) dev-libs/expat + media-libs/freetype media-libs/jpeg media-libs/libpng media-libs/tiff @@ -48,14 +47,6 @@ pkg_setup() { fi } -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-qt-gentoo.patch - epatch "${FILESDIR}"/${P}-python2.5-gentoo.patch -} - src_compile() { # gcc versions 3.2.x seem to have sse-related bugs that are # triggered by VTK when compiling for pentium3/4 @@ -77,6 +68,7 @@ src_compile() { CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_DIR:PATH=${S}" CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_INSTALL_PREFIX:PATH=/usr" CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_SHARED_LIBS:BOOL=ON" + CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_FREETYPE:BOOL=ON" CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_JPEG:BOOL=ON" CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_PNG:BOOL=ON" CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_TIFF:BOOL=ON" @@ -84,6 +76,8 @@ src_compile() { CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_EXPAT:BOOL=ON" CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_TESTING:BOOL=OFF" CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_HYBRID:BOOL=ON" + CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_GL2PS:BOOL=ON" + CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_RENDERING:BOOL=ON" use examples && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_DATA_ROOT:PATH=/usr/share/${PN}/data -DBUILD_EXAMPLES:BOOL=ON" if use java; then @@ -156,13 +150,6 @@ src_compile() { cmake ${CMAKE_VARIABLES} . && cmake ${CMAKE_VARIABLES} . \ || die "cmake configuration failed" - # fix java.lang.OutOfMemoryError on amd64 (see bug #123178) - if use java && [ "${ARCH}" == "amd64" ]; then - sed -e "s/javac/javac -J-Xmx256m/" \ - -i "${S}"/Wrapping/Java/CMakeFiles/VTKBuildAll.dir/build.make \ - || die "Failed to patch javac" - fi - emake -j1 || die "emake failed" }