moved from USE tcltk to tk, see bug 17808

Package-Manager: portage-2.1.2.2

3 files changed, 30 insertions, 18 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index aa667e9f0778..074e20923dad 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,9 @@
 # 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.27 2006/12/02 15:01:23 markusle Exp $
+# 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 $
+
+  16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> vtk-5.0.0.ebuild:
+  moved from USE tcltk to tk, see bug 17808
 
 *vtk-5.0.2 (02 Dec 2006)
 
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index f7501134b066..3f903598d2f9 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -12,10 +15,10 @@ DIST vtk-5.0.2.tar.gz 8339510 RMD160 81b22986a31203e0d9434a159b2470936147a59f SH
 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 vtkdata-5.0.2.tar.gz 22397793 RMD160 93e649caaaef4e37aa4f9807c4d2b8420cd07cfd SHA1 ab853dfe0e8a48001a8db24d74799954965dffc3 SHA256 2a5f58d2fa5eb877ff5cc271baddec2e9ed90f83ba2d9b3ba46d7d1dc987c7f5
-EBUILD vtk-5.0.0.ebuild 8319 RMD160 b80bdacb3590b98e018002bd56ddcf68861d708e SHA1 3dc4987254bb1a115df4be2d3e887772af25a070 SHA256 8f34d2d81e54073598b1238f67516d0f423fa276168696bd2ebe023d2fd271d9
-MD5 57148df90a09df938d3fe860da810668 vtk-5.0.0.ebuild 8319
-RMD160 b80bdacb3590b98e018002bd56ddcf68861d708e vtk-5.0.0.ebuild 8319
-SHA256 8f34d2d81e54073598b1238f67516d0f423fa276168696bd2ebe023d2fd271d9 vtk-5.0.0.ebuild 8319
+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
@@ -24,10 +27,10 @@ EBUILD vtk-5.0.2.ebuild 8371 RMD160 259b238fa303851c651f7a6cb0c36ab4514449d8 SHA
 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 4973 RMD160 66515a189c4493426e18e7b56df0f49839e682e7 SHA1 0b558ef377d363ca65991f83a3e914a12b18f173 SHA256 b887e93194fa064d87f07d746b19f435ca52fe871c6804f1725edae0cfd37a4f
-MD5 08ecf8bb593ab3fb95e5d451c69f2aca ChangeLog 4973
-RMD160 66515a189c4493426e18e7b56df0f49839e682e7 ChangeLog 4973
-SHA256 b887e93194fa064d87f07d746b19f435ca52fe871c6804f1725edae0cfd37a4f ChangeLog 4973
+MISC ChangeLog 5088 RMD160 2f3241f84bc9c78cde938de0b70c4b5504e4e247 SHA1 7ea31a67e08c55926adbfd15995fdb13dc0ee938 SHA256 9c581019c7517723790cfc8dca3cd97df468ea9194037aa0c1f737269cd0aa77
+MD5 ca2c57ea539f83562e82fd3f4d42b6bc ChangeLog 5088
+RMD160 2f3241f84bc9c78cde938de0b70c4b5504e4e247 ChangeLog 5088
+SHA256 9c581019c7517723790cfc8dca3cd97df468ea9194037aa0c1f737269cd0aa77 ChangeLog 5088
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254
 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 metadata.xml 254
@@ -41,3 +44,10 @@ SHA256 b180e1ee179e494d6cc1b4a8fe3f987295ee6f01cd52eea7016a4497a3d81fb4 files/di
 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-----
diff --git a/sci-libs/vtk/vtk-5.0.0.ebuild b/sci-libs/vtk/vtk-5.0.0.ebuild
index 1d1fb8a973cd..4e73cabffb1c 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
+# 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.10 2006/10/14 00:00:58 nichoj Exp $
+# $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
 
@@ -17,12 +17,11 @@ SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
 LICENSE="BSD"
 KEYWORDS="~x86"
 SLOT="0"
-IUSE="doc examples java mpi patented python tcltk threads qt3 qt4"
+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 )
-	tcltk? ( >=dev-lang/tcl-8.2.3
-			>=dev-lang/tk-8.2.3 )
+	tk? ( >=dev-lang/tk-8.2.3 )
 	dev-libs/expat
 	media-libs/jpeg
 	media-libs/libpng
@@ -56,7 +55,7 @@ src_unpack() {
 }
 
 src_compile() {
-	# gcc versions 3.2.x seem to have sse-related bugs that are 
+	# 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
@@ -134,7 +133,7 @@ src_compile() {
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake"
 	fi
 
-	if use tcltk; then
+	if use tk; then
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_TCL:BOOL=ON"
 		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_TK:BOOL=ON"
 	else
@@ -162,7 +161,7 @@ src_compile() {
 }
 
 src_install() {
-	# remove portage paths from dynamically created Type 
+	# remove portage paths from dynamically created Type
 	# headers
 	sed -e "s:${S}/Common/::" \
 		-e "s:${S}/Rendering/::" \