gentoo resync : 24.12.2018

9 files changed, 44 insertions, 368 deletions

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index b9dfdd42dc97..5a5fc9ae0ee4 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,11 +1,6 @@
-AUX opencascade-6.8.0-fixed-DESTDIR.patch 2344 BLAKE2B 6e98f59e0209213937648828e255d434f185f57cc9b681682f7e27c4ef167aa5f9e3ace620e5c18f77e0790aff66ee3daac05398413bbb61b2b5d79b8f2a5b3b SHA512 9460d0f59a7088f8dc3ea7aba47c7efa24e5e91dcb140d56ee54f0dc36fbbda142eb0fcc52cdc3ee17751cb8e9bede3aef8c0629e0bcf6d237e71113ba4e4304
-AUX opencascade-6.9.1-vtk-6.3.patch 3686 BLAKE2B b91ca85b21aa154e467570b698bc4136c2e8fa4978f2b6ae459d8b4d2f5133d67d0bb5b8cedd158ab2a9539e9122eb9e0e50b6f8dfd45a1921ff7a14ed566b6b SHA512 8793d1384b7183a0d60dfae8c267358567e4dd16d3fcf4ade310fb63a63a2b82504f921a9700ea7d7b171b6a2b3bbcc891ed4405ea5e16579557a85301f17bf7
-AUX opencascade-6.9.1-vtk-8.1.patch 2184 BLAKE2B eac2c546e909ccd5781a5f1230c0b8e2fd8c4bd857d3bb3108253d587975e31170adfa029b3087d325a1a6124ceda408c92b5579fa67c1b3ee311e2389d87c8a SHA512 6559060e4ffd8d409d9f939aa63f109343c8f60aac9e742505bbf7e68a728c68b61983a878ab4c008ffb5f09f1f359e523192dcba459e929bf202c0c15ee4e25
-AUX opencascade-6.9.1-vtk-configure.patch 834 BLAKE2B 00475895b462d0396c4ab96bd645ad81f1180d04aad26e673b77d2363824740b5a0efe3bf75a587bea06a65b37a4ae2e41ceadad471eb4eb232783e3836450c0 SHA512 dbd6d3d2e520137a378dc437c37045f652d2dcf257b44647f9bc99397fde3fdecb88feaa010e1a893a6acdbe60d0e0e3ab9982b9fcd75dab95210069587445f7
+AUX opencascade-7.3.0-ffmpeg4.patch 1392 BLAKE2B ce5f6c82b34ca00c758411102d15b12bc410f98156b6281a2c50609eee05e1655e93cbd918c509b2daa6e018fb7cd107a6a8a539f9d9f19438d3cf5a7e20e3cd SHA512 447ff4039ed6ad0f01d62a4d129ff0eed77427fff11dc6303decb5e15b41dd1be305a909838c296a926ddaa8c93211995f188f95c4a70a9f9ce896e7d286929f
 AUX opencascade-7.3.0-fixed-DESTDIR.patch 2272 BLAKE2B 30b0e045d872673ff65f00b471d9b7e5239f451329d8a0d3f0f367c811a387ef76c368eeddc3fe8d6684d7012190ae09aac66f2f91fdec7b2b4f4134b3a1463a SHA512 57e5195516d8f282c0ecd5de88e7e29f00a3748ae9ac82c74eca3b4f577dd4f4e6286e1deda424590a8c8b30cb1cd326d5c4f1634d0f7dba5bcb6ce88758a9f5
 AUX opencascade-7.3.0-vtk-compat.patch 431 BLAKE2B 468a804ed906555637110b0d7cb7a4ef994fae9130e7317e525d21598cc19b67e8c7bfaaaffea82ee8fb94a20c14b42e6ec02e2541ddfc54fc288c8d0f68fc7c SHA512 026ed3451c1c36e1f187be390773329ad011c9ebdb766b730ee04f9f9a844a307c4fefc6669c81187fd34d8264bea233680c7ee43afb566e695c3d64c37438a4
-DIST opencascade-6.9.1.tgz 209589289 BLAKE2B 266d68042dbbb8c9bc5f167b9aefaf84b3f1568c25530acb36271443429e67972aae913ebcea09c9ea27164e2e3f007eb287350d7ad69486755cdcb713fdb1af SHA512 92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963
 DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6 SHA512 17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
-EBUILD opencascade-6.9.1-r2.ebuild 5774 BLAKE2B 4f2d3cdb9b50d3941fc4c1e4348571e048f056b80f6c9da8435069a5228b234470abcfc72193bf8b75e60bffbb8dd5473bfd640ac1a33ca6179364dd1bc3a434 SHA512 6016b22ea4b1255244d4f3b62ee886278e2ce8733c57488ed4192f4aee178ef50d32179a2e03ecd510aadba8d41f108f7ce56e00e3dd2715f262314900dfc49d
-EBUILD opencascade-7.3.0.ebuild 4365 BLAKE2B 23f295c3a85d8895da4d394de91a321ececece7bd3bd7d276c1170e3279b57059b88575395894b9b1ac920926efb951d8e5e66235df0915da9589ca16db729b0 SHA512 5f4cff9f0d304206aff60e4b682a8f1c9f0e0748cd10f300adda98375151f0cd28d2a3f33cb861471804d75fceef6bece50641f5f8bd961ac9f8ed53b19ff218
-MISC metadata.xml 628 BLAKE2B 890c96f583be59e59536e947e81e0c8161fafa25741dfcea265c4fa95248878b518684934c169a1c113b569b10ef9e0685e0747145f26ffaa8c045c83aa6923d SHA512 8aef8d8994a018f7351c7fb7c234dfbeccc0a46d76cd7ecd76687d42fa186d4e6b069c799584d1162b417d07ddb502bbd65349e71283927a4dea3504b79d85c3
+EBUILD opencascade-7.3.0.ebuild 4409 BLAKE2B d33465c90d3d909cef1eb03fecce63e3000aaadef3846a8229805232482a095441ab9d5c845c9b269ce1e47fcd7ce7f7ef7c532d4203846f7e6e6c192a397ed7 SHA512 3b0765d7f7a10224c9ccb13460c22d2f0bd22b44095344b0bd8c428aea802ee18698666060f8d7689b6f867c79a03f1dc1d252b83874eb2dd6f0fef36dea2fec
+MISC metadata.xml 547 BLAKE2B afe180fe9c0dc0aa357c84327220d543b919b18fde795512806e091a95cabb4a1e5db7dfe121ad6bcc728f41a794b97668fee8bece573defed9160391dc9d11d SHA512 b20c7221cc347b103440fad7098f48cdebd2f544c51e217671364380399f3d89b30f98ed323c457114640375c686b17abaa1d7193166cbb17cba0dfb916ae584
diff --git a/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch
deleted file mode 100644
index 1f37eace7602..000000000000
--- a/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- opencascade-6.8.0/Makefile.am
-+++ opencascade-6.8.0/Makefile.am
-@@ -82,27 +82,27 @@
- 	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 *.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
-\ No newline at end of file
-+.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
deleted file mode 100644
index 8e1d3361dde6..000000000000
--- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- opencascade-6.9.1/configure.ac
-+++ opencascade-6.9.1/configure.ac
-@@ -1044,7 +1044,7 @@
-     fi
-     if test "x$vtk_lib" != "x"; then
-       CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore -lvtkCommonDataModel -lvtkCommonExecutionModel -lvtkCommonMath -lvtkCommonTransforms "
--      CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL  -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
-+      CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL2  -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
-     else
-       HAVE_VTK=no
-     fi
---- opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx
-+++ opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx
-@@ -151,7 +151,7 @@ bool IVtkVTK_View::DisplayToWorld (const gp_XY& theDisplayPnt, gp_XYZ& theWorldP
-   myRenderer->SetDisplayPoint (theDisplayPnt.X(), theDisplayPnt.Y(), 0.0);
-   myRenderer->DisplayToWorld();
- 
--  vtkFloatingPointType* const aCoords = myRenderer->GetWorldPoint();
-+  double* const aCoords = myRenderer->GetWorldPoint();
-   if (aCoords[3] == 0.0) // Point at infinity in homogeneous coordinates
-   {
-     return false;
---- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx
-+++ opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx
-@@ -73,15 +73,15 @@ float IVtkTools_ShapePicker::GetTolerance( ) const
- //  Method: convertDisplayToWorld
- // Purpose: Convert display coordinates to world coordinates
- //============================================================================
--bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer         *theRenderer,
--                                                   vtkFloatingPointType theDisplayCoord[3],
--                                                   vtkFloatingPointType theWorldCoord[3])
-+bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer *theRenderer,
-+                                                   double theDisplayCoord[3],
-+                                                   double theWorldCoord[3])
- {
-   // Convert the selection point into world coordinates.
-   theRenderer->SetDisplayPoint (theDisplayCoord[0], theDisplayCoord[1], theDisplayCoord[2]);
-   theRenderer->DisplayToWorld();
- 
--  vtkFloatingPointType* const aCoords = theRenderer->GetWorldPoint();
-+  double* const aCoords = theRenderer->GetWorldPoint();
-   if (aCoords[3] == 0.0)
-   {
-     return false;
---- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx
-+++ opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx
-@@ -124,8 +124,8 @@ protected:
- 
-   //! Convert display coordinates to world coordinates
-   static bool convertDisplayToWorld (vtkRenderer *theRenderer,
--                                     vtkFloatingPointType theDisplayCoord[3],
--                                     vtkFloatingPointType theWorldCoord[3] );
-+                                     double theDisplayCoord[3],
-+                                     double theWorldCoord[3] );
- 
- private: // not copyable
-   IVtkTools_ShapePicker (const IVtkTools_ShapePicker&);
---- opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx
-+++ opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx
-@@ -124,8 +124,8 @@
- 
-   //! Convert display coordinates to world coordinates
-   static bool convertDisplayToWorld (vtkRenderer *theRenderer,
--                                     vtkFloatingPointType theDisplayCoord[3],
--                                     vtkFloatingPointType theWorldCoord[3] );
-+                                     double theDisplayCoord[3],
-+                                     double theWorldCoord[3] );
- 
- private: // not copyable
-   IVtkTools_ShapePicker (const IVtkTools_ShapePicker&);
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch
deleted file mode 100644
index d1f560320c6c..000000000000
--- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx
-+++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx
-@@ -80,9 +80,9 @@ void IVtkVTK_ShapeData::InsertVertex (const IVtk_IdType theShapeID,
-   vtkIdType aPointIdVTK = thePointId;
-   myPolyData->InsertNextCell (VTK_VERTEX, 1, &aPointIdVTK);
-   const vtkIdType aShapeIDVTK = theShapeID;
--  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
-   const vtkIdType aType = theMeshType;
--  myMeshTypes->InsertNextTupleValue (&aType);
-+  myMeshTypes->InsertNextTypedTuple (&aType);
- }
- 
- //================================================================
-@@ -97,9 +97,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType   theShapeID,
-   vtkIdType aPoints[2] = { thePointId1, thePointId2 };
-   myPolyData->InsertNextCell (VTK_LINE, 2, aPoints);
-   const vtkIdType aShapeIDVTK = theShapeID;
--  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
-   const vtkIdType aType = theMeshType;
--  myMeshTypes->InsertNextTupleValue (&aType);
-+  myMeshTypes->InsertNextTypedTuple (&aType);
- }
- 
- //================================================================
-@@ -124,9 +124,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType       theShapeID,
- 
-     myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList);
-     const vtkIdType aShapeIDVTK = theShapeID;
--    mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+    mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
-     const vtkIdType aType = theMeshType;
--    myMeshTypes->InsertNextTupleValue (&aType);
-+    myMeshTypes->InsertNextTypedTuple (&aType);
-     anIdList->Delete();
-   }
- }
-@@ -144,7 +144,7 @@ void IVtkVTK_ShapeData::InsertTriangle (const IVtk_IdType   theShapeID,
-   vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 };
-   myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints);
-   const vtkIdType aShapeIDVTK = theShapeID;
--  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
-   const vtkIdType aType = theMeshType;
--  myMeshTypes->InsertNextTupleValue (&aType);
-+  myMeshTypes->InsertNextTypedTuple (&aType);
- }
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch
deleted file mode 100644
index 3c2711d3813e..000000000000
--- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- opencascade-6.9.1/configure.ac
-+++ opencascade-6.9.1/configure.ac
-@@ -1043,8 +1043,8 @@
-       HAVE_VTK=no
-     fi
-     if test "x$vtk_lib" != "x"; then
--      CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore-6.1 -lvtkCommonDataModel-6.1 -lvtkCommonExecutionModel-6.1 -lvtkCommonMath-6.1 -lvtkCommonTransforms-6.1 "
--      CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore-6.1 -lvtkRenderingOpenGL-6.1  -lvtkFiltersGeneral-6.1 -lvtkIOCore-6.1 -lvtkIOImage-6.1 -lvtkImagingCore-6.1 -lvtkInteractionStyle-6.1 "
-+      CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore -lvtkCommonDataModel -lvtkCommonExecutionModel -lvtkCommonMath -lvtkCommonTransforms "
-+      CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL  -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
-     else
-       HAVE_VTK=no
-     fi
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
new file mode 100644
index 000000000000..fc572a4f5bca
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
@@ -0,0 +1,38 @@
+Author: jbeich
+Date: Wed May  2 13:25:55 UTC 2018
+New revision: 468831
+
+src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
+    aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+                        ^
+src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'AVFMT_RAWPICTURE'
+  if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
+                                     ^
+
+--- a/src/Image/Image_VideoRecorder.cxx	2017-08-30 13:28:21 UTC
++++ b/src/Image/Image_VideoRecorder.cxx
+@@ -276,7 +276,7 @@ Standard_Boolean Image_VideoRecorder::addVideoStream (
+   // some formats want stream headers to be separate
+   if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER)
+   {
+-    aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++    aCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+   }
+   return Standard_True;
+ #else
+@@ -449,6 +449,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame 
+   AVPacket aPacket;
+   memset (&aPacket, 0, sizeof(aPacket));
+   av_init_packet (&aPacket);
++#ifdef AVFMT_RAWPICTURE
+   if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
+    && !theToFlush)
+   {
+@@ -461,6 +462,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame 
+     aResAv = av_interleaved_write_frame (myAVContext, &aPacket);
+   }
+   else
++#endif
+   {
+     // encode the image
+     myFrame->pts = myFrameCount;
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index 7a267cb2e3be..ac137460a1e7 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
     <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
deleted file mode 100644
index b8abc59a41a3..000000000000
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 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 versionator
-
-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 +tbb +vtk"
-
-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/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
-	"${FILESDIR}"/${PN}-6.9.1-vtk-8.1.patch
-)
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	MY_VTK_P=$(best_version sci-libs/vtk)
-	MY_VTK_PV=${MY_VTK_P/sci-libs\/vtk-}
-	MY_VTK_SUB=vtk-$(get_version_component_range 1-2 ${MY_VTK_PV})
-	if has_version ">=sci-libs/vtk-6.3" ; then #bug 605304
-		eapply "${FILESDIR}"/${PN}-6.9.1-vtk-6.3.patch
-	fi
-
-	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 "/\$qt directory is not exists/s/AC_MSG_ERROR/AC_MSG_NOTICE/" \
-		-i configure.ac || die
-
-	# no longer needed https://tracker.dev.opencascade.org/view.php?id=28971
-	if has_version ">=sys-libs/glibc-2.26" ; then
-		sed -e '/#include <xlocale.h>/d' \
-			-i inc/Standard_CLocaleSentry.hxx || die
-	fi
-
-	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" \
-		--without-qt \
-		$(usex freeimage "--with-freeimage=${EROOT}usr" "") \
-		$(usex gl2ps "--with-gl2ps=${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_SUB}" "") \
-		$(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}
-	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."
-}
diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild b/sci-libs/opencascade/opencascade-7.3.0.ebuild
index 48f4c0775e4d..6d40cf35bba6 100644
--- a/sci-libs/opencascade/opencascade-7.3.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,6 +50,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
 PATCHES=(
 	"${FILESDIR}/${P}-vtk-compat.patch"
 	"${FILESDIR}/${P}-fixed-DESTDIR.patch"
+	"${FILESDIR}/${P}-ffmpeg4.patch" # bug 672248
 )
 
 pkg_setup() {