Taking maint, version bumps (thanks Sławek Lis, bug 438466, thanks Jimmy.Jazz@gmx.net, bug 451406). No keywords, needs further testing of slots etc.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

7 files changed, 428 insertions, 8 deletions

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index c8f93f053fa4..4befc75a8169 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-libs/opencascade
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.9 2013/03/03 10:08:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.10 2013/04/26 20:33:00 xmw Exp $
+
+*opencascade-6.5.4 (26 Apr 2013)
+*opencascade-6.5.0 (26 Apr 2013)
+
+  26 Apr 2013; Michael Weber <xmw@gentoo.org> +opencascade-6.5.0.ebuild,
+  +opencascade-6.5.4.ebuild, +files/opencascade-6.5.4-fixed-DESTDIR.patch,
+  +files/opencascade-6.5.4-tcl8.6.patch, metadata.xml:
+  Taking maint, version bumps (thanks Sławek Lis, bug 438466, thanks
+  Jimmy.Jazz@gmx.net, bug 451406). No keywords, needs further testing of slots
+  etc.
 
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> opencascade-6.5.ebuild,
   +files/opencascade-6.5-tcl8.6.patch, metadata.xml:
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index a095de965fb5..59d7a0a04885 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,18 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX env.sh.template 1485 SHA256 fcf3d45a73a8499e6fb1282ddd3adcacff34a0cdf027af33e959b4d03e207798 SHA512 e01fae654520a43b8609130cf5d9bc524fdbe6ab4a8f37e83d3dba4e3d4d9658f9bccfa84c737ab2ccc9f11c6b96ea78b4a200fdc953f15768554c9042aa7c6c WHIRLPOOL b66c745c78be39e19f5130df8376fc5469c474fe226d22ad35f7c484fd564180660518f1367265858933fcc9f724e5fb247843f9b21327c4972059a96c49b4c5
 AUX opencascade-6.5-fixed-DESTDIR.patch 8023 SHA256 fac8e3453cf08e9a4d4240921664cb1c3b07105d4165e049aeaf38ba809a1d54 SHA512 040b06013b280555616ae481fc63bd3edf54514647417ad038e2f812ff4d77e9334044399e109b938d8e10f85095c81e9c1414cb66a52fa49d24f531bfceb4ac WHIRLPOOL cdd47d2e0f1bda1a8d64e43bacfa32ab0c1b318e657121145d0605658661fa9b472f6d8f161d68d090177ec3a682132b3db71ee429da35049ff1e411aa823935
 AUX opencascade-6.5-ftgl.patch 3253 SHA256 b9134979f2a1ace891b84bbb2c5c084c519c35419bb2f047e9d7725bb6e42398 SHA512 f468b0de5377bfbcd97b8a86b6e0c4e470e8f3565e8f6d07a4ffcb3a13c8a07154234d5addcfe342c2f626b1e36e62c05141375656c910d7a4a635a27c6d1a4d WHIRLPOOL 6e441b4aa39baa6d0844e905f7e11ea586ea195156e6740da274be5101fe4c7886069e9e5d05778fd7b5d73730b90683fcbb5b802638fcff36e8463e0be2863b
 AUX opencascade-6.5-tcl8.6.patch 1668 SHA256 992f1c787e8a4c1333d19a99ee425c8b1f5ea2ca8004efd08713b664f941e534 SHA512 e7f25a6886f3ebc9fc303ad7c24adac6e9605cdfc9f42ff7720f29dcbbe112e12edad6381238e5fa35cbbc9ed942c9062cf87665531c8c3946b166ca4045fb83 WHIRLPOOL 4393f8b6ec32008045d40e079a6e30a440bb9c08aff93ccb1effc840fc14228300270c32d05f1ebae45af73473364a1105ac0b9e5f7290e93b2f5a0d6b53d88c
+AUX opencascade-6.5.4-fixed-DESTDIR.patch 2285 SHA256 4c55b5aa5e52d66379593be97b0b253e0c1877b9f12445428873407e5c08b3ba SHA512 f7ad04ef9b3da6ec4ec2270218274e14661c642835a8d5c1adcf8d132dd5cf6dd447416e28a87ccf7a5c1591f90ecb6ce26d099582b6336a82f3595b0912ea77 WHIRLPOOL bf29b60a948768bf151bf998580c73865922408d617f2feb77fe495fdde9e8ab084b4b7012161baa2296c7cdb975ff2c8ed16c6982890316529edca485be3299
+AUX opencascade-6.5.4-tcl8.6.patch 1392 SHA256 92294c760fd127892929640c295c227f1c414828629dfc5b05bf19c14b30a1db SHA512 2c9652e7c4e44caad41bf9f4bee298ee3b3ced8ba417375d28b3832696d2fca0eb9a5420bbd82370ea60a1423ffb07da46593a4e5d49cc65b4c8a572b3ddb0e6 WHIRLPOOL ed56348c7109f9f7f70dea8dab6e04f2816465c8852ebfc157d59886221221cd0ede959bfe0434f1822583efc9bc788e949bf3111e36ce1aff1091a1e3f54ea7
 DIST OpenCASCADE650.tar.gz 214819922 SHA256 fb95d8a542bbfc26af6186495f752a683b40137b34d6afd8f9bb02730c2436c6 SHA512 ea2c3703e3338584d84fb8e06664e79f5f113a117e94a4eefcf39bac3bcc28d81ace2340c83399ecbe5774c348faa3713e90623f8329562e10700ad7e2048be7 WHIRLPOOL 78e092b9ea892d7686578696bcba67f649b65b8d520f358cf2aac9a2c49baf75ff3717899865d7f752a5577b123f8d0eadce06173e5b1bad3dcf0c31052b09d6
+DIST OpenCASCADE654.tar.gz 162714803 SHA256 bece01fe89046ceb7c6203f866a6bf6e81b9449133c13c6263c4530e584520b6 SHA512 e7bb221f6ca657dc2588fa98334576c90ef84436fdc6df20f11b2f8d39cbd9faf9a16443242268e841c1236e383bd60c291fba86f884af18aca882ae9aca100c WHIRLPOOL a0c616c3b878bcc1a33543bbe21e2c1bb7b557b76321a2f4f7f8797a3f0c11a836068e8f7a678934adcfb7ac2ee6a7ef2f077b0b834bab554cf60e71c4b6dd02
+EBUILD opencascade-6.5.0.ebuild 5015 SHA256 c2746ebe077bafd26b0f5d98d81b0b23a959dde3d4e7450bba139d865ab71201 SHA512 1cdc4794444ee9842791019b7da613f60dae0434cd9c36fd530daa400ee389c1644c2b49146d78caf86234fd8c8f02db0012a425b764113c6ff6278457733306 WHIRLPOOL a74daf55ab098c3ac7c33e69c8cd5c56c09c84b5f21d8fca49d2f53f124057a4e3ee4848601b6ff6a7de4ed5b81969dd5f0a7186e89ba89352b919f0c77223f6
+EBUILD opencascade-6.5.4.ebuild 4966 SHA256 ff1e4ab2fb2367ddfa728c296e813df89c096722732ef2df80dc4f3dc9d1921c SHA512 4c9898d5c4b0677371adfc74e0ed5f9aff6ee85705da997ca1403bf8a2295787e624a37f60ef270a4d3cadb6f9739a46a9c076cddf42d958ce0ae1876a5b112a WHIRLPOOL e3c44b30dfd942c624841ccd36ca4e576c65934182900571abf45361c69006f4ecb5fc26131f1bbbc2721d612b0c36b76edd585f6a112f312462fb40259bf23e
 EBUILD opencascade-6.5.ebuild 5397 SHA256 fef97efeefa8813817948e058d248e9735010622d5756def3a70b7c158dedcd8 SHA512 6bb6baffab965095602528d91c858268cbca71d1c29684530e4e13275078f53c4d93c90770b1a3eb9095de0bb53d96bb09416f46c6e836cf6eb5d0d78ac3b659 WHIRLPOOL 8b02621724e84978d6b58e0f041eff7fcd6b0b6a2b009a5cfbecd9706b7cc6680ed28aba9cf40c221c1cf9612f339fde11b586f5e1e91812c86aa9608f024753
-MISC ChangeLog 1978 SHA256 85dc44b790a01389a7c10073ba8950ba83b9eb7b3062ea524effc353c684addb SHA512 404d5bc673d23841c49cc154d02e720bcbb8498f0798bac8443fd6aea52ef53ee93a52f76df13b58f3b9bae5085dc9c26f11eb24c27b7b225d30f393b2e68e9e WHIRLPOOL b55e368775bb609ddd188eae739bbc1751088c16e1ce384597b3958370d485f90c151e19c2d1c20e7c14bd49758c1db7793837f230841e0378e4b93ba7843de1
-MISC metadata.xml 303 SHA256 664628c4b2ee21560b1896076265c51de111e4658f1d613557b1469878a316d3 SHA512 78755fdd1ec844480f962820350e226789a7d0dacacec82db391d6967515f0dfb798c457124152b88fc73cda55a0f209058982a514637419044cb81d1b51f7a7 WHIRLPOOL 884610402b2a3a335fe0dab564064d8becfe1c8fd110450b2457840db78b149ec9a29025024bbe4f5753e4f77cda8ccef3c7a2ddec531d3d2d46934eefc501d7
+MISC ChangeLog 2405 SHA256 8646a5739af97f9949255fa5ec849ebca682f7735c5dfb4809a744e381eb7651 SHA512 c70f9b0a20feffc9103ba14997bf3a47e180937070b6ee2ab7edeae44ae5769da892687698360bc4cfcfa54f59829dc5158e19679e63aa6805421838b7c8fda9 WHIRLPOOL b222e28703d61d8ddfe976d5756f0e39d6309c7bb906d6e77f899493291697073ebd1cf5ec681923d3e983633fdccd382c2f9cf1a2541eb3585660e3bdd35f03
+MISC metadata.xml 418 SHA256 264921d290b45248ede47b30d1900489c3f723d0f2362f26762be06579bf6353 SHA512 5f28b24e8728efe62dc731e8bfce924da272fddfd906d210ffce523971685e400870a47f863d506b1ec963adb0c5e0774800a246cb1044ecea4feb9ad0e98dae WHIRLPOOL aa073728160aba1226dc2c9608e6f8ecbebe89de17a70cd92ec0ef235aa7442cd0aa84ca43d57eb638fee117b2f3814a91d70de22efc372cf3ff4556cf39dafb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEUEAREKAAYFAlEzISUACgkQgAnW8HDreRaTvgCWKUBc/c79ySh5QQfe5XdlA05t
-VQCfalBzdS46lwlIYkwD8kFBOATyvGM=
-=hLNm
+iF4EAREIAAYFAlF65GwACgkQknrdDGLu8JAFmwD/W/CMQOQV5oqNLPfe+SVfx30h
+OXmomj+WdMl6ykOq0VwA/1PrYkDHjwhvUrzzwUGTA0tnmV4ZUPusUTuVGRx5IKnf
+=lxmw
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch
new file mode 100644
index 000000000000..b8312158223c
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch
@@ -0,0 +1,46 @@
+--- Makefile.am.orig	2013-01-14 12:53:15.293322821 +0100
++++ Makefile.am	2013-01-14 13:02:05.333309637 +0100
+@@ -82,27 +82,27 @@
+ 	cd $(top_builddir)/adm/make && $(MAKE) $(AM_MAKEFLAGS) Draw
+ 
+ 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
+-	buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); installd=`pwd`; cd $$buildd; \
++	buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(DESTDIR)$(prefix); installd=`pwd`; cd $$buildd; \
+ 	if [ "$$installd" != "$$sourced" ]; then \
+-		$(INSTALL) -d $(prefix)/inc; \
+-		cp -frL $(top_srcdir)/inc $(prefix); \
+-		cp -frL $$buildd/config.h $(prefix); \
++		$(INSTALL) -d $(DESTDIR)$(prefix)/inc; \
++		cp -frL $(top_srcdir)/inc $(DESTDIR)$(prefix); \
++		cp -frL $$buildd/config.h $(DESTDIR)$(prefix); \
+ 		for d in  $(FoundationClasses_DIRS) $(ModelingData_DIRS) $(ModelingAlgorithms_DIRS) $(Visualization_DIRS) $(ApplicationFramework_DIRS) $(DataExchange_DIRS) $(Draw_DIRS); do \
+-			$(INSTALL) -d $(prefix)/src/$$d; \
+-			cp -frL $(top_srcdir)/src/$$d $(prefix)/src; \
++			$(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
++			cp -frL $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
+ 		done; \
+ 	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
+-	cd $(top_srcdir) && cp *.sh $(prefix)
++	cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h
++	cd $(top_srcdir) && cp *.sh $(DESTDIR)$(prefix)
+ 
+ .PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
+\ Brak znaku nowej linii na końcu pliku
diff --git a/sci-libs/opencascade/files/opencascade-6.5.4-tcl8.6.patch b/sci-libs/opencascade/files/opencascade-6.5.4-tcl8.6.patch
new file mode 100644
index 000000000000..28c3a11afdf9
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.5.4-tcl8.6.patch
@@ -0,0 +1,38 @@
+--- ros/src/Draw/Draw_Window.cxx.orig    2013-01-10 23:40:07.279470692 +0100
++++ ros/src/Draw/Draw_Window.cxx    2013-01-10 23:45:00.498784426 +0100
+@@ -84,7 +84,7 @@
+       errChannel = Tcl_GetStdChannel(TCL_STDERR);
+       if (code != TCL_OK) {
+         if (errChannel) {
+-          Tcl_Write(errChannel, Interp->result, -1);
++          Tcl_Write(errChannel, Tcl_GetStringResult(Interp), -1);
+           Tcl_Write(errChannel, "\n", 1);
+         }
+         Tcl_AddErrorInfo(Interp,
+@@ -1055,7 +1055,7 @@
+   mainWindow =
+   Tk_MainWindow(interp) ;
+   if (mainWindow == NULL) {
+-    fprintf(stderr, "%s\n", interp->result);
++    fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
+     exit(1);
+   }
+   Tk_Name(mainWindow) =
+@@ -2061,7 +2061,7 @@
+       Standard_Integer res = Tk_Init (interp);
+       if (res != TCL_OK)
+       {
+-        cout << "tkLoop: error in Tk initialization. Tcl reported: " << interp->result << endl;
++        cout << "tkLoop: error in Tk initialization. Tcl reported: " << Tcl_GetStringResult(interp) << endl;
+       }
+     }
+     catch (Standard_Failure)
+@@ -2072,7 +2072,7 @@
+     mainWindow = Tk_MainWindow (interp);
+     if (mainWindow == NULL)
+     {
+-      fprintf (stderr, "%s\n", interp->result);
++      fprintf (stderr, "%s\n", Tcl_GetStringResult(interp));
+       cout << "tkLoop: Tk_MainWindow() returned NULL. Exiting...\n";
+       Tcl_Exit (0);
+     }
\ No newline at end of file
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index dc2b6193d0be..e9a274a97dd6 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
+    <email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
   </maintainer>
   <use>
     <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
+    <flag name="tbb">tEnable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/opencascade/opencascade-6.5.0.ebuild b/sci-libs/opencascade/opencascade-6.5.0.ebuild
new file mode 100644
index 000000000000..a5d8b95bc9aa
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-6.5.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.0.ebuild,v 1.1 2013/04/26 20:33:00 xmw Exp $
+
+EAPI=5
+
+inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
+
+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/OpenCASCADE${PV//\./}.tar.gz"
+
+LICENSE="Open-CASCADE-Technology-Public-License-6.5"
+SLOT="${PV}"
+KEYWORDS=""
+IUSE="debug doc examples gl2ps java"
+
+DEPEND="media-libs/ftgl
+	virtual/glu
+	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 )"
+#freeimage? ( media-libs/freeimage )
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/ros
+
+# http://bugs.gentoo.org/show_bug.cgi?id=352435
+# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+RESTRICT="bindist mirror"
+
+CHECKREQS_MEMORY="256M"
+CHECKREQS_DISK_BUILD="3584M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+
+	epatch \
+		"${FILESDIR}"/${PN}-6.5-ftgl.patch \
+		"${FILESDIR}"/${PN}-6.5-fixed-DESTDIR.patch \
+		"${FILESDIR}"/${PN}-6.5-tcl8.6.patch
+
+	# Feed environment variables used by Opencascade compilation
+	my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
+	local my_env_install="#!/bin/sh -f
+if [ -z \"\$PATH\" ]; then
+	export PATH=VAR_CASROOT/Linux/bin
+else
+	export PATH=VAR_CASROOT/Linux/bin:\$PATH
+fi
+if [ -z \"\$LD_LIBRARY_PATH\" ]; then
+	export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib
+else
+	export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:\$LD_LIBRARY_PATH
+fi"
+	local my_sys_lib=${EROOT}usr/$(get_libdir)
+	local my_env="CASROOT=VAR_CASROOT
+CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
+CSF_LANGUAGE=us
+MMGT_CLEAR=1
+CSF_EXCEPTION_PROMPT=1
+CSF_SHMessage=VAR_CASROOT/src/SHMessage
+CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures
+CSF_XSMessage=VAR_CASROOT/src/XSMessage
+CSF_StandardDefaults=VAR_CASROOT/src/StdResource
+CSF_PluginDefaults=VAR_CASROOT/src/StdResource
+CSF_XCAFDefaults=VAR_CASROOT/src/StdResource
+CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource
+CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so
+CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
+CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat
+CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource
+CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource
+CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource
+CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt
+TCLHOME=${EROOT}usr/bin
+TCLLIBPATH=${my_sys_lib}
+ITK_LIBRARY=${my_sys_lib}/itk$(grep ITK_VER /usr/include/itk.h | sed 's/^.*"\(.*\)".*/\1/')
+ITCL_LIBRARY=${my_sys_lib}/itcl$(grep ITCL_VER /usr/include/itcl.h | sed 's/^.*"\(.*\)".*/\1/')
+TIX_LIBRARY=${my_sys_lib}/tix$(grep TIX_VER /usr/include/tix.h | sed 's/^.*"\(.*\)".*/\1/')
+TK_LIBRARY=${my_sys_lib}/tk$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
+TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')"
+
+	( 	echo "${my_env_install}"
+		echo "${my_env}" | sed -e "s:^:export :" ) \
+	| sed -e "s:VAR_CASROOT:${S}:g" > env.sh || die
+	source env.sh
+
+	(	echo "PATH=${my_install_dir}/lin/bin"
+		echo "LDPATH=${my_install_dir}/lin/$(get_libdir)"
+		echo "${my_env}" | sed \
+			-e "s:VAR_CASROOT:${my_install_dir}/lin:g" \
+			-e "s:/Linux/lib/:/$(get_libdir)/:g" || die
+	) > 50${PN}
+
+	append-cxxflags "-fpermissive"
+
+	sed -e "/^AM_C_PROTOTYPES$/d" \
+		-i configure.* || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--prefix=${my_install_dir}/lin --exec-prefix=${my_install_dir}/lin \
+		--with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \
+		--with-freetype="${EROOT}usr" \
+		--with-ftgl="${EROOT}usr" \
+		$(usex gl2ps "--with-gl2ps=\"${EROOT}usr\"" "") \
+		$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
+		$(use_enable debug) \
+		$(use_enable !debug production)
+	#$(use_with freeimage) \
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	prune_libtool_files
+
+	# 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)" "${my_install_dir}/lin/lib"
+	fi
+
+	insinto /etc/env.d/${PN}
+	newins 50${PN} ${PV}
+
+	cd "${WORKDIR}"
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r data
+		doins -r samples
+	fi
+	dodoc doc/*.pdf
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc/{overview,ReferenceDocumentation}
+	fi
+}
+
+pkg_postinst() {
+	eselect ${PN} set ${PV}
+	einfo
+	elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it."
+	elog "You get a list by running \"equery depends sci-libs/opencascade\""
+	elog "revdep-rebuild does NOT suffice."
+	einfo
+}
diff --git a/sci-libs/opencascade/opencascade-6.5.4.ebuild b/sci-libs/opencascade/opencascade-6.5.4.ebuild
new file mode 100644
index 000000000000..ec1d92fb1046
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-6.5.4.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.4.ebuild,v 1.1 2013/04/26 20:33:00 xmw Exp $
+
+EAPI=5
+
+inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
+
+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/OpenCASCADE${PV//\./}.tar.gz"
+
+LICENSE="Open-CASCADE-Technology-Public-License-6.5"
+SLOT="${PV}"
+KEYWORDS=""
+IUSE="debug doc examples gl2ps java"
+
+DEPEND="media-libs/ftgl
+	virtual/glu
+	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 )"
+#freeimage? ( media-libs/freeimage )
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/ros
+
+# http://bugs.gentoo.org/show_bug.cgi?id=352435
+# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+RESTRICT="bindist mirror"
+
+CHECKREQS_MEMORY="256M"
+CHECKREQS_DISK_BUILD="3584M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+
+	epatch \
+		"${FILESDIR}"/${P}-fixed-DESTDIR.patch \
+		"${FILESDIR}"/${P}-tcl8.6.patch
+
+	# Feed environment variables used by Opencascade compilation
+	my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
+	local my_env_install="#!/bin/sh -f
+if [ -z \"\$PATH\" ]; then
+	export PATH=VAR_CASROOT/Linux/bin
+else
+	export PATH=VAR_CASROOT/Linux/bin:\$PATH
+fi
+if [ -z \"\$LD_LIBRARY_PATH\" ]; then
+	export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib
+else
+	export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:\$LD_LIBRARY_PATH
+fi"
+	local my_sys_lib=${EROOT}usr/$(get_libdir)
+	local my_env="CASROOT=VAR_CASROOT
+CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
+CSF_LANGUAGE=us
+MMGT_CLEAR=1
+CSF_EXCEPTION_PROMPT=1
+CSF_SHMessage=VAR_CASROOT/src/SHMessage
+CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures
+CSF_XSMessage=VAR_CASROOT/src/XSMessage
+CSF_StandardDefaults=VAR_CASROOT/src/StdResource
+CSF_PluginDefaults=VAR_CASROOT/src/StdResource
+CSF_XCAFDefaults=VAR_CASROOT/src/StdResource
+CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource
+CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so
+CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
+CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat
+CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource
+CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource
+CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource
+CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt
+TCLHOME=${EROOT}usr/bin
+TCLLIBPATH=${my_sys_lib}
+ITK_LIBRARY=${my_sys_lib}/itk$(grep ITK_VER /usr/include/itk.h | sed 's/^.*"\(.*\)".*/\1/')
+ITCL_LIBRARY=${my_sys_lib}/itcl$(grep ITCL_VER /usr/include/itcl.h | sed 's/^.*"\(.*\)".*/\1/')
+TIX_LIBRARY=${my_sys_lib}/tix$(grep TIX_VER /usr/include/tix.h | sed 's/^.*"\(.*\)".*/\1/')
+TK_LIBRARY=${my_sys_lib}/tk$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
+TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')"
+
+	( 	echo "${my_env_install}"
+		echo "${my_env}" | sed -e "s:^:export :" ) \
+	| sed -e "s:VAR_CASROOT:${S}:g" > env.sh || die
+	source env.sh
+
+	(	echo "PATH=${my_install_dir}/lin/bin"
+		echo "LDPATH=${my_install_dir}/lin/$(get_libdir)"
+		echo "${my_env}" | sed \
+			-e "s:VAR_CASROOT:${my_install_dir}/lin:g" \
+			-e "s:/Linux/lib/:/$(get_libdir)/:g" || die
+	) > 50${PN}
+
+	append-cxxflags "-fpermissive"
+
+	sed -e "/^AM_C_PROTOTYPES$/d" \
+		-i configure.* || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--prefix=${my_install_dir}/lin --exec-prefix=${my_install_dir}/lin \
+		--with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \
+		--with-freetype="${EROOT}usr" \
+		--with-ftgl="${EROOT}usr" \
+		$(usex gl2ps "--with-gl2ps=\"${EROOT}usr\"" "") \
+		$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
+		$(use_enable debug) \
+		$(use_enable !debug production)
+	#$(use_with freeimage) \
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	prune_libtool_files
+
+	# 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)" "${my_install_dir}/lin/lib"
+	fi
+
+	insinto /etc/env.d/${PN}
+	newins 50${PN} ${PV}
+
+	cd "${WORKDIR}"
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r data
+		doins -r samples
+	fi
+	dodoc doc/*.pdf
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc/{overview,ReferenceDocumentation}
+	fi
+}
+
+pkg_postinst() {
+	eselect ${PN} set ${PV}
+	einfo
+	elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it."
+	elog "You get a list by running \"equery depends sci-libs/opencascade\""
+	elog "revdep-rebuild does NOT suffice."
+	einfo
+}