Added the license file for OpenCascade.

Corrected issues with the configuration of OpenCascade (Thanks Richard W.!)

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

3 files changed, 18 insertions, 18 deletions

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index 2c6fc9e6d..1692040f9 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: $
+  27 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
+  Corrected bugs in the way the --with-include and --with-library were handled (OpenGL, X). A big thank to Richard Westwell <garlicbread@ntlworld.com> for having discovered and corrected the issue.
+
   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.
 
@@ -15,4 +18,3 @@
   Initial import. See bug #118656 for anything relating the building process.
   Ebuild from Daniel Tourde <daniel.tourde@caelae.se> and Alvaro Castro
   <alvcastro@yahoo.es>.
-
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 760edc1e5..25cb47527 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 7681 RMD160 5afa710658b3a4117ee88472a8bec05c2eddc5cb SHA1 c20f873381597dca8871006c1b4d2d237834f6da SHA256 20ea5a5c8d313dfb3c110eeb6153dc90b4d63d6642d91ee684c92fdb90801510
+EBUILD opencascade-6.2-r1.ebuild 7696 RMD160 ae0b68a466b2aaf58e8e41fb953f388cc193b985 SHA1 0f8674fe1382788ef3a224f2795d974686dc700f SHA256 7782735cd601890dba981d4ad27e34abe58b0bfab5b65168cc8a5b78d1fb118d
 EBUILD opencascade-6.2.ebuild 8014 RMD160 a124ebc1ed45f3a0ff4d13406667917a1904ae69 SHA1 f3a3ad72eca7a278a06e89769aee0cdcfb968878 SHA256 95c2dcc377648c22cc05b8640f3cdbe399f175f2d92e3e07add5b35102a5d66a
-MISC ChangeLog 1108 RMD160 e3df33a5690c0f285d51cfb349cd64b44d57d729 SHA1 f0424c8f938c95c2331b6568a350143ed247631f SHA256 285ff10e2a535ccf72d2815d6912a121bbecd3458df3eb542922206fd13b37b5
+MISC ChangeLog 1361 RMD160 9fbfa1d103ec8fb95c5112ac99c2f093994841d2 SHA1 0b47634abbfc8772edababf6a44a972aee1547c9 SHA256 7499613ca92d07894996d95b768753664715a3f98b46e2ec5faae309f7795b48
 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 837a71e60..39f86f32c 100644
--- a/sci-libs/opencascade/opencascade-6.2-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.2-r1.ebuild
@@ -85,7 +85,7 @@ src_unpack() {
 	|| die "itk, itcl, tix, tk and tcl version tweaking failed!"
 
 	# Patches
-	if [ $(gcc-major-version) -qt "4" ] ; then
+	if [ $(gcc-major-version) > "4" ] ; then
 		elog "You have gcc4 -> GCC 4.x patch is applied"
 		epatch "${FILESDIR}"/opencascade-6.2-gcc4.patch
 	fi
@@ -109,8 +109,12 @@ src_compile() {
 	local confargs="--prefix=/opt/${P}/ros/lin --with-tcl=/usr/$(get_libdir) --with-tk=/usr/$(get_libdir)"
 
 	if use X ; then
+		confargs="${confargs} --with-dps-include=/usr/include --with-dps-library=/usr/$(get_libdir)"
+		confargs="${confargs} --with-xmu-include=/usr/include --with-xmu-library=/usr/$(get_libdir)"
 		if use !opengl; then
 			ewarn "Activate OpenGL if you want to be able to visualize geometry. Set "opengl" USE flag."
+		else
+			confargs="${confargs} --with-gl-include=/usr/include --with-gl-library=/usr/$(get_libdir)"
 		fi
 	else
 		if use opengl; then
@@ -123,34 +127,28 @@ src_compile() {
 	if use java ; then
 		local java_path
 		java_path=`java-config -O`
+		confargs="${confargs} --with-java-include=${java_path}/include/linux"
 	else
 		ewarn "Java wrapping is not going to be compiled. USE flag: "java""
 	fi
 
+# NOTES: To clearly state --with-stlport-include and --with-stlport-library cause troubles. I don't know why....
+
+	if use stlport ; then
+		confargs="${confargs} --with-stlport-libname=stlport_gcc"
+		#confargs="${confargs} --with-stlport-include=/usr/include --with-stlport-library=/usr/$(get_libdir)"
+	fi
+
 	# Compiler and linker flags
 	if use amd64 ; then
 		append-flags -m64
 	fi
 	append-ldflags -lpthread
 
-# NOTES: To clearly state --with-stlport-include and --with-stlport-library cause troubles. I don't know why....
-# So, these are not defined in the following econf command.
-
 	econf	${confargs} \
 		$(use_with X x ) \
-		$(use_with X xmu ) \
-		$(use_with X xmu-include /usr/include) \
-		$(use_with X xmu-library /usr/$(get_libdir)) \
-		$(use_with X dps-include /usr/include) \
-		$(use_with X dps-library /usr/$(get_libdir)) \
-		$(use_with opengl gl ) \
-		$(use_with opengl gl-include /usr/include ) \
-		$(use_with opengl gl-library /usr/$(get_libdir)) \
-		$(use_enable java jcas) \
-		$(use_with   java java-include ${java_path}/include/linux) \
 		$(use_enable debug ) \
 		$(use_enable !debug production ) \
-		$(use_with stlport stlport-libname stlport_gcc) \
 	|| die "Configuration failed"
 
 	emake || die "Compilation failed"