Bug correction. Thank you Dewald for testing and showing me how to solve it.

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1072 32389bae-6d03-0410-99cf-db05cde120eb

3 files changed, 11 insertions, 9 deletions

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index 90d92d562..2c6fc9e6d 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/opencascade
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
+  20 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
+  Corrected a bug in the ebuild. Now the tcl related variables should be corrected set and the values available all over the ebuild. A big thank to Dewald Pieterse <dewald.pieterse@gmail.com> for his testing and his good advices.
+
   12 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
   +opencascade-6.2-r1.ebuild
   General improvement of the ebuild, better amd64 support, removal of the wok and draw-harness flags (They had no effects). Many thanks to Dewald Pieterse and Álvaro Castro Castilla.
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index a710e9ab0..760edc1e5 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -5,7 +5,7 @@ DIST opencascade-6.2.tar.bz2 48068224 RMD160 750d80fec0a3c4d9c26613f93ed819a649b
 DIST opencascade-samples-java-6.2.tar.bz2 538012 RMD160 2b570eee63c9eff2f370b7973e1d12bb9718332c SHA1 9bd8d7596e882a6608781d4967453cc002efdd8d SHA256 636dbda1a0584e00aca243546a3e14b8891ffebeca7d3e3dc940b4f0f6c6a30a
 DIST opencascade-samples-qt-6.2.tar.bz2 42553 RMD160 3cec392ef9973ab74c1cd404bdc35d5a4e652807 SHA1 46515926973f09dcf3e2347cecfe025ee8621735 SHA256 45b8ab70f06377196a6f3f3170cafcabb8520d091030400346006a0c2521dc1d
 DIST opencascade-tutorial-6.2.tar.bz2 40245 RMD160 638c86493a67aeea97870ca1d38a91d403eb0661 SHA1 c2cc31fafcdaecda60c51b351339de9910fe2b7e SHA256 d5d7dae21a61f0944af7ff4987b5274c48308a670e94350d2477c499720d1784
-EBUILD opencascade-6.2-r1.ebuild 7675 RMD160 d68f44be9e599bf5d7f3a0c7a2734d251bf9462c SHA1 70c752dae98e9db56a6c102f0ca694ed10220a50 SHA256 b9aa7dc3987917f4680b006853b9b516202d30f08455deb5cb9d55b7b078ede8
+EBUILD opencascade-6.2-r1.ebuild 7681 RMD160 5afa710658b3a4117ee88472a8bec05c2eddc5cb SHA1 c20f873381597dca8871006c1b4d2d237834f6da SHA256 20ea5a5c8d313dfb3c110eeb6153dc90b4d63d6642d91ee684c92fdb90801510
 EBUILD opencascade-6.2.ebuild 8014 RMD160 a124ebc1ed45f3a0ff4d13406667917a1904ae69 SHA1 f3a3ad72eca7a278a06e89769aee0cdcfb968878 SHA256 95c2dcc377648c22cc05b8640f3cdbe399f175f2d92e3e07add5b35102a5d66a
-MISC ChangeLog 822 RMD160 df96cf3f1fd7c6cd26becf768b6261286167756e SHA1 14eba7b19d402d183671bdc4974c1e5a17164786 SHA256 0d7f402c06f7d059adc17a5e3ec34b0824d2b5fdaf0fbe41b9cadd8fbea16c58
+MISC ChangeLog 1108 RMD160 e3df33a5690c0f285d51cfb349cd64b44d57d729 SHA1 f0424c8f938c95c2331b6568a350143ed247631f SHA256 285ff10e2a535ccf72d2815d6912a121bbecd3458df3eb542922206fd13b37b5
 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
diff --git a/sci-libs/opencascade/opencascade-6.2-r1.ebuild b/sci-libs/opencascade/opencascade-6.2-r1.ebuild
index 2828894e8..837a71e60 100644
--- a/sci-libs/opencascade/opencascade-6.2-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.2-r1.ebuild
@@ -6,10 +6,10 @@ inherit autotools eutils flag-o-matic qt3 check-reqs multilib toolchain-funcs ve
 
 DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange."
 HOMEPAGE="http://www.opencascade.org"
-SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/thierry/${P}.tar.bz2
+SRC_URI=" ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/thierry/${P}.tar.bz2
 	 ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/thierry/${PN}-tutorial-${PV}.tar.bz2
-	 java? (ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/thierry/${PN}-samples-java-${PV}.tar.bz2)
-	 qt3? (ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/thierry/${PN}-samples-qt-${PV}.tar.bz2)"
+	 java? ( ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/thierry/${PN}-samples-java-${PV}.tar.bz2 )
+	 qt3? ( ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/thierry/${PN}-samples-qt-${PV}.tar.bz2 )"
 
 # NOTES
 # The source code here is not in the same form than the one distributed on www.opencascade.org
@@ -27,7 +27,7 @@ KEYWORDS="~x86 ~amd64"
 IUSE="debug doc java opengl qt3 stlport X"
 DEPEND="java? ( virtual/jdk )
 	opengl? ( virtual/opengl
-		  virtual/glu)
+		  virtual/glu )
 	X? ( x11-libs/libXmu
 	     app-text/dgs )
 	>=dev-lang/tcl-8.4
@@ -39,15 +39,14 @@ DEPEND="java? ( virtual/jdk )
 	qt3? ( x11-libs/qt:3 )
 	stlport? ( dev-libs/STLport )"
 
-# Determine itk, itcl, tix, tk and tcl versions
+pkg_setup() {
+	# Determine itk, itcl, tix, tk and tcl versions
 	itk_version=$(grep ITK_VER /usr/include/itk.h | sed 's/^.*"\(.*\)".*/\1/')
 	itcl_version=$(grep ITCL_VER /usr/include/itcl.h | sed 's/^.*"\(.*\)".*/\1/')
 	tix_version=$(grep TIX_VER /usr/include/tix.h | sed 's/^.*"\(.*\)".*/\1/')
 	tk_version=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
 	tcl_version=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
 
-
-pkg_setup() {
 	ewarn
 	ewarn " It is important to note that OpenCascade is a very large package. "
 	ewarn " Please note that building OpenCascade takes a lot of time and "