gentoo resync : 05.04.2018

3 files changed, 53 insertions, 4 deletions

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 4f4fcabeba94..cd5e1e550c3f 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,6 +1,7 @@
 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
 DIST opencascade-6.9.1.tgz 209589289 BLAKE2B 266d68042dbbb8c9bc5f167b9aefaf84b3f1568c25530acb36271443429e67972aae913ebcea09c9ea27164e2e3f007eb287350d7ad69486755cdcb713fdb1af SHA512 92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963
-EBUILD opencascade-6.9.1-r2.ebuild 5734 BLAKE2B 3ce84511d5badd65f5c82f5a3d1d1a98497a72526178f5ea4c31a0495b2fdffaa6e6a00de78bb82af5718425babe9b5a6361016f9c9ca5e8fa9be2cced867d99 SHA512 940d63e47b62b70113b639b67bb03b8aee6b979274ac00e3a6855cc8283aaba6474e7f4d649e08ce60b45aa8b778bf49b8e6eb8b3383b08ce2119598fba84986
+EBUILD opencascade-6.9.1-r2.ebuild 5774 BLAKE2B 4f2d3cdb9b50d3941fc4c1e4348571e048f056b80f6c9da8435069a5228b234470abcfc72193bf8b75e60bffbb8dd5473bfd640ac1a33ca6179364dd1bc3a434 SHA512 6016b22ea4b1255244d4f3b62ee886278e2ce8733c57488ed4192f4aee178ef50d32179a2e03ecd510aadba8d41f108f7ce56e00e3dd2715f262314900dfc49d
 MISC metadata.xml 580 BLAKE2B 5a7b243a89950444f8c2f8115c60deabca6c4b53129dda885911e3d87125dc2e3e67f5821c95e5bd191f42b77dcbce2e0f289414dc98d90b8593932a71b15919 SHA512 5483b31f271b1492f499aec837b18dd4e5abe4e0b4ac8a4e3de17be6bd9467faa0629bd7423c9fad3a6c827eb74ecddaedf61f795a2c05757b69400ad0b68311
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
new file mode 100644
index 000000000000..d1f560320c6c
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch
@@ -0,0 +1,48 @@
+--- 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/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 8eff7a5ab1a6..b8abc59a41a3 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,13 +31,13 @@ DEPEND="
 	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() {
@@ -52,7 +52,7 @@ src_prepare() {
 	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
-		epatch "${FILESDIR}"/${PN}-6.9.1-vtk-6.3.patch
+		eapply "${FILESDIR}"/${PN}-6.9.1-vtk-6.3.patch
 	fi
 
 	java-pkg-opt-2_src_prepare