From fc2f1018fc323ef2c6572734a9b130427cba76a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Nov 2021 06:47:15 +0000 Subject: gentoo resync : 03.11.2021 --- sci-libs/opencascade/Manifest | 10 +- ...Gentoo-specific-avoid-pre-stripping-files.patch | 30 ----- .../files/opencascade-7.4.0-find-qt.patch | 85 ------------ ...pencascade-7.4.0-fix-flow-control-nesting.patch | 31 ----- .../files/opencascade-7.4.0-fix-install.patch | 133 ------------------- ...7.4.0-fix-issue-with-cmake-path-variables.patch | 41 ------ .../opencascade/files/opencascade-7.4.0.env.in | 103 --------------- sci-libs/opencascade/metadata.xml | 3 - sci-libs/opencascade/opencascade-7.4.0-r5.ebuild | 147 --------------------- 9 files changed, 1 insertion(+), 582 deletions(-) delete mode 100644 sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch delete mode 100644 sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch delete mode 100644 sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch delete mode 100644 sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch delete mode 100644 sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch delete mode 100644 sci-libs/opencascade/files/opencascade-7.4.0.env.in delete mode 100644 sci-libs/opencascade/opencascade-7.4.0-r5.ebuild (limited to 'sci-libs/opencascade') diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index ce67d9e87096..df3c3defe15f 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -1,9 +1,3 @@ -AUX opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch 1104 BLAKE2B 6feb1d9a4f4424a1e2df6d3056d73308effd5b53d805a0e14de65a4b7d72c767ba6666df738484ee036bc9b054674d0a714e58874f4426ba7deb81269ee183e5 SHA512 f12ad8bfe9adf5fa89db6dc789a9627facad1e78a4ca448637cd4f61c6ec738967f96c7d0aea01276aa45dff9a51cd1f0d28de4061a6df2137cf4be470aa6329 -AUX opencascade-7.4.0-find-qt.patch 3349 BLAKE2B 6520b3242927c86c4958f81f8a94e8976fb2cd262318ee7fd7e1362bb95d0d665bbf909108a0526e4d251af045f734a58ee6cfae631b14b139e1a70f7666beb3 SHA512 8d7a758f749794430267e473b6048386bb3b9e4274091f5a5662bfcbaf2c76cdf0c3c2fac4d6e8f03ea300bfe3d0258cb23b8f184de62f153d12a41746f02e75 -AUX opencascade-7.4.0-fix-flow-control-nesting.patch 787 BLAKE2B 929674b6c804411934adbbbf31eba4dc6cd52e15cb9959982c1770244f1edbfc7ff94c832e7e20516f18ef8548488464e15ee1b5d3de70022e9bd1213272c143 SHA512 1ba3f8ab5d62d42d17adc72c371e1a2c0f3d8e996a3f1dfaec1e1a248504592a5ccc27a651640de24f3e47402d4129f77943f3df7117215eacf98f44fa8678ba -AUX opencascade-7.4.0-fix-install.patch 7870 BLAKE2B 4842ad5123a06a53b81ca80e4152434ee6d78a9eb5436a7a9f899651fcdb45a6f403f31bd6e4225611c1085fb91eb7a5640e5bb3fd49b71295ad0868b8e018dd SHA512 5315e82bd03a8782df8c72bbfb334d9cf739dd53f3aa22649f087c1b8b7fa5f88f7a80850c1f2e0c9dffd80a77dd99fd36e9674463535cbf48b896596c24f38e -AUX opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch 1973 BLAKE2B cac9a795d91fc55de7fc6b3c9a7f1138b8d8320e1be6879d7de4e63132a0a4e729be2dafd281e64fd52f8e05790dcb8c41bed22b8bc159b32952ad7ef79aa9da SHA512 9dfac105d41775578b6ea51fc74cbf35f9627a10bdfb35f768c09d47d7d06b11d667f231653029d297d40c82444b82d50b3bcd7d3a4520989e416d83eaaaee5e -AUX opencascade-7.4.0.env.in 4570 BLAKE2B b8a3380e9e821a1560a9a48f566c648e43285fd7695f96e6b4b088271d6a07a4f9d3f7e259860e3b8d8f8f9af1b79ef521b3bd3b1571fd13fb8d2585b35e19ab SHA512 86180a15878e17322fc34a057d2ccb0a1c00af8b4aacc8f80aab3a8ac6b7025a8f1e125b86cc77948152eeac3b6bf786a2ee3622c37f702cd3bea62bb3d11fe6 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 @@ -12,12 +6,10 @@ AUX opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch 2453 BLAKE2B 0 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.env.in 4683 BLAKE2B 4c7c3764e56110c34c9acb9ecb860936049cf03f4ed99d708a8f631b5d3dc7cfa95ca7f8fe8b259986fa637243fe80a6888a2db6a2ad6f80b3b2175a9bb8680f SHA512 773b213e8d7752fc028d951d2a5d5aa610c96ee916499c3655e60f0ec485d393c3bf13a85cae104653242829d8abb9fea451f17bf1b902e1c1fa0bf5b329f08b -DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47 -EBUILD opencascade-7.4.0-r5.ebuild 3959 BLAKE2B eb0a182ce66c63bd9aa2f57a57275c0e16c1ce4e56777932d7cf7bb6c6f380503e4549f57e4a61e91c4beb0ddf671b6a490a6e7e32cdfb62826be5fbde3d603f SHA512 a83bb2e24376c50b85c355c5d70662c3bb998098af46c9d54a21629da9bb2b2466190cf68955a3f2fc89c9eec504e49760fdc3041a39ca8a7413799e50f4bc22 EBUILD opencascade-7.5.1-r2.ebuild 4854 BLAKE2B 940352ef80b231890575c29bfdada659b1f46bf360b5ba55558dbee66a12ba6afe9ffff63108fb1fe53c4204621ae3b7165510dd72f7e03b96866395e7d08012 SHA512 8b91d5180b6ea0a100f58274fa7eca2fcc993f1d95d9181030f79eb351db7af6a9abce358815030045354cc59e3a8134cbad3c518ec70b7288271823fdfaa651 EBUILD opencascade-7.5.2-r1.ebuild 4632 BLAKE2B 486b02a0e64d50749afeef18765b0b66559375f40a38fc6cf93c50beaba5066ed89e7ccfe81e80d06137d248c8d07eb7cb090524b2cb202cb902f2f489ccf0ec SHA512 a551f79d098c305413507c133f7f0009bf9e94c17569341e33f17409456c692eaaecedb34faabcc9c06d0cdb28861514f1f0a2a64b0d835c1ce8fee26115c030 EBUILD opencascade-7.5.3-r2.ebuild 4632 BLAKE2B 057fe72bfdb34b9fc03965d5ebb9eabd26c7896e3d3133dcb40f4d44a60fb85a2689d20c00bd20a628160fabe9f9a59ba9c819bcd709ba6c1cc0da8c868485a3 SHA512 13ad94752dc5dab5da155efd3ce8495c3154cb5497af5a010b06609740311ce1a6b9257b6eb4adbf14b8188f03b99ac33930310d9717b645a6f2ade2c04fa2f4 -MISC metadata.xml 1075 BLAKE2B ef2b520d3b17f3c74e652d5b8621da87e0e0fce1cd57f3ed9beca402cd41dab95e79e2535103d3dea94cd3a0a8fe7d2983c1243ee3c8727b7d8a2324ae303bd4 SHA512 39cf59672725d33e4c1eae993e1d7612014a3f96285b522601cda9b7757ab5a90d5195c0472e5a6cb5c4d1f7b96e74baab7476e2488dd7cf9f0c85c23a1e466d +MISC metadata.xml 979 BLAKE2B f5a7d51dd3a85f7409d97671fe8b3ca8675d11f78f3de4c8511d3e7be8d95b7f37bf3993dc21a2e33de0ac8412a57cb4385ec9cd7a37d2dbe3772fbbca298b13 SHA512 eb9673f62eee92feaf2da8ff42887c3cfd7d74558b8a35a5d482809a196211c2a6953c6f23558fdd74f10d6db3f493a4c022a5f8d7b1764e39e473394cf671d6 diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch b/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch deleted file mode 100644 index 0d4015cabd78..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2ddba09ea491ae5d18b074a2d1126d44c0a2b1f6 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Tue, 9 Feb 2021 22:26:14 +0100 -Subject: [PATCH] [Gentoo-specific] avoid pre-stripping files - -Signed-off-by: Bernd Waibel ---- - adm/cmake/occt_defs_flags.cmake | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake -index 5484c675..4e513ab5 100644 ---- a/adm/cmake/occt_defs_flags.cmake -+++ b/adm/cmake/occt_defs_flags.cmake -@@ -137,12 +137,6 @@ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX) - set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}") - endif() - --# Optimize size of binaries --if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW) -- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") -- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s") --endif() -- - if (BUILD_RELEASE_DISABLE_EXCEPTIONS) - set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception") - set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception") --- -2.30.0 - diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch b/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch deleted file mode 100644 index 1ebc1106a31b..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 7304c888e57a581e9dc8ef2005e960ec579d58f4 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Sat, 9 Nov 2019 17:15:27 +0100 -Subject: [PATCH] Gentoo-specific: disable internal 3RDPARTY_QT_DIR - -The patch disables searching for internal 3rd-party Qt. Instead -system installed Qt is used. The call to find_package uses REQUIRED -flag for this. - -Signed-off-by: Bernd Waibel ---- - adm/cmake/qt.cmake | 24 ++++++++++++------------ - adm/cmake/qt_macro.cmake | 6 +++--- - 2 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/adm/cmake/qt.cmake b/adm/cmake/qt.cmake -index 6958bab5..b6a9b794 100644 ---- a/adm/cmake/qt.cmake -+++ b/adm/cmake/qt.cmake -@@ -3,27 +3,27 @@ - # Qt is searched manually first (just determine root) - message (STATUS "Processing Qt 3-rd party") - --if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "") -- FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME) -+#if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "") -+# FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME) - -- if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "") -- message (FATAL_ERROR "... Qt root directory was not found") -- endif() -+# if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "") -+# message (FATAL_ERROR "... Qt root directory was not found") -+# endif() - - # Combine directory name with absolute path and show in GUI -- set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE) -- message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}") --endif() -+# set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE) -+# message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}") -+#endif() - --set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}") -+#set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}") - - # Now set CMAKE_PREFIX_PATH to point to local Qt installation. - # Without this setting find_package() will not work --set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR}) -+#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 -@@ -31,4 +31,4 @@ if (NOT ${Qt5_FOUND}) - #message (STATUS "Qt4 cmake configuration") - else() - #message (STATUS "Qt5 cmake configuration") --endif() -\ No newline at end of file -+endif() -diff --git a/adm/cmake/qt_macro.cmake b/adm/cmake/qt_macro.cmake -index ec897384..8bd314a4 100644 ---- a/adm/cmake/qt_macro.cmake -+++ b/adm/cmake/qt_macro.cmake -@@ -2,9 +2,9 @@ - - 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 ("${3RDPARTY_QT_DIR}" STREQUAL "") -+# message (FATAL_ERROR "Empty Qt dir") -+# endif() - - if (${Qt5_FOUND}) - #message (STATUS "Qt5 cmake configuration") --- -2.23.0 - diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch deleted file mode 100644 index 7e2bb1d7b2ab..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e69c42386239bcc08143607df12b8bb3f1ff14ba Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Wed, 24 Feb 2021 20:06:02 +0100 -Subject: [PATCH] adm/cmake/vtk.cmake: fix flow control nesting - -Fix an unbalanced nesting of flow control statements -for >=cmake-3.20.0 - -Signed-off-by: Bernd Waibel ---- - adm/cmake/vtk.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake -index c5692fd6..00b7ff4a 100644 ---- a/adm/cmake/vtk.cmake -+++ b/adm/cmake/vtk.cmake -@@ -156,8 +156,8 @@ if (VTK_FOUND) - endif() - endif() - endif() -- endif() -- endforeach() -+ endforeach() -+ endif() - endif() - - if (3RDPARTY_VTK_INCLUDE_DIRS) --- -2.30.1 - diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch deleted file mode 100644 index edf3545a74bd..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 95c7c85f776d6e4764f2146c8385d6e29762043d Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Sat, 16 Nov 2019 18:28:11 +0100 -Subject: [PATCH] Gentoo-specific: patch installation paths - -Patch parts of cmake to install into proper locations and handle slotting. - -Signed-off-by: Bernd Waibel ---- - CMakeLists.txt | 28 +++++++++++++++------------- - adm/cmake/occt_macros.cmake | 2 +- - 2 files changed, 16 insertions(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b445de9..1fd5779e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,6 +15,8 @@ macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE) - endif() - endmacro() - -+SET(CMAKE_INSTALL_DO_STRIP OFF) -+ - # include variable description - OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vardescr") - -@@ -231,7 +233,7 @@ endif() - # place the libraries to /lib folder for unix and leave old structure for windows - if (NOT DEFINED INSTALL_DIR_LIB) - if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix") -- set (INSTALL_DIR_LIB "lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}") -+ set (INSTALL_DIR_LIB "lib${LIB_SUFFIX}" CACHE PATH "${INSTALL_DIR_LIB_DESCR}") - else() - set (INSTALL_DIR_LIB "${OS_WITH_BIT}/${COMPILER}/lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}") - endif() -@@ -315,9 +317,9 @@ endif() - if (NOT DEFINED INSTALL_DIR_CMAKE) - if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix") - if (INSTALL_DIR_WITH_VERSION) -- set (INSTALL_DIR_CMAKE "lib/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}") -+ set (INSTALL_DIR_CMAKE "lib${LIB_SUFFIX}/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}") - else() -- set (INSTALL_DIR_CMAKE "lib/cmake/opencascade" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}") -+ set (INSTALL_DIR_CMAKE "lib${LIB_SUFFIX}/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}") - endif() - else() - set (INSTALL_DIR_CMAKE "cmake" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}") -@@ -868,10 +870,10 @@ if (${DRAWEXE_INDEX} GREATER -1) - # copy draw script to install script folder - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}") - install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) -+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - else() - install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) -+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - endif() - - # copy draw script to CMake binary folder -@@ -892,9 +894,9 @@ if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}") - - set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}") - -- file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}") -+ file (WRITE "${CMAKE_BINARY_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}") - else() -- OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}") -+ OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}") - endif() - - if (WIN32) -@@ -1067,10 +1069,10 @@ if (BUILD_TOOL_TOOLKITS) - # copy tinspector script to install script folder - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}") - install (FILES "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) -+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - else() - install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) -+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - endif() - - set (OpenCASCADE_BINARY_DIR "${INSTALL_DIR}/${INSTALL_DIR_BIN}") -@@ -1122,7 +1124,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES}) - endforeach() - # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration - install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)") --install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") -+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") - - foreach (OCCT_MODULE ${OCCT_MODULES}) - if (BUILD_MODULE_${OCCT_MODULE}) -@@ -1163,7 +1165,7 @@ endif() - - # Configure and install cmake config file - configure_file("${CMAKE_SOURCE_DIR}/adm/templates/OpenCASCADEConfig.cmake.in" "OpenCASCADEConfig.cmake" @ONLY) --install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION "${INSTALL_DIR_CMAKE}") -+install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}") - - # Configure cmake version file - include(CMakePackageConfigHelpers) -@@ -1172,11 +1174,11 @@ write_basic_package_version_file( ${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.c - COMPATIBILITY ExactVersion ) - - # Install cmake version file --install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.cmake" DESTINATION "${INSTALL_DIR_CMAKE}") -+install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.cmake" DESTINATION "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}") - - # Install the export set for use with the install-tree for each configuration - foreach (OCCT_MODULE ${OCCT_MODULES_ENABLED}) -- install(EXPORT OpenCASCADE${OCCT_MODULE}Targets DESTINATION "${INSTALL_DIR_CMAKE}") -+ install(EXPORT OpenCASCADE${OCCT_MODULE}Targets DESTINATION "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}") - endforeach() - - # Update generated OpenCASCADETargets-*.cmake files -diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake -index 8220ecd5..228d801b 100644 ---- a/adm/cmake/occt_macros.cmake -+++ b/adm/cmake/occt_macros.cmake -@@ -598,7 +598,7 @@ macro (OCCT_UPDATE_TARGET_FILE) - "cmake_policy(PUSH) - cmake_policy(SET CMP0007 NEW) - string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE) -- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") -+ file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") - foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES}) - file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT) - file (REMOVE \"\${TARGET_FILENAME}\") --- -2.23.0 - diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch deleted file mode 100644 index aacb642019ff..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cefaa5bddedcb90a06d6ef8f0837a11619e5d87e Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Tue, 9 Feb 2021 20:58:43 +0100 -Subject: [PATCH] fix issue with cmake path variables - -Thanks to Fabio Rossi for reporting the issue. -Upstream bug: https://tracker.dev.opencascade.org/view.php?id=32035 - -Signed-off-by: Bernd Waibel ---- - adm/templates/OpenCASCADEConfig.cmake.in | 14 +------------- - 1 file changed, 1 insertion(+), 13 deletions(-) - -diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in -index 4937103b..db99a8d1 100644 ---- a/adm/templates/OpenCASCADEConfig.cmake.in -+++ b/adm/templates/OpenCASCADEConfig.cmake.in -@@ -16,19 +16,7 @@ set (OpenCASCADE_MINOR_VERSION "@OCC_VERSION_MINOR@") - set (OpenCASCADE_MAINTENANCE_VERSION "@OCC_VERSION_MAINTENANCE@") - set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@") - --# Compute the installation prefix from this OpenCASCADEConfig.cmake file --# location, by going up one level + one level if "cmake" + one level if "lib". --# This is made to support different locations of CMake files: --# - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade- --# - in Windows style: $INSTALL_DIR/cmake --get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) --get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) --if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") -- get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) --endif() --if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$") -- get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) --endif() -+set (OpenCASCADE_INSTALL_PREFIX "$ENV{CASROOT}") - - # Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data - set (OpenCASCADE_BINARY_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@") --- -2.30.0 - diff --git a/sci-libs/opencascade/files/opencascade-7.4.0.env.in b/sci-libs/opencascade/files/opencascade-7.4.0.env.in deleted file mode 100644 index cf7cc6a724df..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.4.0.env.in +++ /dev/null @@ -1,103 +0,0 @@ -# -# This file sets needed and optional environment variables for -# Open CASCADE Technology -# -# See: https://dev.opencascade.org/doc/overview/html/index.html#OCCT_OVW_SECTION_4_2 -# for further documentation. -# -# Some of the values are set at compile time depending on what USE flags -# were enabled. Those values are marked as such. - -# define the root directory of Open CASCADE Technology (needed) -CASROOT=VAR_CASROOT -# PATH and LDPATH are used to find the binaries and libraries of OCCT (needed) -PATH=VAR_CASROOT/bin -LDPATH=VAR_CASROOT/lib - -############################################################################# -# The MMGT_* variables are used to determine how memory management will work -# in OCCT. All of those are optional. If they are not set here, their default -# values will be used. -# -# Uncomment or change the ones you need to adapt from its default. -############################################################################# -# MMGT_OPT = {0,1,2} (default: 0) set at compile time -# if set to 0 (the default), every memory block is allocated in C -# memory heap directly (via malloc() and free()). Will be set, if -# neither the the 'optimize' nor the 'tbb' USE flags are set. -# if set to 1, the memory manager performs it's own internal optimization. -# Will be set, if the 'optimize' USE flag is set. -# if set to 2, Intel(R) TBB optimized memory manager is used. Will be set, -# if the 'tbb' USE flag is set. -#MMGT_OPT=0 - -# MMGT_CLEAR = {0,1} (default: 1) -# if set to 0, memory block is returned as it is. Will be set, if the -# 'optimize' USE flag is set -# if set to 1, every allocated memory block is cleared by zeros -#MMGT_CLEAR=1 - -# MMGT_CELLSIZE (default: 200) -# defines the maximal size of blocks allocated in large pools of memory. -#MMGT_CELLSIZE=200 - -# MMGT_NBPAGES (default: 10000) -# defines the size of memory chunks allocated for small blocks in pages -# (OS dependant) -#MMGT_NBPAGES=10000 - -# MMGT_THRESHOLD (default: 40000) -# defines the maximal size of blocks that are recycled internally instead -# of being returned to the heap. -#MMGT_THRESHOLD=40000 - -# MMGT_MMAP = {0,1} (default: 1) -# if set to 0, large memory blocks will be allocated in the C heap by -# malloc() -# if set to 1, large memory blocks are allocated using memory mapping -# functions of the operating system. -#MMGT_MMAP=1 - -# CSF_LANGUAGE (default: us) optional -# defines the default language of messages indicated by a two-letter -# country code. Currently it's not verified if this work with other -# than the default languages, so we keep it commented. -#CSF_LANGUAGE=us - -# CSF_DEBUG_BOP (default: undefined) optional -# if defined then it should specify the directory where diagnostic data -# on problems occured in Boolean operations will be saved. Not defined by -# default. -# -# NOTE: Only enable for debugging purposes. If set, this variable has a -# large impact on the performance of boolean operations. -#CSF_DEBUG_BOP=/var/tmp - -# CSF_EXCEPTION_PROMPT (default: 1) optional -# not documented upstream (maybe a flag indicating whether the user shall -# be prompted in the case of exceptions) -#CSF_EXCEPTION_PROMPT=1 - -# The following CSF_* variables define various directories and files where -# OCCT is looking for resources. -CSF_GraphicShr=VAR_CASROOT/lib/libTKOpenGl.so -CSF_MIGRATION_TYPES=VAR_CASROOT/share/opencascade/resources/StdResource/MigrationSheet.txt -CSF_MDTVTexturesDirectory=VAR_CASROOT/share/opencascade/resources/Textures -CSF_PluginDefaults=VAR_CASROOT/share/opencascade/resources/StdResource -CSF_StandardDefaults=VAR_CASROOT/share/opencascade/resources/StdResource -CSF_StandardLiteDefaults=VAR_CASROOT/share/opencascade/resources/StdResource -CSF_XCAFDefaults=VAR_CASROOT/share/opencascade/resources/StdResource -CSF_XmlOcafResource=VAR_CASROOT/share/opencascade/resources/XmlOcafResource -# The below values might be optional. -CSF_IGESDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource -CSF_ShadersDirectory=VAR_CASROOT/share/opencascade/resources/Shaders -CSF_SHMessage=VAR_CASROOT/share/opencascade/resources/SHMessage -CSF_STEPDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource -CSF_UnitsDefinition=VAR_CASROOT/share/opencascade/resources/UnitsAPI/Units.dat -CSF_XSMessage=VAR_CASROOT/share/opencascade/resources/XSMessage - -# TODO: check those -# they were defined in the original ebuild but the directories and files -# are not present in the current installation. -#CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT -#CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml index b0acd7390fe1..fe7ad33b9523 100644 --- a/sci-libs/opencascade/metadata.xml +++ b/sci-libs/opencascade/metadata.xml @@ -16,9 +16,6 @@ Use OpenGL ES 2.0 - - Build the OCCT inspector tool for low-level data inspection - Enable JSON support through dev-libs/rapidjson diff --git a/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild deleted file mode 100644 index b6dbf4121d02..000000000000 --- a/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# TODO: -# check the src files referenced in 51opencascade, i.e. resources and the like -# check where cmake gets it's '-s' linker flag to avoid pre-stripping (QA) - -EAPI=7 - -inherit check-reqs cmake flag-o-matic java-pkg-opt-2 - -MY_PV="$(ver_rs 1- '_')" - -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="${PV}" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug doc +examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk" - -REQUIRED_USE=" - inspector? ( qt5 ) - qt5? ( examples ) - ?? ( optimize tbb ) -" - -RDEPEND=" - app-eselect/eselect-opencascade - dev-cpp/eigen - dev-lang/tcl:0= - dev-lang/tk:0= - dev-tcltk/itcl - dev-tcltk/itk - dev-tcltk/tix - media-libs/freetype:2 - media-libs/ftgl - virtual/glu - virtual/opengl - x11-libs/libXmu - ffmpeg? ( media-video/ffmpeg ) - freeimage? ( media-libs/freeimage ) - java? ( virtual/jdk:1.8 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - tbb? ( dev-cpp/tbb:= ) - vtk? ( - >=sci-libs/vtk-8.1.0[rendering] - > "${T}/${PV}" || die - sed -i -e 's|ros/lib|ros/'$(get_libdir)'|' "${T}/${PV}" || die - - # use TBB for memory allocation optimizations? - use tbb && (sed -i -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' "${T}/${PV}" || die) - - if use optimize ; then - # use internal optimized memory manager? - sed -i -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' "${T}/${PV}" || die - # don't clear memory ? - sed -i -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' "${T}/${PV}" || die - fi -} - -src_install() { - cmake_src_install - - # respect slotting - insinto "/etc/env.d/${PN}" - doins "${T}/${PV}" - - # remove examples - use examples || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples" || die) - use java || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples/java" || die) - use qt5 || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples/qt" || die) -} - -pkg_postinst() { - eselect ${PN} set ${PV} || die "failed to switch to updated implementation" - einfo "You can switch between available ${PN} implementations using eselect ${PN}" -} -- cgit v1.2.3