[sci-libs/opencascade] Added unmodified files from bug 357635

7 files changed, 477 insertions, 23 deletions

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index fc0fb5c..ba0bf4a 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*opencascade-6.5 (07 Mar 2011)
+
+  07 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  opencascade-6.3-r3.ebuild, +opencascade-6.5.ebuild,
+  +files/opencascade-6.5-fixed-DESTDIR.patch,
+  +files/opencascade-6.5-ftgl.patch, +files/env.sh.template:
+  Added unmodified files by Oliver Borm, see bug 357635
+
   03 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   opencascade-6.3-r3.ebuild:
   Added comments about restrictions
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 37625ef..aa61d51 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,27 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX env.ksh.template 1412 RMD160 aaf7c74e1aef841d669cf44c279e747cb336fd2b SHA1 e6f3a1157fdededd671c832ebeb8b25a900ec7ab SHA256 ac13e6d2b0dddbbac1350b24ab4fb44d38963fe43dc7732362500f8870dcccb7
+AUX env.sh.template 1485 RMD160 cc835658881384315348fb4f70a65425e934061e SHA1 fe19eb213403376b79e0da02a106c2c480b83a76 SHA256 fcf3d45a73a8499e6fb1282ddd3adcacff34a0cdf027af33e959b4d03e207798
 AUX opencascade-6.3-fixed-DESTDIR.patch 16811 RMD160 4cecc900ec5b3835f7d6f9b14e6655e82d496d1a SHA1 298df55796e208aee3e04798d69b5079b1ea8fce SHA256 84743f54bb8b8b9568b5a32b5af0384efe746d20500972c66050c3a1d5ebe814
 AUX opencascade-6.3-missing-mode.patch 625 RMD160 a2c7b729a121c4b25aaa7f1ee3e42020af5b58f8 SHA1 b3b95a8a93a2f14513ce8222f0e3a695e9c513b5 SHA256 4aa7338175c7b2dbbcb12eef72c61eb55ade58ad2c698c94ae16e1bc4b451e0a
+AUX opencascade-6.5-fixed-DESTDIR.patch 8023 RMD160 0d235368201a1c4a531bed0876aea7ce268372f5 SHA1 0fbb699f81824a17250606bdfec05f90dcf8b225 SHA256 fac8e3453cf08e9a4d4240921664cb1c3b07105d4165e049aeaf38ba809a1d54
+AUX opencascade-6.5-ftgl.patch 3253 RMD160 90701e8ec2be5433e2303af9c90282e6dc5a5bc2 SHA1 3fc240e0130c5cc2d5579b5080396275258e35e6 SHA256 b9134979f2a1ace891b84bbb2c5c084c519c35419bb2f047e9d7725bb6e42398
+DIST OpenCASCADE650.tar.gz 214819922 RMD160 6532933a71cf54039a734ebc7e8c16be1d358e2e SHA1 7e4b5bda3cf84bf4ec9ecd1e31899c8741fcf6f9 SHA256 fb95d8a542bbfc26af6186495f752a683b40137b34d6afd8f9bb02730c2436c6
 DIST opencascade-6.3.tgz 105877329 RMD160 b71f1b9a57d9624d2f079d4f7a8090f700c6126f SHA1 21a177fae5fa73263517aedbe60a4ee4926156f2 SHA256 1f1fc8d8be1d4ff6fe8df1059f856eec156385887880f3f69d147824957c2411
-EBUILD opencascade-6.3-r3.ebuild 4990 RMD160 0f4149aceb7fef86a67f06a0a4ced82a1e6570e3 SHA1 08f5bc9f6320e976a55f6773f5d00f8178d50177 SHA256 2287a29e066ed17bd4ea123da071133aedbdfc3ae84a5d42f5da39a88fe3f610
+EBUILD opencascade-6.3-r3.ebuild 5101 RMD160 cd67bb416ace79d817c5f5ee00d9f40d92ab85b0 SHA1 21995c20e598459033f6832c04c470cdbe15fcbf SHA256 c386092ee862639610321c49f280f19673f9ed0aaa9c3b45856a8f7a60e7a013
+EBUILD opencascade-6.5.ebuild 5112 RMD160 5b961b4b71594b549acef871e679026bd6382d48 SHA1 9968645f95b104478a3a09265e5c67c719c0f3c2 SHA256 c36774367a160cb05d3b79676dc61f01d0180dc9af172eee143b00e9fdc896c1
 MISC ChangeLog 3847 RMD160 86716c83172790bff84cd4d60fefadb558a2ef49 SHA1 0c000c72dc5d1fa4b6f673282f0764f044597a13 SHA256 e918897ed4c96b6002410efdf5820613b5c81bd8f897bff7166d62a4448e8b76
 MISC metadata.xml 217 RMD160 aa960d9d3f7d900bcaf1a9413f17c3662adc0820 SHA1 a8a3016deab1f6aca4951ea86977cfe5d509b695 SHA256 756924c88548f738071c2d39fa7e18737b063e3b8f4376737eb88ac307571478
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNbuV+AAoJENwGBM22xffelOQP+gNL5LQng0B388IHcrDTQr1d
-IFimzBdORnTdpRBqbSf+QG9TayKm22zNWgmHFvvqnzA+wN84skxS0zIT8AYRQJrw
-RH3QP/9T/s5IJZGCjdaMa9hBEBeqFBgTl9WfouZuZm0uUVeQL4Wl6Cf+iNVDujiO
-SZjAvONoAsAssTVqwMPSWL25wklLNsZTHRXcVUZpt/rg4Y9A7Klqn1UzjLXrtnkZ
-TB1nP28oTOXridNIH8XecwBcPJhTBsqhGtocbYuPXnXqa+XMFIvUITsb3+eYurWR
-lKJm5q7oog04AMxQM9JmIUyKTNEr4/L1LXPpT/tqNqrs8lEPcWfOwS3fCivkPLgW
-mPXeKqlriwM9wHWocw82qtFejlk3/UEsO3ne/OUAK5A/nWa6GGbB/dEp1isN1aM3
-tOJIBwtGAHjKsyCY3WhFXf0l7Qhygs4cNQA+yEI2Wj74fXuIlsqOw/vSr3BW4Qt0
-JtnxWlm7bFs3qpTlKxIZNekTQs1CQKQrnxt2oy/VZ3ARRbKPZtvzDHhUi825JD54
-EGG2xaDPunEKNPZyV13Mr9qsOugrqnssZuGP0SFjeEdAeHoAC/jBjhcV40IqqKT3
-dyCq7kuG5sFlKp3UL/XMrnE4EAJ0J7oonyYLNeUhidhT/s3ZsczqW+6mCgDi6EcV
-bUgNHwsulJ+8spYr6DoD
-=0OAt
------END PGP SIGNATURE-----
diff --git a/sci-libs/opencascade/files/env.sh.template b/sci-libs/opencascade/files/env.sh.template
new file mode 100644
index 0000000..146c86b
--- /dev/null
+++ b/sci-libs/opencascade/files/env.sh.template
@@ -0,0 +1,40 @@
+#!/bin/sh -f
+
+export CASROOT=VAR_CASROOT
+
+if [ -z "PATH" ];
+then PATH=VAR_CASROOT/Linux/bin;
+else PATH=VAR_CASROOT/Linux/bin:$PATH;
+fi
+export PATH
+if [ -z "LD_LIBRARY_PATH" ];
+then LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib;
+else LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:$LD_LIBRARY_PATH;
+fi
+export LD_LIBRARY_PATH
+export CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
+export CSF_LANGUAGE=us
+export MMGT_CLEAR=1
+export CSF_EXCEPTION_PROMPT=1
+export CSF_SHMessage=VAR_CASROOT/src/SHMessage
+export CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures
+export CSF_XSMessage=VAR_CASROOT/src/XSMessage
+export CSF_StandardDefaults=VAR_CASROOT/src/StdResource
+export CSF_PluginDefaults=VAR_CASROOT/src/StdResource
+export CSF_XCAFDefaults=VAR_CASROOT/src/StdResource
+export CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource
+export CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so
+export CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
+export CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat
+export CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource
+export CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource
+export CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource
+export CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt
+
+export TCLHOME=VAR_SYS_BIN
+export TCLLIBPATH=VAR_SYS_LIB
+export ITK_LIBRARY=VAR_SYS_LIB/VAR_ITK
+export ITCL_LIBRARY=VAR_SYS_LIB/VAR_ITCL
+export TIX_LIBRARY=VAR_SYS_LIB/VAR_TIX
+export TK_LIBRARY=VAR_SYS_LIB/VAR_TK
+export TCL_LIBRARY=VAR_SYS_LIB/VAR_TCL
diff --git a/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch
new file mode 100644
index 0000000..ea0f9b6
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch
@@ -0,0 +1,174 @@
+diff -urN opencascade.orig/ros/Makefile.am opencascade/ros/Makefile.am
+--- opencascade.orig/ros/Makefile.am	2011-03-06 16:08:59.000000000 +0100
++++ opencascade/ros/Makefile.am	2011-03-06 16:13:35.000000000 +0100
+@@ -86,106 +86,106 @@
+ dir_SunOS=sun
+ 
+ install-exec-local:
+-	$(INSTALL) -d $(prefix)/$(platform)
+-	if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \
+-		cd $(prefix)/$(platform) && ln -s ../bin bin; \
++	$(INSTALL) -d $(DESTDIR)$(prefix)/$(platform)
++	if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \
++		cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \
+ 	fi
+-	if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \
+-		cd $(prefix)/$(platform) && ln -s ../lib lib; \
++	if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ]; then \
++		cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \
+ 	fi
+-	$(INSTALL) -d $(prefix)/$(dir_$(platform))
+-	if [ -e $(prefix)/bin -a ! -e $(prefix)/$(dir_$(platform))/bin ]; then \
+-		cd $(prefix)/$(dir_$(platform)) && ln -s ../bin bin; \
++	$(INSTALL) -d $(DESTDIR)$(prefix)/$(dir_$(platform))
++	if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(dir_$(platform))/bin ]; then \
++		cd $(DESTDIR)$(prefix)/$(dir_$(platform)) && ln -s ../bin bin; \
+ 	fi
+-	if [ -e $(prefix)/lib -a ! -e $(prefix)/$(dir_$(platform))/lib ]; then \
+-		cd $(prefix)/$(dir_$(platform)) && ln -s ../lib lib; \
++	if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(dir_$(platform))/lib ]; then \
++		cd $(DESTDIR)$(prefix)/$(dir_$(platform)) && ln -s ../lib lib; \
+ 	fi
+-	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
++	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
+ 	if [ "$$pd" != "$$sd" ]; then \
+-		$(INSTALL) -d $(prefix)/inc; \
+-		cp -fr$(CP_$(platform)) $(top_srcdir)/inc $(prefix); \
++		$(INSTALL) -d $(DESTDIR)$(prefix)/inc; \
++		cp -fr$(CP_$(platform)) $(top_srcdir)/inc $(DESTDIR)$(prefix); \
+ 	fi; \
+ 	if [ "$$pd" != "$$bd" ]; then \
+-		cp -fr$(CP_$(platform)) $$bd/config.h $(prefix); \
++		cp -fr$(CP_$(platform)) $$bd/config.h $(DESTDIR)$(prefix); \
+ 	fi
+-	if [ -e $(prefix)/inc/config.h ]; then \
+-		unlink $(prefix)/inc/config.h; \
++	if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \
++		unlink $(DESTDIR)$(prefix)/inc/config.h; \
+ 	fi
+-	cd $(prefix)/inc && ln -s ../config.h config.h 
+-	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
++	cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h 
++	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
+ 	if [ "$$pd" != "$$sd" -a -d $(top_srcdir)/src/UnitsAPI ]; then \
+-		$(INSTALL) -d $(prefix)/src; \
+-		$(INSTALL) -d $(prefix)/src/UnitsAPI; \
+-		cp -fr$(CP_$(platform)) $(top_srcdir)/src/UnitsAPI $(prefix)/src; \
+-		cp -f$(CP_$(platform)) $(top_srcdir)/env_DRAW.sh $(prefix); \
++		$(INSTALL) -d $(DESTDIR)$(prefix)/src; \
++		$(INSTALL) -d $(DESTDIR)$(prefix)/src/UnitsAPI; \
++		cp -fr$(CP_$(platform)) $(top_srcdir)/src/UnitsAPI $(DESTDIR)$(prefix)/src; \
++		cp -f$(CP_$(platform)) $(top_srcdir)/env_DRAW.sh $(DESTDIR)$(prefix); \
+ 	fi
+-	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
++	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
+ 	if [ "$$pd" != "$$sd" ]; then \
+ 		inst_dirs="$(FoundationClasses_DIRS)"; \
+ 		if test "x$(FoundationClasses_DIRS)" != "x"; then \
+ 			for d in $$inst_dirs; do \
+-				$(INSTALL) -d $(prefix)/src/$$d; \
+-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
++				$(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
++				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
+ 			done; \
+ 		fi; \
+ 	fi
+-	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
++	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
+ 	if [ "$$pd" != "$$sd" ]; then \
+ 		inst_dirs="$(ModelingData_DIRS)"; \
+ 		if test "x$(ModelingData_DIRS)" != "x"; then \
+ 			for d in $$inst_dirs; do \
+-				$(INSTALL) -d $(prefix)/src/$$d; \
+-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
++				$(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
++				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
+ 			done; \
+ 		fi; \
+ 	fi
+-	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
++	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
+ 	if [ "$$pd" != "$$sd" ]; then \
+ 		inst_dirs="$(ModelingAlgorithms_DIRS)"; \
+ 		if test "x$(ModelingAlgorithms_DIRS)" != "x"; then \
+ 			for d in $$inst_dirs; do \
+-				$(INSTALL) -d $(prefix)/src/$$d; \
+-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
++				$(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
++				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
+ 			done; \
+ 		fi; \
+ 	fi
+-	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
++	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
+ 	if [ "$$pd" != "$$sd" ]; then \
+ 		inst_dirs="$(Visualization_DIRS)"; \
+ 		if test "x$(Visualization_DIRS)" != "x"; then \
+ 			for d in $$inst_dirs; do \
+-				$(INSTALL) -d $(prefix)/src/$$d; \
+-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
++				$(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
++				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
+ 			done; \
+ 		fi; \
+ 	fi
+-	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
++	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
+ 	if [ "$$pd" != "$$sd" ]; then \
+ 		inst_dirs="$(ApplicationFramework_DIRS)"; \
+ 		if test "x$(ApplicationFramework_DIRS)" != "x"; then \
+ 			for d in $$inst_dirs; do \
+-				$(INSTALL) -d $(prefix)/src/$$d; \
+-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
++				$(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
++				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
+ 			done; \
+ 		fi; \
+ 	fi
+-	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
++	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
+ 	if [ "$$pd" != "$$sd" ]; then \
+ 		inst_dirs="$(DataExchange_DIRS)"; \
+ 		if test "x$(DataExchange_DIRS)" != "x"; then \
+ 			for d in $$inst_dirs; do \
+-				$(INSTALL) -d $(prefix)/src/$$d; \
+-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
++				$(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
++				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
+ 			done; \
+ 		fi; \
+ 	fi
+-	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
++	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
+ 	if [ "$$pd" != "$$sd" ]; then \
+ 		inst_dirs="$(Draw_DIRS)"; \
+ 		if test "x$(Draw_DIRS)" != "x"; then \
+ 			for d in $$inst_dirs; do \
+-				$(INSTALL) -d $(prefix)/src/$$d; \
+-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
++				$(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
++				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
+ 			done; \
+ 		fi; \
+ 	fi
+diff -urN opencascade.orig/ros/configure.in opencascade/ros/configure.in
+--- opencascade/ros/configure.in.orig	2011-03-06 19:36:08.000000000 +0100
++++ opencascade/ros/configure.in	2011-03-06 22:24:04.000000000 +0100
+@@ -422,7 +422,7 @@
+   HAVE_FTGL=yes
+   HAVE_FTGL_INC=yes
+   CPPFLAGS="-I$ftgl/include $CPPFLAGS";
+-  AC_CHECK_HEADER( [FTGL/FTGL.h], [], [HAVE_FTGL_INC=no] )
++  AC_CHECK_HEADER( [FTGL/ftgl.h], [], [HAVE_FTGL_INC=no] )
+   if test "x$HAVE_FTGL_INC" = "xyes"; then
+     CSF_FTGL_INCLUDES="-I$ftgl/include/FTGL"
+     HAVE_FTGL_LIB=yes
+@@ -433,7 +433,7 @@
+     #we have problem with unresolved symbols on 64 stations
+     CSF_FTGL_LIB="-L$ftgl/lib -lftgl"
+     AC_TRY_LINK([
+-#include <FTGL/FTGL.h>
++#include <FTGL/ftgl.h>
+ #include <FTGL/FTGLTextureFont.h>
+ ], [
+ FTGLTextureFont font("");], [
diff --git a/sci-libs/opencascade/files/opencascade-6.5-ftgl.patch b/sci-libs/opencascade/files/opencascade-6.5-ftgl.patch
new file mode 100644
index 0000000..b2729f4
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.5-ftgl.patch
@@ -0,0 +1,77 @@
+--- opencascade/ros/src/OpenGl/OpenGl_FontMgr.cxx.orig	2011-03-06 21:55:55.000000000 +0100
++++ opencascade/ros/src/OpenGl/OpenGl_FontMgr.cxx	2011-03-06 23:06:05.000000000 +0100
+@@ -1,8 +1,9 @@
+ #include <OpenGl_FontMgr.hxx>
+ 
+-#include <FTGLTextureFont.h>        
+-#include <FTLibrary.h>
+-#include <FTFace.h>
++#include <ftgl.h>
++// #include <FTGLTextureFont.h>        
++// #include <FTLibrary.h>
++// #include <FTFace.h>
+ #include <Standard_Stream.hxx>
+ 
+ #undef TRACE
+@@ -71,10 +72,29 @@
+         if ( it.Value()->FontAspect() == OSD_FA_Regular ) {
+           //this workaround for fonts with names dependent on system locale.
+           //for example: "Times New Roman Fett Kursive" or "Times New Roman Gras Italiqui"
+-          FTFace face(it.Value()->FontPath()->ToCString());
++//           FTFace face(it.Value()->FontPath()->ToCString());
++
++    FT_Library* library = new FT_Library;
++    FT_Error ftErrLib = FT_Init_FreeType( library);
++
++    const FT_Long DEFAULT_FACE_INDEX = 0;
++    FT_Face*  ftFace = new FT_Face;
++
++    FT_Error err = FT_New_Face( (*library), it.Value()->FontPath()->ToCString(), DEFAULT_FACE_INDEX, ftFace);
++
++//     if( err)
++//     {
++//         delete ftFace;
++//         ftFace = 0;
++//     }
++//     else
++//     {
++//         numGlyphs = (*ftFace)->num_glyphs;
++//         hasKerningTable = FT_HAS_KERNING((*ftFace));
++//     }
+               
+-          if ( face.Error() == FT_Err_Ok ) {
+-            if ( (*face.Face())->style_flags == 0 ) {
++          if ( err == FT_Err_Ok ) {
++            if ( (*ftFace)->style_flags == 0 ) {
+               info->SysFont = it.Value();
+             }
+             else {
+@@ -82,22 +102,22 @@
+ #ifdef TRACE
+               cout << "TKOpenGl::initializeFontDB() detected new font!\n"
+                 << "\tFont Previous Name: " << it.Value()->FontName()->ToCString() << endl
+-                << "\tFont New Name: " << (*face.Face())->family_name << endl
+-                << "\tFont Aspect: " << (*face.Face())->style_flags << endl;
++                << "\tFont New Name: " << (*ftFace)->family_name << endl
++                << "\tFont Aspect: " << (*ftFace)->style_flags << endl;
+ #endif
+               OSD_FontAspect aspect = OSD_FA_Regular;
+-              if ( (*face.Face())->style_flags == (FT_STYLE_FLAG_ITALIC | FT_STYLE_FLAG_BOLD) )
++              if ( (*ftFace)->style_flags == (FT_STYLE_FLAG_ITALIC | FT_STYLE_FLAG_BOLD) )
+                 aspect = OSD_FA_BoldItalic;
+-              else if ( (*face.Face())->style_flags == FT_STYLE_FLAG_ITALIC )
++              else if ( (*ftFace)->style_flags == FT_STYLE_FLAG_ITALIC )
+                 aspect = OSD_FA_Italic;
+-              else if ( (*face.Face())->style_flags == FT_STYLE_FLAG_BOLD )
++              else if ( (*ftFace)->style_flags == FT_STYLE_FLAG_BOLD )
+                 aspect = OSD_FA_Bold;
+ 
+ #ifdef TRACE
+               cout << "\tOSD_FontAspect: " << aspect << endl;
+ #endif
+               Handle(TCollection_HAsciiString) aFontName =
+-                new TCollection_HAsciiString( (*face.Face())->family_name );
++                new TCollection_HAsciiString( (*ftFace)->family_name );
+               info->SysFont = new OSD_SystemFont( aFontName, aspect, it.Value()->FontPath() );
+             }
+           }
diff --git a/sci-libs/opencascade/opencascade-6.3-r3.ebuild b/sci-libs/opencascade/opencascade-6.3-r3.ebuild
index 45239a6..6814d30 100644
--- a/sci-libs/opencascade/opencascade-6.3-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-6.3-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.3-r3.ebuild,v 1.2 2011/03/07 22:51:38 dilfridge Exp $
 
-EAPI=4
+EAPI=3
 
 inherit autotools eutils check-reqs multilib java-pkg-opt-2
 
diff --git a/sci-libs/opencascade/opencascade-6.5.ebuild b/sci-libs/opencascade/opencascade-6.5.ebuild
new file mode 100644
index 0000000..0ee99f2
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-6.5.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.3-r3.ebuild,v 1.1 2011/03/03 01:08:20 dilfridge Exp $
+
+EAPI=3
+
+inherit autotools eutils check-reqs multilib java-pkg-opt-2
+
+DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="http://www.opencascade.org/"
+SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/OpenCASCADE650.tar.gz"
+
+LICENSE="Open-CASCADE-Technology-Public-License-6.5"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples gl2ps java"
+
+DEPEND="
+	media-libs/ftgl
+	virtual/opengl
+	x11-libs/libXmu
+	>=dev-lang/tcl-8.4
+	>=dev-lang/tk-8.4
+	>=dev-tcltk/itcl-3.2
+	>=dev-tcltk/itk-3.2
+	>=dev-tcltk/tix-8.4.2
+	gl2ps? ( x11-libs/gl2ps )
+"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/ros
+
+RESTRICT="bindist mirror"
+# http://bugs.gentoo.org/show_bug.cgi?id=352435
+# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+
+pkg_setup() {
+	java-pkg-opt-2_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/')
+
+	INSTALL_DIR=/usr/$(get_libdir)/${P}/ros
+
+	ewarn " Please note that building OpenCascade takes a lot of time and "
+	ewarn " hardware ressources: 3.5-4 GB free diskspace and 256 MB RAM are "
+	ewarn " the minimum requirements. "
+
+	# Check if we have enough RAM and free diskspace to build this beast
+	CHECKREQS_MEMORY="256"
+	CHECKREQS_DISK_BUILD="3584"
+	check_reqs
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+
+	# Substitute with our ready-made env.sh script
+	cp -f "${FILESDIR}"/env.sh.template env.sh || die
+
+	# Feed environment variables used by Opencascade compilation
+	sed -i \
+		-e "s:VAR_CASROOT:${S}:g" \
+		-e 's:VAR_SYS_BIN:/usr/bin:g' \
+		-e "s:VAR_SYS_LIB:/usr/$(get_libdir):g" env.sh \
+			|| die "Environment variables feed in env.sh failed!"
+
+	# Tweak itk, itcl, tix, tk and tcl versions
+	sed -i \
+		-e "s:VAR_ITK:itk${itk_version}:g" \
+		-e "s:VAR_ITCL:itcl${itcl_version}:g" \
+		-e "s:VAR_TIX:tix${tix_version}:g" \
+		-e "s:VAR_TK:tk${tk_version}:g" \
+		-e "s:VAR_TCL:tcl${tcl_version}:g" env.sh \
+			|| die "itk, itcl, tix, tk and tcl version tweaking failed!"
+
+	epatch "${FILESDIR}"/${P}-ftgl.patch
+	epatch "${FILESDIR}"/${P}-fixed-DESTDIR.patch
+	rm Makefile.in || die
+
+	source env.sh
+	eautoreconf
+}
+
+src_configure() {
+	# Add the configure options
+	local confargs="--prefix=${INSTALL_DIR}/lin --exec-prefix=${INSTALL_DIR}/lin --with-tcl=/usr/$(get_libdir) --with-tk=/usr/$(get_libdir)"
+
+	confargs+=" --with-freetype=/usr"
+	confargs+=" --with-ftgl=/usr"
+
+	use gl2ps && confargs+=" --with-gl2ps=/usr"
+
+	if use java ; then
+		confargs+=" --with-java-include=$(java-config -O)/include"
+	else
+		confargs+=" --without-java-include"
+	fi
+
+	econf	${confargs} \
+		$(use_enable debug ) $(use_enable !debug production ) \
+			|| die "Configuration failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# .la files kill cute little kittens
+	find "${D}" -name '*.la' -exec rm {} +
+
+	# Symlinks for keeping original OpenCascade folder structure and
+	# add a link lib to $(get_libdir)  if we are e.g. on amd64 multilib
+	if [ "$(get_libdir)" != "lib" ]; then
+		dosym "$(get_libdir)" "${INSTALL_DIR}/lin/lib"
+	fi
+
+	# Tweak the environment variables script again with new destination
+	cp "${FILESDIR}"/env.sh.template env.sh
+	sed -i "s:VAR_CASROOT:${INSTALL_DIR}/lin:g" env.sh
+
+	# Build the env.d environment variables
+	cp "${FILESDIR}"/env.sh.template 50${PN}
+	sed -i \
+		-e 's:export ::g' \
+		-e "s:VAR_CASROOT:${INSTALL_DIR}/lin:g" \
+		-e '1,2d' \
+		-e '4,14d' \
+		-e "s:/Linux/lib/:/$(get_libdir)/:g" ./50${PN} \
+			|| die "Creation of the /etc/env.d/50opencascade failed!"
+
+	sed -i "2i\PATH=${INSTALL_DIR}/lin/bin\nLDPATH=${INSTALL_DIR}/lin/$(get_libdir)" ./50${PN} \
+			|| die "Creation of the /etc/env.d/50opencascade failed!"
+
+	# Update both env.d and script with the libraries variables
+	sed -i \
+		-e 's:VAR_SYS_BIN:/usr/bin:g' \
+		-e "s:VAR_SYS_LIB:/usr/$(get_libdir):g" \
+		-e "s:VAR_ITK:itk${itk_version}:g" \
+		-e "s:VAR_ITCL:itcl${itcl_version}:g" \
+		-e "s:VAR_TIX:tix${tix_version}:g" \
+		-e "s:VAR_TK:tk${tk_version}:g" \
+		-e "s:VAR_TCL:tcl${tcl_version}:g" env.sh 50${PN} \
+			|| die "Tweaking of the Tcl/Tk libraries location in env.sh and 50opencascade failed!"
+
+	# Install the env.d variables file
+	doenvd 50${PN} || die
+
+	cd "${S}"/../ || die
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r data || die
+
+		insinto /usr/share/doc/${PF}/examples
+		doins -r samples || die
+	fi
+
+	cd "${S}"/../doc
+	dodoc *.pdf
+
+	# Install the documentation
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r {overview,ReferenceDocumentation} || die
+	fi
+}