gentoo resync : 10.11.2017

9 files changed, 12 insertions, 817 deletions

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index f56664cdfa5c..1434920cf605 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,18 +1,8 @@
-AUX opencascade-6.5.4-fixed-tbb-VERSION.patch 236 SHA256 6b8a6057a374b86b6fa9b844b8cf6c362c0f65eff7dd282680ab858ebe9361af SHA512 6fe7eeec8904a495108f2f0ab78fc8bc64b5745472c43e7c710cebd6a1ac1a0ae1c5ba7f23ef81c95d677ee8438ba798e7e49a57ab8e65bbfc5ec05862627d57 WHIRLPOOL 7f6630bb5e9b13a9e9f331c0779b270677aeea9c243489b3c0bb7a021d6ffcaffdcc59a6b372233ee3d08fc2b9c750a6fb94844fc3c8a7248212899b4051b78b
-AUX opencascade-6.7.0-fixed-DESTDIR.patch 2597 SHA256 bfe4b8321efe9a6142b2a2aefaa9232f7a72a3f7dc5704a033ccd944cf800138 SHA512 715f73573e988a8ec2632a3d9beeccaa5d5f65d52bf54599485537615ec9c936ef1f90d9d22c673d7c741a177e642561cb7ce793311a4faef07168fdd54426d2 WHIRLPOOL 52153514e33267b971ae097498d7f325fc50cb846b2ff38072445f11343220313070295ff83bf146b51dcc7838fc407d758133fe8e7944d2670168fd66be12fe
-AUX opencascade-6.7.1-deprecated-glx-api.patch 3001 SHA256 36d03f5d40989c4f0f0c177e5acdb1ef1de2c179e9e3c97eb31e598908e01665 SHA512 f96788a08ae967d4b1b7cb635022afb9dd970a11f5149bc11dddc4f129254bb205a2c1dda57b4abe7cdf9b9a08bb514a51801f3d7fd8675cd334daf058368532 WHIRLPOOL 8967d9da5d2cc97659aec2c3dcc8a6c9b9c46a29d8265cb02c065c5b5a4d961c61425403849f97215b689331b1508d429d3353d7767018397fc7cfd256cac4fd
 AUX opencascade-6.8.0-fixed-DESTDIR.patch 2344 SHA256 2188f8acdf85a352d78276047a2be15966f20c1b34fa4b4f89f142778e6f1e02 SHA512 9460d0f59a7088f8dc3ea7aba47c7efa24e5e91dcb140d56ee54f0dc36fbbda142eb0fcc52cdc3ee17751cb8e9bede3aef8c0629e0bcf6d237e71113ba4e4304 WHIRLPOOL 27821860739046647d67ac751a5d1c1e8949d85470f660487a0a8d13b5e0b105a62fd2955b67947c035333d81caa6c47833184a7b2ac54b620b3abbe8f3c011b
 AUX opencascade-6.9.1-vtk-6.3.patch 3686 SHA256 9bb39b0266ed42300d7ce6869f8f66c2ec89c8502bfa320178b108d0e81becbb SHA512 8793d1384b7183a0d60dfae8c267358567e4dd16d3fcf4ade310fb63a63a2b82504f921a9700ea7d7b171b6a2b3bbcc891ed4405ea5e16579557a85301f17bf7 WHIRLPOOL 693e9add82061590f15bcec91fc41ca60bfc913986a0a1afd1b33b3666c5dcb2d8bae66c0bae545b69b119cd632e4e6767c6ad58a06ca2880637ff9dd1d1ad1c
 AUX opencascade-6.9.1-vtk-configure.patch 834 SHA256 634318e45602ee170e5a3a31edc12ad861d8b797dc0afb30596cb45295202f5f SHA512 dbd6d3d2e520137a378dc437c37045f652d2dcf257b44647f9bc99397fde3fdecb88feaa010e1a893a6acdbe60d0e0e3ab9982b9fcd75dab95210069587445f7 WHIRLPOOL 90e832fc217e57234b4b560fb47b2e879ce77384e1c530ed851cf50f56a88983213e0f45616141378590e5607a915e596e51daa795824edeb4ed5c32afacbfdc
-DIST opencascade-6.7.1.tgz 194568487 SHA256 c918cb554c0c22d322dc1d2f3a31069e1d5dcbae869db741339e1d4903e864b1 SHA512 31df4bd172d51b1ebee7e67075fa9cdbeb73eccb326f428b1911f15c9ac0feedc5977e2490f54a130b409f292dd6bfb7d40143263a47aa0330c28337639fe828 WHIRLPOOL d6fc042a4aca381ce74eaf1ca2adead5b0f88b599176c13ecd7a967f9dd92e4589c73ebde53ee3b374a78f696bacf674eb18a356ffcf38bbc8d7e60b30043fa6
-DIST opencascade-6.8.0.tgz 198319238 SHA256 50b145655fd3a4448e291388650cd0dcab8f9d99201aba32e8d26aeff03e8e1c SHA512 4fa95bc244001fd27ad1248acf44d6fd6633fa21fa2479bbea42977bdc9688b638eaca5df8442120d3e075113a031a7f894d0525a6b54e537cb3363c0a698c8b WHIRLPOOL 5b57de759208668e970ef0f3cf55589ea13d2295bac8d12ee597d7a40be402427c3c67e232d68df5a0f91ed87c9f7157faa717490f774e8431910d8223c49bf1
-DIST opencascade-6.9.0.tgz 203915299 SHA256 e9da098b304f6b65c3958947c3c687f00128ce020b67d97554a3e3be9cf3d090 SHA512 79c7f715087ca627447a1cfd0b19a216150d71865f53f791978842ca9663181c5b608d93a7dc81945ad0dba287ea003cfa3ff47ebae07602a8fd38e6e1344aee WHIRLPOOL ab3bf2d1e369f87501bc5f3f63c092b6586a76b56443179e542fc2c1b10e9d504429c60096b7bd555c578ba54212693d4b495f34bb9045c3e1fb519b1d480538
 DIST opencascade-6.9.1.tgz 209589289 SHA256 f92659ae3fb09c28233fb9178bc24fd2aab6776f6d9ea2479c3bdfe6296b873f SHA512 92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963 WHIRLPOOL 02fe93b6e6dc7de45a3bf55ce9c5d826cb83ffda565273d008961c5824475d8f4dda04b782071b821c017409aeb0f6be05ea29a5d89ca57db85ea757aec27e4a
-EBUILD opencascade-6.7.1-r1.ebuild 5098 SHA256 c7335c965ec735f459d928cbad7b039741ea1a5c10f331603e58476d28810c76 SHA512 86ccc1376fa7d8fc7630bd8ef2c1e7f9addf6d71cb3a4392c5eb50b2f3d4c423432042c2f03281d445e585f0a20eb3860af00e68f3e5e29a0a6b80794d94a17b WHIRLPOOL 6074182ce8e667c087f83a6341525f8153d1b077e838d47a5ba9e4ed4ff4d0d598b952404da7e09f385ccffd72b64602f0ed140072ce1f88afbdff514d515767
-EBUILD opencascade-6.8.0-r1.ebuild 4977 SHA256 e7c9c7ec2dd6b164635f429ad79a009bf8aaab61af289b661e615672d7d8b2d5 SHA512 e752b7de91a2e7da9a1b44d5fed5cfe5f7fe8c25bb814d1e6d43e67d06d557ad6727202252fc53f34f577277a1c18ccd4b25008247879f5cfe15e878e86e7454 WHIRLPOOL 8fa6b633fefa8d895d5a7b75a460a2df70ce1d2a1baf598d80af85a048ba03d5ec1b5e8109c135676636a4cf87f334dc75736a84fffea60dad1a1a147d74df44
-EBUILD opencascade-6.9.0-r1.ebuild 5353 SHA256 91d52589f7be92769f34928f54d2c430f2ed5e3f3bd529f1301697c0e973a884 SHA512 3f85e6798dfb28cce06d3daee5d1d9cf292b8b6ea377650054474d9fbfa0a792ef369628197b2d6b65bda3c412ba63ba819bed2ed592606fe0d7bf7f4802461d WHIRLPOOL 946b7ca3e2cdb01651f1257b4cef06a08692b412222f238501eec0fdf38ae24c7812519a92783415efa811e2c63fa4bff626832b3fe3130d3807169b7bc7e3f6
-EBUILD opencascade-6.9.1-r1.ebuild 5389 SHA256 320b64a85c7b0cb184366775272d2acb9eda56ff757bb907205563a50bf0a05e SHA512 dfe0a896bb37e759cd97e9985866a4b6ad5099d658dd1023567d7d03a1a80d02f23c50fb4b4e945a6bbfc8a05c4ea1d4ca31032afd3ceeadb3794547ea2359ad WHIRLPOOL ccb2cf0787f4d644e0faca8054341f5f541bc11ce8e32102703f48973391bcccdfb53c7c3d75c47cb8c2da84f58680017d233ad587c910b01221f1cacf6f24b1
-EBUILD opencascade-6.9.1-r2.ebuild 5602 SHA256 10708a70a850c1ef1485e5ae398bd639c91255bf7f3898f61783ab715511a7c1 SHA512 cc29500ad60128e2992ecc947b7240aba22961fbc61782d66a7b18f8bdee33f07caf64a42eb8a3f2c46ee1a149e45357356efb230c584a989bc210081215533d WHIRLPOOL 2e5f9ea0c0c4128421a2065bf215e708da9f60412024c751d86e8880930fd0dd5afc209fdaf6d2c833f64c1b1ea3bfbcef2660201e9109809a34611ab9bd4449
+EBUILD opencascade-6.9.1-r2.ebuild 5527 SHA256 32390194b735f9b6b2b8d097ea4ae93bc1af24ebed150ddd4cd44083a5081098 SHA512 2b483e6c79b5cb9aaf93bb8f39fe4ea1320cd0792ffc9b422c3b6b5fc7637f59440a08e0faebd926d4f0218452d98c8bbef568ece0ccd8cf4d59ef08916e2b2d WHIRLPOOL 8a9193687a99d851d88af6698b3b6b83456e61161bbc8bb36ae5c6174bf54c573dfe90865909abff37eef101c650a479fb1f814510540866f85d4f9035b63e67
 MISC ChangeLog 5585 SHA256 17d9a7f038282a0ae768cc7460441e023dc5653ab9f42a1bc4538dd20859f81f SHA512 09b148559706ec3e49bd6d38532421be839cab9fb468c5fa1adbb2275ce768f1b07949c0de9b775391e6479a0a1178aaac4c69bb5764e72cc4cdf11364a05f37 WHIRLPOOL 7765ed7bf188478bb2992565d52c7d17a9d812beaf3ad8f192dcfee22bdd21ab5a167cb370151e09350e391678179e9f8a3fa31de2b27097610cac54c881d797
 MISC ChangeLog-2015 5306 SHA256 8e3d95db8cfe4eeb972ef8ef8998c7f0a2f07a798eaef68e34d6296652a29939 SHA512 d6bba06e773b46f818290c25cf4f949403014cdf9b062c15d1165dc70e58b1ef7a1fa2aa4e275246c0592db736518d6d2d9e03d943f6e0d283a4ac1de0e74eda WHIRLPOOL 40419a1e4e8e51035097ddf1ba62ea133b4b0b112b7f05080172ff1a6925b6397ea1a1809b734011c3738ca934ede250f5f322b68306339b3982f98ae185b165
 MISC metadata.xml 580 SHA256 f8102061d63967206a537e3fac408d212b784c606f40cd260d02811566257fe6 SHA512 5483b31f271b1492f499aec837b18dd4e5abe4e0b4ac8a4e3de17be6bd9467faa0629bd7423c9fad3a6c827eb74ecddaedf61f795a2c05757b69400ad0b68311 WHIRLPOOL 04b93b1e78d244ca3dd658f3ac6b63e519c63d84f9eabe9b9ae905195885e56619f7322e755c9717d02f2636c6dc0bf414348a8a420dd9d8f1d8b97c91134b1b
diff --git a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch
deleted file mode 100644
index 88b13acd21c4..000000000000
--- a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Standard/Standard_MMgrTBBalloc.cxx
-+++ src/Standard/Standard_MMgrTBBalloc.cxx
-@@ -12,6 +12,7 @@
- 
- // paralleling with Intel TBB
- #ifdef HAVE_TBB
-+#undef VERSION
- #include <tbb/scalable_allocator.h>
- using namespace tbb;
- #else
diff --git a/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch
deleted file mode 100644
index 3a3f98093443..000000000000
--- a/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- Makefile.am.old	2014-01-13 09:43:18.530500362 +0100
-+++ Makefile.am	2014-01-13 09:45:40.430496833 +0100
-@@ -82,29 +82,29 @@
- 	cd $(top_builddir)/adm/lin/amk && $(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 \
--		rm -f $(prefix)/inc/config.h; \
-+	if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \
-+		rm -f $(DESTDIR)$(prefix)/inc/config.h; \
- 	fi
--	cd $(prefix)/inc && ln -s ../config.h config.h
--	cd $(top_srcdir) && cp draw.sh $(prefix)
--	cd $(top_srcdir) && cp custom.sh $(prefix)
--	cd $(top_srcdir) && cp env.sh $(prefix)
-+	cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h
-+	cd $(top_srcdir) && cp draw.sh $(DESTDIR)$(prefix)
-+	cd $(top_srcdir) && cp custom.sh $(DESTDIR)$(prefix)
-+	cd $(top_srcdir) && cp env.sh $(DESTDIR)$(prefix)
- 
--.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
-\ Brak znaku nowej linii na końcu pliku
-+.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
diff --git a/sci-libs/opencascade/files/opencascade-6.7.1-deprecated-glx-api.patch b/sci-libs/opencascade/files/opencascade-6.7.1-deprecated-glx-api.patch
deleted file mode 100644
index b3c3629aada1..000000000000
--- a/sci-libs/opencascade/files/opencascade-6.7.1-deprecated-glx-api.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From ba7e14489e14f08aae3e0f48b419b2149290b163 Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@kyomu.43-1.org>
-Date: Tue, 23 Dec 2014 21:15:59 +0100
-Subject: [PATCH] Define GLX_GLXEXT_LEGACY prior to inclusion of GL/glx.h
-
----
- inc/InterfaceGraphic_X11.hxx                  | 1 +
- samples/qt/Common/src/View.cxx                | 1 +
- src/InterfaceGraphic/InterfaceGraphic_X11.hxx | 1 +
- src/OpenGl/OpenGl_Context.cxx                 | 1 +
- src/OpenGl/OpenGl_Workspace_Raytrace.cxx      | 1 +
- src/Xw/Xw_Window.cxx                          | 1 +
- 6 files changed, 6 insertions(+)
-
-diff --git a/inc/InterfaceGraphic_X11.hxx b/inc/InterfaceGraphic_X11.hxx
-index 280bb9b..98d7415 100755
---- a/inc/InterfaceGraphic_X11.hxx
-+++ b/inc/InterfaceGraphic_X11.hxx
-@@ -21,6 +21,7 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/Xatom.h>
-+#define GLX_GLXEXT_LEGACY
- #include <GL/glx.h>
- 
- #if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX)
-diff --git a/samples/qt/Common/src/View.cxx b/samples/qt/Common/src/View.cxx
-index 77f51b8..9b3f4e2 100755
---- a/samples/qt/Common/src/View.cxx
-+++ b/samples/qt/Common/src/View.cxx
-@@ -28,6 +28,7 @@
- #include <Cocoa_Window.hxx>
- #else
- #include <QX11Info>
-+#define GLX_GLXEXT_LEGACY
- #include <GL/glx.h>
- #include <X11/Xutil.h>
- #include <X11/Xatom.h>
-diff --git a/src/InterfaceGraphic/InterfaceGraphic_X11.hxx b/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
-index 280bb9b..98d7415 100755
---- a/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
-+++ b/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
-@@ -21,6 +21,7 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/Xatom.h>
-+#define GLX_GLXEXT_LEGACY
- #include <GL/glx.h>
- 
- #if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX)
-diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx
-index 9e2f074..1ddf6a4 100755
---- a/src/OpenGl/OpenGl_Context.cxx
-+++ b/src/OpenGl/OpenGl_Context.cxx
-@@ -39,6 +39,7 @@
- #elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
-   #include <dlfcn.h>
- #else
-+  #define GLX_GLXEXT_LEGACY
-   #include <GL/glx.h> // glXGetProcAddress()
- #endif
- 
-diff --git a/src/OpenGl/OpenGl_Workspace_Raytrace.cxx b/src/OpenGl/OpenGl_Workspace_Raytrace.cxx
-index f1b5afe..870eb7d 100755
---- a/src/OpenGl/OpenGl_Workspace_Raytrace.cxx
-+++ b/src/OpenGl/OpenGl_Workspace_Raytrace.cxx
-@@ -32,6 +32,7 @@
- #elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
-   #include <OpenGL/CGLCurrent.h>
- #else
-+  #define GLX_GLXEXT_LEGACY
-   #include <GL/glx.h>
- #endif
- 
-diff --git a/src/Xw/Xw_Window.cxx b/src/Xw/Xw_Window.cxx
-index 5442365..0e80444 100755
---- a/src/Xw/Xw_Window.cxx
-+++ b/src/Xw/Xw_Window.cxx
-@@ -20,6 +20,7 @@
- #include <Aspect_Convert.hxx>
- #include <Aspect_WindowDefinitionError.hxx>
- 
-+#define GLX_GLXEXT_LEGACY
- #include <GL/glx.h>
- 
- namespace
--- 
-2.0.5
-
diff --git a/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
deleted file mode 100644
index de1201862abe..000000000000
--- a/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="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}.tgz"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples freeimage gl2ps java qt4 +tbb"
-
-DEPEND="app-eselect/eselect-opencascade
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/tix
-	media-libs/ftgl
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu
-	freeimage? ( media-libs/freeimage )
-	gl2ps? ( x11-libs/gl2ps )
-	java? ( >=virtual/jdk-0:= )
-	tbb? ( dev-cpp/tbb )"
-RDEPEND="${DEPEND}"
-
-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}-deprecated-glx-api.patch \
-		"${FILESDIR}"/${PN}-6.7.0-fixed-DESTDIR.patch \
-		"${FILESDIR}"/${PN}-6.5.4-fixed-tbb-VERSION.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" \
-		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-e "s:\$qt/include:\$qt/include/qt4:g"\
-		-e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
-		-i configure.ac || 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 freeimage "--with-freeimage=${EROOT}usr" "") \
-		$(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
-		$(usex qt4 "--with-qt=${EROOT}usr" "") \
-		$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
-		$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
-		$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
-		$(use_enable debug) \
-		$(use_enable !debug production)
-}
-
-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 "${S}"
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r data
-		doins -r samples
-	fi
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/{overview,pdf,refman}
-	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.8.0-r1.ebuild b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
deleted file mode 100644
index 1164f28ccc40..000000000000
--- a/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="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}.tgz"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples freeimage gl2ps java qt4 +tbb"
-
-DEPEND="app-eselect/eselect-opencascade
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/tix
-	media-libs/ftgl
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu
-	freeimage? ( media-libs/freeimage )
-	gl2ps? ( x11-libs/gl2ps )
-	java? ( >=virtual/jdk-0:= )
-	tbb? ( dev-cpp/tbb )"
-RDEPEND="${DEPEND}"
-
-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
-
-	# 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" \
-		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-e "s:\$qt/include:\$qt/include/qt4:g"\
-		-e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
-		-i configure.ac || 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 freeimage "--with-freeimage=${EROOT}usr" "") \
-		$(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
-		$(usex qt4 "--with-qt=${EROOT}usr" "") \
-		$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
-		$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
-		$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
-		$(use_enable debug) \
-		$(use_enable !debug production)
-}
-
-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}
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r data
-		doins -r samples
-	fi
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/{overview,pdf,refman}
-	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.9.0-r1.ebuild b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
deleted file mode 100644
index df80ca414820..000000000000
--- a/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="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}.tgz"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples freeimage gl2ps java qt4 +tbb +vtk"
-
-MY_VTK="vtk-6.1"
-DEPEND="app-eselect/eselect-opencascade
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/tix
-	media-libs/ftgl
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu
-	freeimage? ( media-libs/freeimage )
-	gl2ps? ( x11-libs/gl2ps )
-	java? ( >=virtual/jdk-0:= )
-	tbb? ( dev-cpp/tbb )
-	vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] =sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] =sci-libs/${MY_VTK}*[all-modules] ) )"
-RDEPEND="${DEPEND}"
-
-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.8.0-fixed-DESTDIR.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" \
-		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-e "s:\$qt/include:\$qt/include/qt4:g"\
-		-e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
-		-e "/CSF_VTK_LIB=/s:-${MY_VTK/vtk-}::g" \
-		-i configure.ac || 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 freeimage "--with-freeimage=${EROOT}usr" "") \
-		$(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
-		$(usex qt4 "--with-qt=${EROOT}usr" "") \
-		$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
-		$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
-		$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
-		$(usex vtk "--with-vtk-include=${EROOT}usr/include/${MY_VTK}" "") \
-		$(usex vtk "--with-vtk-library=${EROOT}usr/$(get_libdir)" "") \
-		$(use_enable debug) \
-		$(use_enable !debug production)
-}
-
-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}
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r data
-		doins -r samples
-	fi
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/{overview,pdf,refman}
-	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.9.1-r1.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
deleted file mode 100644
index dd0a0cb70c10..000000000000
--- a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="http://www.opencascade.org/"
-SRC_URI="http://www.opencascade.com/sites/default/files/private/occt/OCC_${PV}_release/opencascade-${PV}.tgz"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples freeimage gl2ps java qt4 +tbb +vtk"
-
-MY_VTK="vtk-6.1"
-DEPEND="app-eselect/eselect-opencascade
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/tix
-	media-libs/ftgl
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu
-	freeimage? ( media-libs/freeimage )
-	gl2ps? ( x11-libs/gl2ps )
-	java? ( >=virtual/jdk-0:= )
-	tbb? ( dev-cpp/tbb )
-	vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] =sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] =sci-libs/${MY_VTK}*[all-modules] ) )"
-RDEPEND="${DEPEND}"
-
-CHECKREQS_MEMORY="256M"
-CHECKREQS_DISK_BUILD="3584M"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch )
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	java-pkg-opt-2_src_prepare
-
-	# 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" \
-		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-e "s:\$qt/include:\$qt/include/qt4:g"\
-		-e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
-		-e "/CSF_VTK_LIB=/s:-${MY_VTK/vtk-}::g" \
-		-i configure.ac || 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 freeimage "--with-freeimage=${EROOT}usr" "") \
-		$(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
-		$(usex qt4 "--with-qt=${EROOT}usr" "") \
-		$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
-		$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
-		$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
-		$(usex vtk "--with-vtk-include=${EROOT}usr/include/${MY_VTK}" "") \
-		$(usex vtk "--with-vtk-library=${EROOT}usr/$(get_libdir)" "") \
-		$(use_enable debug) \
-		$(use_enable !debug production)
-}
-
-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}
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r data
-		doins -r samples
-	fi
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/{overview,pdf,refman}
-	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.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 3f0de66418db..5b581add74bf 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -12,9 +12,10 @@ SRC_URI="http://www.opencascade.com/sites/default/files/private/occt/OCC_${PV}_r
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples freeimage gl2ps java qt4 +tbb +vtk"
+IUSE="debug doc examples freeimage gl2ps java +tbb +vtk"
 
-DEPEND="app-eselect/eselect-opencascade
+DEPEND="
+	app-eselect/eselect-opencascade
 	dev-lang/tcl:0=
 	dev-lang/tk:0=
 	dev-tcltk/itcl
@@ -28,14 +29,16 @@ DEPEND="app-eselect/eselect-opencascade
 	gl2ps? ( x11-libs/gl2ps )
 	java? ( >=virtual/jdk-0:= )
 	tbb? ( dev-cpp/tbb )
-	vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[qt4] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )"
+	vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )"
 RDEPEND="${DEPEND}"
 
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"
 
-PATCHES=( "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
-	"${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
+	"${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch
+)
 
 pkg_setup() {
 	check-reqs_pkg_setup
@@ -111,9 +114,9 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*
 
 	sed -e "/^AM_C_PROTOTYPES$/d" \
 		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-e "s:\$qt/include:\$qt/include/qt4:g"\
-		-e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
+		-e "/\$qt directory is not exists/s/AC_MSG_ERROR/AC_MSG_NOTICE/" \
 		-i configure.ac || die
+
 	eautoreconf
 }
 
@@ -123,9 +126,9 @@ src_configure() {
 		--with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \
 		--with-freetype="${EROOT}usr" \
 		--with-ftgl="${EROOT}usr" \
+		--without-qt \
 		$(usex freeimage "--with-freeimage=${EROOT}usr" "") \
 		$(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
-		$(usex qt4 "--with-qt=${EROOT}usr" "") \
 		$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
 		$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
 		$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
@@ -162,9 +165,7 @@ src_install() {
 
 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
 }