Version bump and backport mesa fix (bug 533412).

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

8 files changed, 270 insertions, 20 deletions

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index f7ecb9ff0a7c..9327c96f29a2 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/opencascade
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.21 2015/03/31 20:17:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.22 2015/07/22 12:48:53 xmw Exp $
+
+*opencascade-6.9.0 (22 Jul 2015)
+
+  22 Jul 2015; Michael Weber <xmw@gentoo.org>
+  +files/opencascade-6.5.5-deprecated-glx-api.patch,
+  +files/opencascade-6.6.0-deprecated-glx-api.patch, +opencascade-6.9.0.ebuild,
+  opencascade-6.5.5.ebuild, opencascade-6.6.0.ebuild, opencascade-6.7.1.ebuild:
+  Version bump and backport mesa fix (bug 533412).
 
   31 Mar 2015; Ulrich Müller <ulm@gentoo.org> opencascade-6.5.5.ebuild,
   opencascade-6.6.0.ebuild, opencascade-6.7.0.ebuild, opencascade-6.7.1.ebuild,
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 352b86119d25..fe14e0cf7d14 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -8,6 +8,8 @@ AUX opencascade-6.5-tcl8.6.patch 1668 SHA256 992f1c787e8a4c1333d19a99ee425c8b1f5
 AUX opencascade-6.5.4-fixed-DESTDIR.patch 2244 SHA256 724c3f20071a2be5e60c23115f3268e929b7c61b8443bbfbd5841aacdae9dcb5 SHA512 3db64c50d33835a307f5298fe694e3f26260d7ac4135b8acad144d9c14db78ad5fe2c743f3f9411b2165e44cf095b73149d0bf891bd01c794c2471da59b2ca73 WHIRLPOOL 0d2f9b7119806743029131e8ce0358311c36a93f0c354da8f4325b7284b2a26cf572d8dda512aa0ad591ea691f58fce07f8f1df03c459ae1c4e8f51f71541125
 AUX opencascade-6.5.4-fixed-tbb-VERSION.patch 236 SHA256 6b8a6057a374b86b6fa9b844b8cf6c362c0f65eff7dd282680ab858ebe9361af SHA512 6fe7eeec8904a495108f2f0ab78fc8bc64b5745472c43e7c710cebd6a1ac1a0ae1c5ba7f23ef81c95d677ee8438ba798e7e49a57ab8e65bbfc5ec05862627d57 WHIRLPOOL 7f6630bb5e9b13a9e9f331c0779b270677aeea9c243489b3c0bb7a021d6ffcaffdcc59a6b372233ee3d08fc2b9c750a6fb94844fc3c8a7248212899b4051b78b
 AUX opencascade-6.5.4-tcl8.6.patch 1392 SHA256 92294c760fd127892929640c295c227f1c414828629dfc5b05bf19c14b30a1db SHA512 2c9652e7c4e44caad41bf9f4bee298ee3b3ced8ba417375d28b3832696d2fca0eb9a5420bbd82370ea60a1423ffb07da46593a4e5d49cc65b4c8a572b3ddb0e6 WHIRLPOOL ed56348c7109f9f7f70dea8dab6e04f2816465c8852ebfc157d59886221221cd0ede959bfe0434f1822583efc9bc788e949bf3111e36ce1aff1091a1e3f54ea7
+AUX opencascade-6.5.5-deprecated-glx-api.patch 1156 SHA256 245a59b059937ff387de7d32b91078f8fc7338e323d60d80246340d415d2b08e SHA512 4b80342be3b9426df0644ba77afc80a7d65f89cb4d24ac0cbdd29acdeba412465b36b7b7f102a9a8e42593512befb78c7c89980b4ff75c2682e4831efac27f9f WHIRLPOOL 950ef37637219d3df2652b872fd8dc3b88e601b9555a658077403cac440c4cdc0fb67653422c4ba84db27a238b99ab9b4e78a85a54d29f23324c1db3950ab611
+AUX opencascade-6.6.0-deprecated-glx-api.patch 1692 SHA256 7ea200113381e0f2a788fbd205a025ae4b5c069f04588f3233ca2b94a69d736e SHA512 78f058d7c9de4b55e84d6eb0464307a73a0eb01b5c5595b5c079397a8401037206c366571a5d9f08afe2abf0bf78a3a01459ba13bcab38f392685079da060f21 WHIRLPOOL 3e55b0245d41df96d042f1212dc7db7517b62c9897279e014b4a5790ef111b50f0fa900d41900c360298d2d5858117eb6381615c7bb092f072b2f866e615b2c9
 AUX opencascade-6.6.0-fixed-DESTDIR.patch 2210 SHA256 e619c64d0880b44e1c029f6ce30d9574b214d3c03d5fb04a4b58ac928d0c0452 SHA512 f29230e7fc199c8923c7ab164e93d0bfe9cc53336628eaacdd9c8095aa73ec9d10fe396f911ab369522d002bcbdd58ee764feb91303bd1472825a939ffb391c6 WHIRLPOOL e02e1ee23e3d3a75fbf6393f0593a1484c196dbb43829c5b3ab00eb7d11d2e8483f21df61924833e6e98a010e87883cb8b0356077c8b2ef9b9b7a1d884672b25
 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
@@ -18,25 +20,20 @@ DIST OpenCASCADE660.tgz 119153607 SHA256 e39fa4b2255b9bd9bf97aa122043f4608d97b6b
 DIST opencascade-6.7.0.tgz 223046512 SHA256 882270c8f648f2589b4c241930217b21fd04fcb82e1f2ad6e930f7e0a64a2b0c SHA512 c3d163d080434b19c71958ff55c76956faa94e0a8160080a97fc3e69a940f4b2a3656f5e4e9190c13b8a44730e8bef3914641f4dec9a2dfeec803cfc1d4225ac WHIRLPOOL b036ee6b9cc958ca6b69cb359ddc9b7b368ce9f6562131fe5ac1f050cd20b54bdd5f70999ed1a2ae4c41f98f814cf68c11e0f5941b71b8478cb5dc1fa1c5a0c0
 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
-EBUILD opencascade-6.5.5.ebuild 5447 SHA256 7b20bae45a5885886f3386acee977aa5b86a5d79e5f4a37398ab50dce875ba06 SHA512 5f1460bd11fcb2807ba82e56ae0e9a699dac1e260e6c215a6928fd0d203527467d682bf2a5ffe25e527d31722bed4dad8d7758b01fdcbfabe58261528c7378dc WHIRLPOOL 9a499b97d139b16d14c5f15723e0ebb1e2382e451832dcfc427def11cb064244b505b8570d09768eb96cfb682bc2857f5691d310c6e5d2111586dba6c7e6216b
+DIST opencascade-6.9.0.tgz 203915299 SHA256 e9da098b304f6b65c3958947c3c687f00128ce020b67d97554a3e3be9cf3d090 SHA512 79c7f715087ca627447a1cfd0b19a216150d71865f53f791978842ca9663181c5b608d93a7dc81945ad0dba287ea003cfa3ff47ebae07602a8fd38e6e1344aee WHIRLPOOL ab3bf2d1e369f87501bc5f3f63c092b6586a76b56443179e542fc2c1b10e9d504429c60096b7bd555c578ba54212693d4b495f34bb9045c3e1fb519b1d480538
+EBUILD opencascade-6.5.5.ebuild 5495 SHA256 5b9f4592718aafcbc58dab9eb91bfe0c80c6d8037c8a0cb779f786616745926f SHA512 c50c40dfb9a0d1707c049eed14195e39a221c7b1ca67d0a4770486695bb74bdf42d5ddefa04e486c9dba142c2ee1f4a230deaf84d2f3d2a16e202e196e93cdda WHIRLPOOL 519f210d604634a3648a3d9b76c3f413dfd6bc331b38a9bf0f4e8667566f6cc6559a50519f3f0cbffb4a1f71b4e2a4593bf0c95175b91ac4115dbfcad9aa0318
 EBUILD opencascade-6.5.ebuild 5441 SHA256 1f751464a64256f9e6fadfcead08ee26a8023a3e178977c251e816af62bcc2a6 SHA512 a84e09e278cdea28cf1547c1ac1e1ee7dfae6b70edfa2293d028fe83f67df0f17e1009ca3ad176d607f02415555ea5f376772bdd409c0b91046768bcf222596b WHIRLPOOL e002c021cea917e10ba69530d6e2fdfb971d7328fbf3f3e01c956c50b75d28b73b7919d27e4c21a0924bf7b710ee194d59fd147919654efe1df6db556a74d54b
-EBUILD opencascade-6.6.0.ebuild 5421 SHA256 d3aa91c50015ec3dbbe8ab1c45f325559f6ad132b78b3c8d05d7190fbcf2c4f6 SHA512 3bf33004311556ebdee6e3aa46e6323c8858fc83902ddb4351a0a3c5de7f4b163cbb8876da41b0cf517bd7da2d6f1c080e8fb0bed872b87a9c5b04a33322ee19 WHIRLPOOL 52e7b39abdf8b9eb331db70a7b9db1630a39f5f0d11b3e4bc79741eeff58224cb3212435130d7b39d5ef953f02e6f1bcc061ae63d3c747788e344a374068f920
+EBUILD opencascade-6.6.0.ebuild 5462 SHA256 31f9514e76116cb255e5c61dc4d8a74f258b1648dbbb7b41754083722c3093d4 SHA512 73727fed2975ba25963d2f79f91675cb268dcdf6e523d1fa01e734edadd1c1823c33e085ca25601576b9fe5252900fa8fb8ed9a9fe958aeaef6d468b8e6c2f77 WHIRLPOOL c4f49af0535777aad88b49bc10527a52a2260ee0fb36ab8009b57acfe9ba88361a7678e9d6ac6a8c6854ff17a50709578785039541dfa2e64379b0adf683f1f2
 EBUILD opencascade-6.7.0.ebuild 5387 SHA256 599f79fab661a4c1f16cb89c4cec6a6e22e3b4ab764988b136b859d63d34cfcf SHA512 7dc3ff51525d195e8b388db5591f392384d05ed4981431d44ef647fd9f006f9d14def38f5555b42aa3475ca10a16b1f90ef4ce1799f26f47ea14f2ba8d0a362e WHIRLPOOL 3eb520c7c5d09223c3221448c2baa26261d63d5a596944f90884e38cf2c9b2638d47afb5c8ec81c4794428b9d29375a86afbca566faa43da4b051a4cb1944ec1
-EBUILD opencascade-6.7.1.ebuild 5387 SHA256 cf7301be37ff51045fb9a7b1d30100480ee60675d17ca184097ff5f5c0359760 SHA512 f98817a88638895417b827db184e60f92ced0e2ef8262701077e66e7f47234f6d4ec0f608a386e4c38c8bb85a5c897bbbbcce88e4913d46cd93331f647183641 WHIRLPOOL 60b7992fbc1dc9f89bb4278e963a358fb7ee1174051141e87114d3fa1235ee21a0b9f51c2c02a8569ca1a43dab95d4982bc2d2463216512be71b61c4642d8fa0
+EBUILD opencascade-6.7.1.ebuild 5380 SHA256 72820a486303015cf2b4209269c8c2f0822c150274ad8bccabe0a7b846e9efa0 SHA512 65b400426fca09b2d56ce557cbfdd4e64caa0aba76184042a8adc988eae086f719d2b154b877b72dd4e6d4a02a9fc76cbef55a8e052d18f1b19165588c6c39b1 WHIRLPOOL 1f3f8bf3c096ad7808d9daa164417a517175100a1927ed12292846056b1884b9885bc13e7cc9c4174b481bc87c1719a88c0e91036bc6e71dd22a254389ca5ec4
 EBUILD opencascade-6.8.0.ebuild 5259 SHA256 e47b265e9d68307d9b769f531a45dbf97205da4db99eaf0da4e624fa2aecbb4c SHA512 5343548b83c0b396443195f939f0016f3fa0ee841a96b2d973456f23ec0ff24d92e9e8db53eb8a125402d73998ffe58009c1b467fdb48deb88136c050988d68f WHIRLPOOL 7bcb5b5983dd1b708952786722bafbe50a47e81cd8ea5f596f8d909081990aaa15a751a8c262965eaf8c028abf04f37fdd0086c2e38e4e98f6ff0f4cb1d8bc9d
-MISC ChangeLog 4858 SHA256 472cd2d5ff11fa861709c9d9f1af9846b35e01b0dae640f1acd8e56eb7f42e85 SHA512 458a7219afa85a324a2b8a860ea2137907fdd3da5a09b787adfb521b7dff3a93ea0474fec53070da652fd9fb5d5c79065243d4f84c1585f9edf1136130ef9abb WHIRLPOOL 5f4971e02770029a2e9912f50160ee6c781390f8c60759c8ef3b1f688098e5103cf7bfe8454a2f501edce5ac183922d4049adefb403bfda8ae5ba22522c74b71
+EBUILD opencascade-6.9.0.ebuild 5266 SHA256 07dc6ba6d2938ee4bde02bb24c8d086e0a225bb9dd2cb3c6b9cd401104ce8042 SHA512 36b5a2244e28d0f42684ca362d99783e7489f7a844ca9348c6d04d0bb9f0f1b3bce2f768c82eee0a541b7fdd60c44a7ec7739a498ea9654e884f43b79d07d3dc WHIRLPOOL 2ea7ba24ffdd16da5de4ac87ca0ecfce73161b08ab58166459ca6e33c46a10d13f6d74326a9d9053dfb2362272d39957fea18df61480760efb7baf099b45f92d
+MISC ChangeLog 5203 SHA256 0d9bd932221beea344c0dea72606751d47149585ab0ee61a41a9bc517112e9b6 SHA512 a19cfffb59a23730187992e07cbee280f4212a43211dcb7a4d0c89153c473d93720d4e6d519f68431be3e9c74bad4bff37c78c447526c91cbdb80baf88c722ba WHIRLPOOL 1d4a36d79f5f2fbd8130bf465eba3787ba6556ff6526fe3a3f56f0ea3290934761e873e05d4c8a6fb991482accd3f6e905486bd0d8d38c5ed78bfd1ec72e608e
 MISC metadata.xml 509 SHA256 42245cff528c7c993f2998e9e65ef2a8975c3a3a031617a4d9709506c6454815 SHA512 f5f997e317c6b2b4301c4f53d50ea947776060b54a64e155dcefc479a955271e0f2cad2209304d97b8873ecf177ba769beb854206fe44349fe142ad679c636a6 WHIRLPOOL abf93f5079ce8368b486b2d39b75b8fc9da12267ed3096b118a79f1ed42d2d52f0a3abed5ebebf94a3c01bee2aadc089762d52b64e9eebcf740c8136e98a82c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVGwDVAAoJEJQzkH1pP7W4c30L/i2wS3dJ797Le1pKLNUHt6KV
-UrY0kpujIXOmn6r6iS46Ri1Ehekr75aph233jz3VBgWy/YG6JnTfwENpL5Gkd52K
-oV9Fvg6m0xZVABB3vZNDBWO1utRUtjEXLU4zUGHAwxSTgiAPbVxgqOwZl+jleKLm
-YvWTeisLjVJ6Y6zBMV83oCemwa69xN7aaN5JPmFWQkTjYqY5wnMOJqQY/MsguJDP
-hRTBQv2i2Tbp0yKbF6V9tZ2BalEB6JNbQeC2SqIJL4b4SI4FSfovQn8U1XN8Dt0O
-u0uSv7JuPzMunzbrtqihEnKEoEyaT87nPru8le98zjf/802cTggIoZmqBnF2zCon
-VQSdd+gv5Nx5uMIKf5MnZqFLCHah4SX/KEgRBbIzSahWHXTrnOXdHZqGnFEjGxm7
-jXOe8o0VVG30+QwYVxWGq2rGTLW+03F6IBvkS6fjk5/4Zxq1VRfv2FVgl2FICS6g
-AUY2rZ6lNnQxuDjPfZryZnuKAPIfIIQMeBYnrst53w==
-=aYMs
+iF4EAREIAAYFAlWvkTcACgkQknrdDGLu8JBa/gD/VW6Chk4qbdrbTpTIAhFRyGov
+vxZvkEA19LCPXidQnVYA/Rm+bhD1Pdv8/HDATVz+W1mV7OrhEvYLoeFEP/xjOrg0
+=GvOo
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/opencascade/files/opencascade-6.5.5-deprecated-glx-api.patch b/sci-libs/opencascade/files/opencascade-6.5.5-deprecated-glx-api.patch
new file mode 100644
index 000000000000..930b73484fee
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.5.5-deprecated-glx-api.patch
@@ -0,0 +1,30 @@
+--- opencascade-6.5.5/ros/inc/InterfaceGraphic_X11.hxx
++++ opencascade-6.5.5/ros/inc/InterfaceGraphic_X11.hxx
+@@ -25,6 +25,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) 
+--- opencascade-6.5.5/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
++++ opencascade-6.5.5/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
+@@ -25,6 +25,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) 
+--- opencascade-6.5.5/ros/src/OpenGl/OpenGl_Context.cxx
++++ opencascade-6.5.5/ros/src/OpenGl/OpenGl_Context.cxx
+@@ -38,6 +38,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/sci-libs/opencascade/files/opencascade-6.6.0-deprecated-glx-api.patch b/sci-libs/opencascade/files/opencascade-6.6.0-deprecated-glx-api.patch
new file mode 100644
index 000000000000..d3ae6ae7f4c4
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.6.0-deprecated-glx-api.patch
@@ -0,0 +1,50 @@
+--- opencascade-6.6.0/ros/inc/InterfaceGraphic_X11.hxx
++++ opencascade-6.6.0/ros/inc/InterfaceGraphic_X11.hxx
+@@ -25,6 +25,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) 
+--- opencascade-6.6.0/ros/samples/qt/Common/src/View.cxx
++++ opencascade-6.6.0/ros/samples/qt/Common/src/View.cxx
+@@ -25,6 +25,7 @@
+ #include <Cocoa_Window.hxx>
+ #else
+ #include <QX11Info>
++#define GLX_GLXEXT_LEGACY
+ #include <GL/glx.h>
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+--- opencascade-6.6.0/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
++++ opencascade-6.6.0/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
+@@ -25,6 +25,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) 
+--- opencascade-6.6.0/ros/src/OpenGl/OpenGl_Context.cxx
++++ opencascade-6.6.0/ros/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
+ 
+--- opencascade-6.6.0/ros/src/Xw/Xw_Window.cxx
++++ opencascade-6.6.0/ros/src/Xw/Xw_Window.cxx
+@@ -24,6 +24,7 @@
+ #include <Aspect_Convert.hxx>
+ #include <Aspect_WindowDefinitionError.hxx>
+ 
++#define GLX_GLXEXT_LEGACY
+ #include <GL/glx.h>
+ 
+ namespace
diff --git a/sci-libs/opencascade/opencascade-6.5.5.ebuild b/sci-libs/opencascade/opencascade-6.5.5.ebuild
index 00b7c9014606..28d3d12cf8c7 100644
--- a/sci-libs/opencascade/opencascade-6.5.5.ebuild
+++ b/sci-libs/opencascade/opencascade-6.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.5.ebuild,v 1.6 2015/03/31 20:17:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.5.ebuild,v 1.7 2015/07/22 12:48:53 xmw Exp $
 
 EAPI=5
 
@@ -49,6 +49,7 @@ src_prepare() {
 	java-pkg-opt-2_src_prepare
 
 	epatch \
+		"${FILESDIR}"/${P}-deprecated-glx-api.patch \
 		"${FILESDIR}"/${PN}-6.5.4-fixed-DESTDIR.patch \
 		"${FILESDIR}"/${PN}-6.5.4-tcl8.6.patch \
 		"${FILESDIR}"/${PN}-6.5.4-fixed-tbb-VERSION.patch
diff --git a/sci-libs/opencascade/opencascade-6.6.0.ebuild b/sci-libs/opencascade/opencascade-6.6.0.ebuild
index 8c6f10ce3c06..14ccb681b33b 100644
--- a/sci-libs/opencascade/opencascade-6.6.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.6.0.ebuild,v 1.4 2015/03/31 20:17:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.6.0.ebuild,v 1.5 2015/07/22 12:48:53 xmw Exp $
 
 EAPI=5
 
@@ -49,7 +49,8 @@ src_prepare() {
 	java-pkg-opt-2_src_prepare
 
 	epatch \
-		"${FILESDIR}"/${PN}-6.6.0-fixed-DESTDIR.patch \
+		"${FILESDIR}"/${P}-deprecated-glx-api.patch \
+		"${FILESDIR}"/${P}-fixed-DESTDIR.patch \
 		"${FILESDIR}"/${PN}-6.5.4-fixed-tbb-VERSION.patch
 
 	# Feed environment variables used by Opencascade compilation
diff --git a/sci-libs/opencascade/opencascade-6.7.1.ebuild b/sci-libs/opencascade/opencascade-6.7.1.ebuild
index f8268b51543b..8dd8f377570e 100644
--- a/sci-libs/opencascade/opencascade-6.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.7.1.ebuild,v 1.6 2015/03/31 20:17:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.7.1.ebuild,v 1.7 2015/07/22 12:48:53 xmw Exp $
 
 EAPI=5
 
@@ -47,7 +47,7 @@ src_prepare() {
 	java-pkg-opt-2_src_prepare
 
 	epatch \
-		"${FILESDIR}"/${PN}-6.7.1-deprecated-glx-api.patch \
+		"${FILESDIR}"/${P}-deprecated-glx-api.patch \
 		"${FILESDIR}"/${PN}-6.7.0-fixed-DESTDIR.patch \
 		"${FILESDIR}"/${PN}-6.5.4-fixed-tbb-VERSION.patch
 
diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild b/sci-libs/opencascade/opencascade-6.9.0.ebuild
new file mode 100644
index 000000000000..0c3bfbf5c61e
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-6.9.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.9.0.ebuild,v 1.1 2015/07/22 12:48:53 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}.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:= )
+	tbb? ( dev-cpp/tbb )"
+RDEPEND="${DEPEND}"
+
+# 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.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"\
+		-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
+}