summaryrefslogtreecommitdiff
path: root/sci-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-01-29 02:53:24 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-01-29 02:53:24 +0000
commitb8ec9071f5d20d8518b02d0077428b2c9f88861b (patch)
tree6214c0d63a2bd5ae464941924a90f415687fa63c /sci-libs
parentbdf6e70da7a28f45617c02a251bb6b3844202bc5 (diff)
gentoo auto-resync : 29:01:2023 - 02:53:24
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/Manifest.gzbin43588 -> 43591 bytes
-rw-r--r--sci-libs/opencascade/Manifest6
-rw-r--r--sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch26
-rw-r--r--sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch28
-rw-r--r--sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch26
-rw-r--r--sci-libs/opencascade/files/opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch172
-rw-r--r--sci-libs/opencascade/opencascade-7.5.3-r8.ebuild176
7 files changed, 0 insertions, 434 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 56fd1a32f2b8..c7c3669d5cba 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
Binary files differ
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 172e17cf2ce5..bf5942ad6566 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,10 +1,6 @@
-AUX opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch 969 BLAKE2B 5a13b58f134e8e0670ec817308d95cc9028ac5fce3b243b8e09f191dbcdf15b1587ca8aef7a726b7d9199a708b3a949328d7fc04426e816ce6c05c74b310840e SHA512 4c22f4767ed2b81e21ce7861b6e97d3b1e13e2ebb57278c63d8a9edeae7a2b9518200d39ec30d7000d3ae3b5376a81f08150354be80848247c803208aa28c480
-AUX opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch 764 BLAKE2B 512ebf9fd13e60acbc9d47067f158a5043623c52265ff36c216d6735e3a6df9e6355d8bf400330dd00e3ff178b24410aa547ea648ade578f9b9f0dbd6ad0eed3 SHA512 55a452c22addd31b258d078c1871537588b4b06cacabc2cb1252d01b8b9972fb416779456009ea6946935b996c12292aa0ca6d72f8b9bb33407800e5434daae1
-AUX opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch 841 BLAKE2B 6189432e409f20c5181a5ab3e4febd0ec0ddaf1888183d2fe5772f29ff2bece5f499e0987226a2608572a576defa990ee0ac9827d97078a2bee99f2e7e22c053 SHA512 9a4bd753c76abf32d843220210a2f2ffaac82e4e48f359a41f42482dcfbc4d67b349821f801a7886dfb604e87ff6923a0d2fd15ebe76342f8af42b5dbc5d79d9
AUX opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch 2207 BLAKE2B f00d3137ff9046019f0e4dbad09d79141a65c0b68da0e5c613aa234fddfd651e2b61fb00129ae7a84f521ca3e00858d76ce46cc2f62521c22402f4b664e94274 SHA512 8a4206854a96fb4c45450ad1081cd28ede0171f32392d9f0876b7e41789a0ba2e07ca82011503bd562541367a6b39b8df15aba843f6bb6eef6c473db6ee788a4
AUX opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch 2453 BLAKE2B 01b0ec99fb9ad032d6a90cceabb50900528abd0528b53e976484bf02f04eac9bc02b063bce5c221ae88782a126103e8077db9e90aa7f64f4f187dad00354d4d2 SHA512 fb3c374fe8aff8d2bac039a0eef754f2e823a97bfd7860bdd7e047c1b357202abfca0e37b46afc32220c7e354b5edb54805fbbbffde015bb4be2d7f4ded4a8da
AUX opencascade-7.5.1-0006-fix-creation-of-custom.sh-script.patch 1245 BLAKE2B 1972c41e264a86761f8b3a3a649e67211776d0a4791b7e0f3adc859833e1d62e3a1d964484b2c53a516f5a33680ab2f32ad2010bf3fd531fca36373435307b68 SHA512 a2ffef88cb87acbc8215a7d1d7fe69ee17210392d39a64535d1538b2c08e43f5918c5b5e4a7540e8d636b1ba0df51670013e9d49f205bfc93a1e0d10a04388a7
-AUX opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch 5749 BLAKE2B 9176a738ec6b39a1cd5da61f2d72d096b09f6019f63a5b7733c5aa00796529f2cc5e3becdf5c24cfa01e4ff5b9da5ae9cd359372e6974eeaae7bcdf87e8c03c8 SHA512 5f7970e1461652966c34b1adb6e2580cfd7e3e230abbf108193027f67afbd5e78fc7451b50bf632fa3889174626384e4a0044d693e4f49ab9ece84a2ec6bd04a
AUX opencascade-7.5.3-tbb-2021.patch 1931 BLAKE2B cf4f6895f7418a4af75f164065945aff9b7f592ed221b1802f08c9b912fb970c5f7a868c9302f05865f8bd5f30de1bdda2abcb0dc928d28500ca3956735efa2b SHA512 203d28fe8b61ac7cabac2f6d2dd1e1deea80e9f18123ced4581bf2cfa054d350251cdc9e32f01a95b713ac915859be42f25e770593469ca3f07169e0508ef18c
AUX opencascade-7.6.2-avoid-pre-stripping-binaries.patch 1187 BLAKE2B fbfc9f3aafc4e69259cc37e82c266f7af979716bed7d80fd0f680b4b6d6fdad3b26b0214f06fbbc8ee09db08602572a4543ad0aa8ec7b1af98139312cdba291d SHA512 04c7f37e42eeafe6d8ee99df8c50bb5bf8bbc90c8b958fcf486adbfbf79fcba60c4a3bbbf7495388096f5902b0af7280f0561556eae6e6f030b73850df55ca2c
AUX opencascade-7.7.0-add-missing-include-limits.patch 459 BLAKE2B 507fd80c08c52ea1e9a9e70a0cbc6bee4f7093123de71f2b173e2d43355a1cc8a45f05e4acc7c07dbdfa1035fe13c97d56466a15e386c00c03c283dddd6b71a5 SHA512 048384188731831f7dd47d32d38df115a3e4c6abaf47615233b16c00b0547fee8ec757623d5c7ff0250988c9d47c0821fa06f95a69413fe2c339f0a5a47223d1
@@ -12,10 +8,8 @@ AUX opencascade-7.7.0-avoid-pre-stripping-binaries.patch 1357 BLAKE2B 2f26c4a4e4
AUX opencascade-7.7.0-build-against-vtk-9.2.patch 1360 BLAKE2B 39bcae904286687ff2aca6662f18d67e72a341e98281b0b04b7b302ad9d0adfa576ad82ce3cfa646e1b9f4107580231bf8613d0cdb72791fda478485c8072827 SHA512 3afb471767b78b4096e00a8eab4c71a90944c70945a16f45ac372ab824c4c6a140c165882e7cb15c95c95d70ae4c9298cc03fc7cd4ebe920bb7ed4eb38aba0a5
AUX opencascade-7.7.0-fix-installation-of-cmake-config-files.patch 1823 BLAKE2B e84bb8627ba5cee166c483631511d150ef9af2c1aa966d7154926600da0674214b3fce8363dcff7d94204c36a92f236ede0f7849039a3bd4509d04d91444204f SHA512 242604d59b3596644b1efa95ce9d7b3d30dbb1bd49f79e28a4ea66ac9b6d4728a32cf31ceb9078875a39bb7b8775ba3ce685560045684b803037a61e2f37d2a4
AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019
-DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
-EBUILD opencascade-7.5.3-r8.ebuild 4977 BLAKE2B 09303b0bd2784d3db5eb2ed08f6cfa961a3a520a415612fd85e17d378bdf8783e57d8aa5400f8667fd73f21e272818e1e30def087dee9f88c5fd961e9b372a46 SHA512 1a3b1c38a9c7a3a04360261e995994c762389512aac0cd82687c08f7beb6491350d768d5343b54b83460538e663788bf5e00b503936f5364b3296a20039da935
EBUILD opencascade-7.6.3-r1.ebuild 4685 BLAKE2B 5351fbd25c858e42f36e1fed3cbb39d22b2e06d0ffe41b69c97239dc27924b2bcb976deac5e33921fe2db8ef0a455d07077181429c4aa81ba800e95050180d7f SHA512 796036d3a0c6d24e5ecd3a3d81df64565f22aed96feaac0ceafad8cf8eb2e8914d64a3cd81c9856d042cd281ab166114e448580fd023f09e76b4f06a56d7a23b
EBUILD opencascade-7.7.0-r1.ebuild 4808 BLAKE2B 233a0b6b837b0099935ec1cc87c33f9d54eb622a926a29066ff166c8ea064eb86a316f2cc10d148661f5944d988e6222afc4d5bd1d72fff105727f194624e733 SHA512 ac5969f42da17f2fc2965785b420c41831fd46060b42f761f11f67a1c5fe81c0496da994d2dc222dc39168cf3bd38bae887b7c1a3f6cbe6fdb146c1ea94a25da
MISC metadata.xml 1102 BLAKE2B 8569899b7ab437a4115ced11d3421f063d99233ed81bb5360228e580b20af2ee9753b41a8b3cb1291550160fa627058d915fde0e23514dcbed0f9cddc961ae11 SHA512 e9a38c41beec8eb54d6b9232447df3bc05635318f8dc727ddebc5f13be4d58b8d10576ddbb07a9fef41ba2adeb7ba1abcb4e10087b4711c4ff348d873c4916a8
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
deleted file mode 100644
index 68be3e1c8803..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c7d8a7374284186136d72fc285f9e55045b306fb Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 3 Feb 2021 23:31:23 +0100
-Subject: [PATCH] allow default search path for Qt5
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- adm/cmake/qt.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/adm/cmake/qt.cmake b/adm/cmake/qt.cmake
-index 535e6a20..6c2141dd 100644
---- a/adm/cmake/qt.cmake
-+++ b/adm/cmake/qt.cmake
-@@ -24,7 +24,7 @@ set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
-
- # Now we can apply standard CMake finder for Qt5. We do this mostly
- # to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
--find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH)
-+find_package(Qt5 COMPONENTS Widgets Quick Xml REQUIRED)
- if (NOT ${Qt5_FOUND})
- # Now we can apply standard CMake finder for Qt. We do this mostly
- # to have qt4_wrap_cpp() function available
---
-2.30.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch
deleted file mode 100644
index 91d5c66c7614..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From dcf67dbc486a97256ea6df7b968f69346e7b3dba Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 3 Feb 2021 23:45:27 +0100
-Subject: [PATCH] remove unnecessary Qt5 check
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- adm/cmake/qt_macro.cmake | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/adm/cmake/qt_macro.cmake b/adm/cmake/qt_macro.cmake
-index ec897384..363d9c52 100644
---- a/adm/cmake/qt_macro.cmake
-+++ b/adm/cmake/qt_macro.cmake
-@@ -2,10 +2,6 @@
-
- macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
-
-- if ("${3RDPARTY_QT_DIR}" STREQUAL "")
-- message (FATAL_ERROR "Empty Qt dir")
-- endif()
--
- if (${Qt5_FOUND})
- #message (STATUS "Qt5 cmake configuration")
-
---
-2.30.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch
deleted file mode 100644
index 0665790d20a1..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a8aa40ec021dac8310d77bcec71ee298f6773926 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Thu, 4 Feb 2021 22:29:57 +0100
-Subject: [PATCH] add Gentoo configuration type
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 100d6133..887a1cd7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/adm/cmake")
-
- set (CMAKE_SUPPRESS_REGENERATION TRUE)
-
--set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
-+set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo Gentoo CACHE INTERNAL "" FORCE)
-
- # macro: include patched file if it exists
- macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
---
-2.30.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch b/sci-libs/opencascade/files/opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
deleted file mode 100644
index e2725ebb2c64..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From f624c55d7b75ccbe3fdfef0db141fdbe1f6b383a Mon Sep 17 00:00:00 2001
-From: anv <anv@opencascade.com>
-Date: Tue, 27 Apr 2021 21:33:54 +0300
-Subject: [PATCH 1/2] 0032331: Visualization - Exception when trying to display
- some surfaces using iVtk with VTK 9
-
-Updated memory allocation for vtkPolyData to use more suited method for VTK versions after 9.0
----
- src/IVtkDraw/IVtkDraw_Interactor.cxx | 7 +++
- src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx | 50 ++++++++++++++++++-
- 2 files changed, 56 insertions(+), 1 deletion(-)
-
-diff --git a/src/IVtkDraw/IVtkDraw_Interactor.cxx b/src/IVtkDraw/IVtkDraw_Interactor.cxx
-index f9f68c37b6..1b68c959f5 100644
---- a/src/IVtkDraw/IVtkDraw_Interactor.cxx
-+++ b/src/IVtkDraw/IVtkDraw_Interactor.cxx
-@@ -20,6 +20,13 @@
- #include <vtkWin32OpenGLRenderWindow.h>
- #else
- #include <GL/glx.h>
-+
-+// Preventing naming collisions between
-+// GLX and VTK versions 9.0 and above
-+#ifdef AllValues
-+#undef AllValues
-+#endif
-+
- #include <vtkXRenderWindowInteractor.h>
- #include <vtkXOpenGLRenderWindow.h>
- #endif
-diff --git a/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx b/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
-index 26ded68af5..bd289d2b51 100644
---- a/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
-+++ b/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
-@@ -87,6 +87,11 @@ int IVtkTools_SubPolyDataFilter::RequestData (vtkInformation *vtkNotUsed(theRequ
-
- // Prepare the list of ids from the set of ids.
- // Iterate on input cells.
-+#if (VTK_MAJOR_VERSION >= 9)
-+ // Count number of different cells.
-+ int aNbVerts = 0, aNbLines = 0, aNbPolys = 0, aNbStrips = 0;
-+ int aNbVertPts = 0, aNbLinePts = 0, aNbPolyPts = 0, aNbStripPts = 0;
-+#endif
- if (!myIdsSet.IsEmpty())
- {
- for (vtkIdType anI = 0; anI < aSize; anI++)
-@@ -95,13 +100,56 @@ int IVtkTools_SubPolyDataFilter::RequestData (vtkInformation *vtkNotUsed(theRequ
- {
- // Add a cell id to output if it's value is in the set.
- anIdList->InsertNextId (anI);
-+#if (VTK_MAJOR_VERSION >= 9)
-+ switch (anInput->GetCellType(anI))
-+ {
-+ case VTK_VERTEX:
-+ aNbVerts++;
-+ aNbVertPts++;
-+ break;
-+ case VTK_POLY_VERTEX:
-+ aNbVerts++;
-+ aNbVertPts += anInput->GetCell(anI)->GetNumberOfPoints();
-+ break;
-+ case VTK_LINE:
-+ aNbLines++;
-+ aNbLinePts += 2;
-+ break;
-+ case VTK_POLY_LINE:
-+ aNbLines++;
-+ aNbLinePts += anInput->GetCell(anI)->GetNumberOfPoints();
-+ break;
-+ case VTK_TRIANGLE:
-+ aNbPolys++;
-+ aNbPolyPts += 3;
-+ break;
-+ case VTK_QUAD:
-+ aNbPolys++;
-+ aNbPolyPts += 4;
-+ break;
-+ case VTK_POLYGON:
-+ aNbPolys++;
-+ aNbPolyPts += anInput->GetCell(anI)->GetNumberOfPoints();
-+ break;
-+ case VTK_TRIANGLE_STRIP:
-+ aNbStrips++;
-+ aNbStripPts += anInput->GetCell(anI)->GetNumberOfPoints();
-+ break;
-+ }
-+#endif
- }
- }
- }
-
- // Copy cells with their points according to the prepared list of cell ids.
- anOutput->GetCellData()->AllocateArrays(anInput->GetCellData()->GetNumberOfArrays());
-- anOutput->Allocate(anInput, anIdList->GetNumberOfIds()); // Allocate output cells
-+ // Allocate output cells
-+#if (VTK_MAJOR_VERSION >= 9)
-+ anOutput->AllocateExact (aNbVerts, aNbVertPts, aNbLines, aNbLinePts, aNbPolys, aNbPolyPts, aNbStrips, aNbStripPts);
-+#else
-+ anOutput->Allocate (anInput, anIdList->GetNumberOfIds());
-+#endif
-+
- // Pass data arrays.
- // Create new arrays for output data
- vtkSmartPointer<vtkCellData> anInData = anInput->GetCellData();
---
-2.31.1
-
-
-From 3a0d59614378af258b285c7a3cab66c4bb7cecd3 Mon Sep 17 00:00:00 2001
-From: Roman Beranek <roman.beranek@prusa3d.com>
-Date: Thu, 3 Jun 2021 15:41:45 +0200
-Subject: [PATCH 2/2] undef AllValues after inclusion of GL/glx.h
-
-Replicate the measure from 0032331 also for IVtkDraw.cxx and InterfaceGraphic.hxx
----
- src/IVtkDraw/IVtkDraw.cxx | 17 +++++++++++------
- src/InterfaceGraphic/InterfaceGraphic.hxx | 4 +++-
- 2 files changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/src/IVtkDraw/IVtkDraw.cxx b/src/IVtkDraw/IVtkDraw.cxx
-index 93d4a2fd1a..84bacdc55a 100644
---- a/src/IVtkDraw/IVtkDraw.cxx
-+++ b/src/IVtkDraw/IVtkDraw.cxx
-@@ -52,6 +52,17 @@
-
- // prevent disabling some MSVC warning messages by VTK headers
- #include <Standard_WarningsDisable.hxx>
-+#ifndef _WIN32
-+ #include <X11/X.h>
-+ #include <X11/Shell.h>
-+ #include <X11/Xlib.h>
-+ #include <X11/Xutil.h>
-+ #include <GL/glx.h>
-+ #include <Xw_Window.hxx>
-+ #ifdef AllValues
-+ #undef AllValues
-+ #endif
-+#endif
- #include <vtkAlgorithmOutput.h>
- #include <vtkAppendPolyData.h>
- #include <vtkBMPWriter.h>
-@@ -75,12 +86,6 @@
- #include <vtkTIFFWriter.h>
- #include <vtkWindowToImageFilter.h>
- #ifndef _WIN32
-- #include <X11/X.h>
-- #include <X11/Shell.h>
-- #include <X11/Xlib.h>
-- #include <X11/Xutil.h>
-- #include <GL/glx.h>
-- #include <Xw_Window.hxx>
- #include <vtkXRenderWindowInteractor.h>
- #include <vtkXOpenGLRenderWindow.h>
- #include <tk.h>
-diff --git a/src/InterfaceGraphic/InterfaceGraphic.hxx b/src/InterfaceGraphic/InterfaceGraphic.hxx
-index c533f68cd5..bf02b3f397 100644
---- a/src/InterfaceGraphic/InterfaceGraphic.hxx
-+++ b/src/InterfaceGraphic/InterfaceGraphic.hxx
-@@ -39,7 +39,9 @@
- #include <X11/Xutil.h>
- #include <X11/Xatom.h>
- #include <GL/glx.h>
--
-+#ifdef AllValues
-+#undef AllValues
-+#endif
- #endif
-
- #endif // __INTERFACE_GRAPHIC_HXX
---
-2.31.1
-
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
deleted file mode 100644
index bdd9b918a69a..000000000000
--- a/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-MY_PV="$(ver_rs 1- '_')"
-PV_MAJ="$(ver_cut 1-2)"
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="https://www.opencascade.com"
-SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/${PV_MAJ}"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk"
-
-REQUIRED_USE="?? ( optimize tbb )"
-
-# There's no easy way to test. Testing needs a rather big environment
-# properly set up.
-RESTRICT="test"
-
-# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
-RDEPEND="
- !app-eselect/eselect-opencascade
- dev-lang/tcl:=
- dev-lang/tk:=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- virtual/opengl
- x11-libs/libXmu
- examples? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtquickcontrols2:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- ffmpeg? ( media-video/ffmpeg:= )
- freeimage? ( media-libs/freeimage )
- tbb? ( dev-cpp/tbb:= )
- vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- dev-cpp/eigen
- dev-libs/rapidjson
- doc? ( app-doc/doxygen )
- examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
- "${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
- "${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
- "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
- "${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
- "${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
- "${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
- "${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
- "${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- use debug && append-cppflags -DDEBUG
-
- sed -e 's|/lib\$|/'$(get_libdir)'\$|' \
- -i adm/templates/OpenCASCADEConfig.cmake.in || die
-
- # There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
- # assumptions it makes about installation paths. Rather than fixing it, just
- # get rid of the mechanism altogether - its purpose is to allow a
- # side-by-side installation of release and debug libraries.
- sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
- -i adm/cmake/occt_toolkit.cmake || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_DOC_Overview=$(usex doc)
- -DBUILD_Inspector=$(usex examples)
- -DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916
-
- -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
- -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
- -DINSTALL_DIR_DATA="share/${PN}/data"
- -DINSTALL_DIR_DOC="share/doc/${PF}"
- -DINSTALL_DIR_INCLUDE="include/${PN}"
- -DINSTALL_DIR_LIB="$(get_libdir)/${PN}"
- -DINSTALL_DIR_RESOURCE="share/${PN}/resources"
- -DINSTALL_DIR_SAMPLES="share/${PN}/samples"
- -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin"
- -DINSTALL_DIR_WITH_VERSION=OFF
- -DINSTALL_SAMPLES=$(usex examples)
- -DINSTALL_TEST_CASES=NO
-
- -DUSE_D3D=NO
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FREEIMAGE=$(usex freeimage)
- -DUSE_FREETYPE=ON
- -DUSE_GLES2=$(usex gles2-only)
- -DUSE_RAPIDJSON=$(usex json)
- -DUSE_TBB=$(usex tbb)
- -DUSE_VTK=$(usex vtk)
- )
-
- use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
- if use examples; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
- -DBUILD_SAMPLES_QT=ON
- )
- fi
-
- if use vtk; then
- if has_version ">=sci-libs/vtk-9.1.0"; then
- mycmakeargs+=(
- -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
- -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
- -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
- )
- elif has_version ">=sci-libs/vtk-9.0.0"; then
- mycmakeargs+=(
- -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
- -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
- -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
- )
- fi
- fi
-
- cmake_src_configure
-
- # prepare /etc/env.d file
- sed -e "s|lib/|$(get_libdir)/|" \
- -e "s|VAR_CASROOT|${EPREFIX}/usr|" \
- < "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
-
- # use TBB for memory allocation optimizations
- if use tbb; then
- sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die
- fi
-
- # use internal optimized memory manager and don't clear memory with this
- # memory manager.
- if use optimize ; then
- sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
- -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
- -i "${T}"/99${PN} || die
- fi
-}
-
-src_install() {
- cmake_src_install
-
- doenvd "${T}/99${PN}"
-
- # remove examples
- if use !examples; then
- rm -r "${ED}/usr/share/${PN}/samples" || die
- fi
-
- docompress -x /usr/share/doc/${PF}/overview/html
-}