Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sci-libs
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2006-06-12 12:38:38 +0000
committerMarkus Dittrich <markusle@gentoo.org>2006-06-12 12:38:38 +0000
commitabc1d5aa714b57d7c4f30f26afba94c06a9cc694 (patch)
tree9a6be8a05636c726afd1aadecdd1314f1b8cbc4e /sci-libs
parentVersion bump. (diff)
downloadhistorical-abc1d5aa714b57d7c4f30f26afba94c06a9cc694.tar.gz
historical-abc1d5aa714b57d7c4f30f26afba94c06a9cc694.tar.bz2
historical-abc1d5aa714b57d7c4f30f26afba94c06a9cc694.zip
Fix RDEPEND and cmake configuration such that tcl/tk is only pulled in and used if USE=tcltk. This closes bug #136324.
Package-Manager: portage-2.1
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/vtk/ChangeLog6
-rw-r--r--sci-libs/vtk/Manifest34
-rw-r--r--sci-libs/vtk/vtk-5.0.0.ebuild15
3 files changed, 33 insertions, 22 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 0ca1e72fdde1..0ce123239228 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.17 2006/04/27 22:29:18 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.18 2006/06/12 12:38:38 markusle Exp $
+
+ 11 Jun 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild:
+ Fix RDEPEND and cmake configuration such that tcl/tk is only
+ pulled in and used if USE=tcltk. This closes bug #136324.
27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest:
Fixing SHA256 digest, pass four
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 34d3f2db3a4f..b4296d7f8cd0 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,29 +1,29 @@
-AUX vtk-4.2.6-gcc34.patch 1739 RMD160 de155e60a0021c47beca599650f9bb77c59f0db4 SHA1 2a96e9230efc08ba83acbc6b458d8a6db142eedc SHA256 74ccd68d643424093df8f2de213cc4d7ed67a832e2272bbf3d3ea8f7595b0018 size 1739
+AUX vtk-4.2.6-gcc34.patch 1739 RMD160 de155e60a0021c47beca599650f9bb77c59f0db4 SHA1 2a96e9230efc08ba83acbc6b458d8a6db142eedc SHA256 74ccd68d643424093df8f2de213cc4d7ed67a832e2272bbf3d3ea8f7595b0018
MD5 7ba663b347dd89aa7ca2f19e50641057 files/vtk-4.2.6-gcc34.patch 1739
RMD160 de155e60a0021c47beca599650f9bb77c59f0db4 files/vtk-4.2.6-gcc34.patch 1739
SHA256 74ccd68d643424093df8f2de213cc4d7ed67a832e2272bbf3d3ea8f7595b0018 files/vtk-4.2.6-gcc34.patch 1739
-AUX vtk-qt3-qt4-gentoo.patch 593 RMD160 2baf9667618a55f30aef5322a5d824ed0053be4b SHA1 8ef6299b849ef3a3d129221451ed5e7b95cb7a92 SHA256 fab69a77e7cb6dc28645cb81119c8908461045f4e428646fdf3ee9f2bc4034da size 593
+AUX vtk-qt3-qt4-gentoo.patch 593 RMD160 2baf9667618a55f30aef5322a5d824ed0053be4b SHA1 8ef6299b849ef3a3d129221451ed5e7b95cb7a92 SHA256 fab69a77e7cb6dc28645cb81119c8908461045f4e428646fdf3ee9f2bc4034da
MD5 70064ac33fde02a4c8e08e6dcc9ed987 files/vtk-qt3-qt4-gentoo.patch 593
RMD160 2baf9667618a55f30aef5322a5d824ed0053be4b files/vtk-qt3-qt4-gentoo.patch 593
SHA256 fab69a77e7cb6dc28645cb81119c8908461045f4e428646fdf3ee9f2bc4034da files/vtk-qt3-qt4-gentoo.patch 593
-DIST VTK-4.2-LatestRelease.tar.gz 6073644 RMD160 71a092cf929cfaeeb8f297334cadb829209b9ad7 SHA256 0ba6513a1acf7a23fb8845c74c334d582e9a2ef1e477f74f10fa0ea14d17944e size 6073644
-DIST VTKData-4.2.tar.gz 19257005 RMD160 9ba7b6d90a072ddf228c192d5e13c2fcf749189c SHA256 7ef7ba4598c94af62d8add507a6d22f0a2f9e3ea7f459aa2a36b39f34ea32153 size 19257005
-DIST VTKDocHtml-4.2.tar.gz 20973979 RMD160 c28817c9274ba968a8afc7d775faaa601ecb419d SHA256 c2288fc858fd933da6a2579b7c3ae572a192a05dbdf0a44016cad054276de6b3 size 20973979
-DIST vtk-5.0.0.tar.gz 8305569 RMD160 5aec714c4d30ff0d60e0e89454345b176dc1fd18 SHA256 335e7272ab6a35bbf9acba8db19a12507a705f75990099c2303bd83658d8bb6c size 8305569
-DIST vtkdata-5.0.0.tar.gz 22368991 RMD160 0ace18af83e4de48721ae0be8e04dec8dbac94f4 SHA256 72e2b590d6aa5eeaa5b9ce8c90df76ba3f50cdd6b2c1e3923eb14faa1e8a35a4 size 22368991
-EBUILD vtk-4.2.6.ebuild 5768 RMD160 96a37816b7b28dd87abc6389608b47e9a6a6c477 SHA1 4695b7d398fdbf50ea3cb9cff9670fe831f08730 SHA256 c0b6175c198c86d93fd34a4b01bfe0ab0af8efbe8884e740c389f861f836447f size 5768
+DIST VTK-4.2-LatestRelease.tar.gz 6073644 RMD160 71a092cf929cfaeeb8f297334cadb829209b9ad7 SHA1 31ab01c16b3d44ce201d8180af431833cf6527d8 SHA256 0ba6513a1acf7a23fb8845c74c334d582e9a2ef1e477f74f10fa0ea14d17944e
+DIST VTKData-4.2.tar.gz 19257005 RMD160 9ba7b6d90a072ddf228c192d5e13c2fcf749189c SHA1 059e42b32e1f1f575defd5ee2683c56781a788a4 SHA256 7ef7ba4598c94af62d8add507a6d22f0a2f9e3ea7f459aa2a36b39f34ea32153
+DIST VTKDocHtml-4.2.tar.gz 20973979 RMD160 c28817c9274ba968a8afc7d775faaa601ecb419d SHA256 c2288fc858fd933da6a2579b7c3ae572a192a05dbdf0a44016cad054276de6b3
+DIST vtk-5.0.0.tar.gz 8305569 RMD160 5aec714c4d30ff0d60e0e89454345b176dc1fd18 SHA1 d0715c55aa35307d605642587240423a98b86b6a SHA256 335e7272ab6a35bbf9acba8db19a12507a705f75990099c2303bd83658d8bb6c
+DIST vtkdata-5.0.0.tar.gz 22368991 RMD160 0ace18af83e4de48721ae0be8e04dec8dbac94f4 SHA1 ffd5e9d2a4f5d4a7dbf342d5f645bf46c4787653 SHA256 72e2b590d6aa5eeaa5b9ce8c90df76ba3f50cdd6b2c1e3923eb14faa1e8a35a4
+EBUILD vtk-4.2.6.ebuild 5768 RMD160 96a37816b7b28dd87abc6389608b47e9a6a6c477 SHA1 4695b7d398fdbf50ea3cb9cff9670fe831f08730 SHA256 c0b6175c198c86d93fd34a4b01bfe0ab0af8efbe8884e740c389f861f836447f
MD5 748f5f3854a501ae6f6e0169dbd5dbde vtk-4.2.6.ebuild 5768
RMD160 96a37816b7b28dd87abc6389608b47e9a6a6c477 vtk-4.2.6.ebuild 5768
SHA256 c0b6175c198c86d93fd34a4b01bfe0ab0af8efbe8884e740c389f861f836447f vtk-4.2.6.ebuild 5768
-EBUILD vtk-5.0.0.ebuild 7890 RMD160 ac3841840e333e14803c951251d02b1a7a7ea02b SHA1 3f2ca34ce613d0b3635530c0c62894023dde0294 SHA256 7f085cc2e7d396e029eaa6601bfd31ea2f951c489bd3d0603578ece9d3788306 size 7890
-MD5 1174f31288775bd750b1cf9e0d4c9533 vtk-5.0.0.ebuild 7890
-RMD160 ac3841840e333e14803c951251d02b1a7a7ea02b vtk-5.0.0.ebuild 7890
-SHA256 7f085cc2e7d396e029eaa6601bfd31ea2f951c489bd3d0603578ece9d3788306 vtk-5.0.0.ebuild 7890
-MISC ChangeLog 3026 RMD160 04a70e6c1d855a9818719cba0ca761df476f4a46 SHA1 cf2e82f41168c6e1d8159f89e0659ae54c891084 SHA256 d833324b99af3b4f179549058723092639a1adc8ee69fcbeda0f4032981f1ce3 size 3026
-MD5 44f41dcccdb3255cebf3d63853a74823 ChangeLog 3026
-RMD160 04a70e6c1d855a9818719cba0ca761df476f4a46 ChangeLog 3026
-SHA256 d833324b99af3b4f179549058723092639a1adc8ee69fcbeda0f4032981f1ce3 ChangeLog 3026
-MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701 size 254
+EBUILD vtk-5.0.0.ebuild 8106 RMD160 4fccca6b79b17bbe8e506690154df0dde2bc6a39 SHA1 10f388defb22ef9facc817b96eb3953a1676f8bd SHA256 df4704955f4eb88d6cfdd9e7d0a80236e8f08e147e8693c08b4aa50b6d518dc5
+MD5 61aed57e4f30a1525963ae24a1516367 vtk-5.0.0.ebuild 8106
+RMD160 4fccca6b79b17bbe8e506690154df0dde2bc6a39 vtk-5.0.0.ebuild 8106
+SHA256 df4704955f4eb88d6cfdd9e7d0a80236e8f08e147e8693c08b4aa50b6d518dc5 vtk-5.0.0.ebuild 8106
+MISC ChangeLog 3223 RMD160 aa77fbb4439eaee52ee6a1e8aec4533b896a2052 SHA1 df9706c03fa838467eefdabe01ddf55522124cb6 SHA256 9016f74ceed4c8d55a3eebb4ec88af70867dcc80b759b958a51f61d24f346d7f
+MD5 10f05fb9af05e7cac679189f71ee864e ChangeLog 3223
+RMD160 aa77fbb4439eaee52ee6a1e8aec4533b896a2052 ChangeLog 3223
+SHA256 9016f74ceed4c8d55a3eebb4ec88af70867dcc80b759b958a51f61d24f346d7f ChangeLog 3223
+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
diff --git a/sci-libs/vtk/vtk-5.0.0.ebuild b/sci-libs/vtk/vtk-5.0.0.ebuild
index 0c33ba83bdba..4c913bbf1e84 100644
--- a/sci-libs/vtk/vtk-5.0.0.ebuild
+++ b/sci-libs/vtk/vtk-5.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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.5 2006/04/21 02:18:26 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.0.ebuild,v 1.6 2006/06/12 12:38:38 markusle Exp $
# TODO: need to fix Examples/CMakeLists.txt to build other examples
@@ -21,8 +21,8 @@ IUSE="doc examples java mpi patented python tcltk threads qt3 qt4"
RDEPEND="java? ( virtual/jdk )
mpi? ( sys-cluster/mpich )
python? ( >=dev-lang/python-2.0 )
- >=dev-lang/tcl-8.2.3
- >=dev-lang/tk-8.2.3
+ tcltk? ( >=dev-lang/tcl-8.2.3
+ >=dev-lang/tk-8.2.3 )
dev-libs/expat
media-libs/jpeg
media-libs/libpng
@@ -123,7 +123,14 @@ src_compile() {
CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake"
fi
- use tcltk && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_TCL:BOOL=ON"
+ if use tcltk; 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"