subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sci\-libs\/opencascade\/"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/

2024-04-14 Thread Andrew Ammerlaan

commit: 8cdc93710f895d042f33b8eece7b6534fc097804
Author: Paul Zander  gmail  com>
AuthorDate: Sun Apr 14 15:26:42 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Apr 14 15:36:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cdc9371

sci-libs/opencascasde: fix vtk_components.patch

Closes: https://bugs.gentoo.org/930016
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36253
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch 
b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
index 224becfdec1f..03a6277c6fa8 100644
--- a/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
+++ b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
@@ -6,7 +6,7 @@ index 7d25a37..79257d1 100644
set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}")
  endif()
  
--find_package(VTK)
+-find_package(VTK QUIET)
 +find_package(VTK
 +  COMPONENTS
 +CommonCore

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2024-04-14 Thread Andrew Ammerlaan

commit: a5f11c2d5ee461993ad424b4d700b3f1fb09d835
Author: Paul Zander  gmail  com>
AuthorDate: Sun Apr 14 11:49:11 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Apr 14 14:15:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f11c2d

sci-libs/opencascade: drop 7.7.1-r1

Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36238
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/opencascade/opencascade-7.7.1-r1.ebuild | 360 ---
 1 file changed, 360 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.7.1-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.7.1-r1.ebuild
deleted file mode 100644
index 2c547bf457dd..
--- a/sci-libs/opencascade/opencascade-7.7.1-r1.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic virtualx
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and 
data exchange"
-HOMEPAGE="https://www.opencascade.com;
-
-MY_PN="OCCT"
-
-MY_TEST_PV="7.7.0"
-MY_TEST_PV2="${MY_TEST_PV//./_}"
-
-SRC_URI="
-   test? ( 
https://github.com/Open-Cascade-SAS/${MY_PN}/releases/download/V${MY_TEST_PV2}/${PN}-dataset-${MY_TEST_PV}.tgz
-   -> ${PN}-dataset-${MY_TEST_PV}.tar.gz )
-"
-
-if [[ ${PV} = ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Open-Cascade-SAS/${MY_PN}.git;
-else
-   MY_PV="${PV//./_}"
-   SRC_URI+="
-   
https://github.com/Open-Cascade-SAS/${MY_PN}/archive/refs/tags/V${MY_PV}.tar.gz 
-> ${P}.tar.gz
-   "
-   S="${WORKDIR}/${MY_PN}-${MY_PV}"
-   KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only gui json 
+opengl optimize tbb test testprograms tk vtk"
-
-REQUIRED_USE="
-   ?? ( optimize tbb )
-   ?? ( opengl gles2-only )
-   examples? ( gui )
-   test? ( freeimage json opengl )
-"
-
-# There's no easy way to test. Testing needs a rather big environment properly 
set up.
-RESTRICT="!test? ( test )"
-
-# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871
-RDEPEND="
-   dev-lang/tcl:=
-   tk? ( dev-lang/tk:= )
-   dev-libs/double-conversion
-   freetype? (
-   media-libs/fontconfig
-   media-libs/freetype:2
-   )
-   opengl? (
-   media-libs/libglvnd
-   )
-   X? (
-   x11-libs/libX11
-   )
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtquickcontrols2:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   )
-   ffmpeg? (  /dev/null || die
-   # should be in paths indicated by CSF_TestDataPath environment 
variable,
-   # or in subfolder data in the script directory
-   unpack "${PN}-dataset-${MY_TEST_PV}.tar.gz"
-   popd > /dev/null || die
-   fi
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   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() {
-   # -Werror=odr
-   # https://bugs.gentoo.org/862912
-   # https://tracker.dev.opencascade.org/view.php?id=33091
-   filter-lto
-
-   local mycmakeargs=(
-   -D3RDPARTY_DIR="${ESYSROOT}/usr"
-   -DBUILD_CPP_STANDARD="C++17"
-   -DBUILD_SOVERSION_NUMBERS=2
-
-   -DBUILD_DOC_Overview="$(usex doc)"
-   -DBUILD_Inspector="$(usex gui)"
-
-   -DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
-   -DBUILD_USE_PCH="no"
-   # -DBUILD_OPT_PROFILE="Default" # Production
-   # -DBUILD_RESOURCES="yes"
-   # -DBUILD_YACCLEX="yes"
-
-   -DBUILD_RELEASE_DISABLE_EXCEPTIONS="no" # bug #847916
-   -DINSTALL_DIR="${EPREFIX}/usr"
-   -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"
-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2024-04-14 Thread Andrew Ammerlaan

commit: 74af42387178d837aa7831d4724522ab6d9743f0
Author: Paul Zander  gmail  com>
AuthorDate: Thu Apr 11 14:22:40 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Apr 14 14:15:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74af4238

sci-libs/opencascade: move 7.8.0 -> 7.8.1

7.8.1 addresses a critical issue regarding backward binary
compatibility with version 7.8.0.

Closes: https://bugs.gentoo.org/927788
Closes: https://bugs.gentoo.org/927890
Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/opencascade/Manifest  |  3 +-
 .../opencascade-7.8.0-jemalloc-noexcept.patch  | 13 ++
 .../files/opencascade-7.8.1-vtk_components.patch   | 24 +++
 sci-libs/opencascade/metadata.xml  |  1 +
 sci-libs/opencascade/opencascade-7.7.2-r1.ebuild   | 18 ++---
 ...scade-7.8.0.ebuild => opencascade-7.8.1.ebuild} | 20 +++---
 sci-libs/opencascade/opencascade-.ebuild   | 46 --
 7 files changed, 91 insertions(+), 34 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index ac0e7aa5db19..fa54d19c63f2 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,7 +1,6 @@
 DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B 
ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d
 SHA512 
c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
 DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B 
b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a
 SHA512 
6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
-DIST opencascade-7.7.1.tar.gz 48408076 BLAKE2B 
46e14a47a0ce555ac17a3fca520c1f21d7ca05c67b54259e3d2d8560618db096313d5be3d5e4a24acad1912534c17293ad203f48dd7464690aec86e287d9f230
 SHA512 
f095848d212afbe7e71614d46f57222e347246aec7c92aafae59e6f07798f5371c7a125042c149393ee7d361f28eb89b5196de17a7cc37233f1586ba919c0839
 DIST opencascade-7.7.2.tar.gz 48404428 BLAKE2B 
28d637e75eca570e38401a0a59127ffdbcb06838a91cc3899fe905834bb47e0e9a92d16cde52027d94e78b0fbddc2043340a35dcb0f4a472c4f2bdac2713216c
 SHA512 
d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee
-DIST opencascade-7.8.0.tar.gz 48428565 BLAKE2B 
91253101072af27c94b82b82beed5c1f1d7460f4154600fba805c5b2d27976a4841b9a9dfab9e67706d02463b2c630c5b63d1f056e84c69c9c8eeaca7e7caebf
 SHA512 
af176cbd105c49949282c16bb6e30f69167bc6c00a50e0ae69aea555815d47ac3c4540c233e596c5add7cb846c2b33d7be267d8e02472286e758b662b4a652ab
+DIST opencascade-7.8.1.tar.gz 48432051 BLAKE2B 
de7a40b8e6612642a1567d2cf3e6b471c9edeadbc7f686bc8648502165c8d824b3574259874ecb1775c856703fd8df7481c9bc07a66a3a321a83e699e6802052
 SHA512 
807c1f8732926cfdabcfbdf8d6a0e76b8dba1a1e614afe084a467ffb4cfd80623f5e3afa7e9905b1ac96667c93e01b5f98ceaa8948a576a1093d98df98cc8f81
 DIST opencascade-dataset-7.7.0.tar.gz 128392200 BLAKE2B 
ebfbe6f24520144ca4a82e4ddd0486890552c2de1b62bf5c0d4990d777d4a1458dea54f8a6f08d8a0999582fb4325eda0002fc8a0137b9e66d024a47145d1279
 SHA512 
71d7e807b1d629fe7371b9d1d503024d00b7c1ae1775e62803eeffd127bd1c768e5240fdd1f949a237737089d528b5d4e43d26db025bbe14a4e0e4616ebdc5d8
 DIST opencascade-dataset-7.8.0.tar.xz 97049756 BLAKE2B 
aae5f076d9fc8a0d8a05028b0d9ffb527978e7acfdf5ecbc7e71c5ee3d6060cd7db9e56dba5b94a445bf5cf208126711cda70306607bdc5cd5e8b68df8fc150c
 SHA512 
9b4c91d7b4743c47f2cf8d9a3b6ded73409a13133013424150ee9bdb61fd771c0b8799c7f31b459a7d2ba140399b9c0c972e2d0476188006361b4fb04042d990

diff --git 
a/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch 
b/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch
new file mode 100644
index ..2c4a98f5a1fd
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Standard/Standard.cxx b/src/Standard/Standard.cxx
+index bb06de7..f73164f 100644
+--- a/src/Standard/Standard.cxx
 b/src/Standard/Standard.cxx
+@@ -28,7 +28,7 @@
+ #elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ 
>= 1)) && (defined(__i386) || defined(__x86_64)))
+ #include 
+ #else
+-extern "C" int posix_memalign(void** thePtr, size_t theAlign, size_t theSize);
++extern "C" int posix_memalign(void** thePtr, size_t theAlign, size_t theSize) 
throw ();
+ #endif
+ 
+ namespace

diff --git a/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch 
b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
new file mode 100644
index ..224becfdec1f
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2024-04-14 Thread Andrew Ammerlaan

commit: 58cabfdf158ec5485bd3401f7e2ebad6d3046fdd
Author: Paul Zander  gmail  com>
AuthorDate: Thu Apr 11 14:22:21 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Apr 14 14:15:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58cabfdf

sci-libs/opencascade: add tk dep, don't set USE_QT

Closes: https://bugs.gentoo.org/928674
Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../{opencascade-7.7.1.ebuild => opencascade-7.7.1-r1.ebuild} | 4 ++--
 .../{opencascade-7.7.2.ebuild => opencascade-7.7.2-r1.ebuild} | 4 ++--
 sci-libs/opencascade/opencascade-7.8.0.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.7.1.ebuild 
b/sci-libs/opencascade/opencascade-7.7.1-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.7.1.ebuild
rename to sci-libs/opencascade/opencascade-7.7.1-r1.ebuild
index 58050d6c5717..2c547bf457dd 100644
--- a/sci-libs/opencascade/opencascade-7.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.1-r1.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
vtk? (
+   dev-lang/tk:=
sci-libs/vtk:=[rendering]
tbb? (
sci-libs/vtk:=[tbb,-cuda]
@@ -181,7 +182,6 @@ src_configure() {
# no package in tree
-DUSE_OPENVR="no"
-DUSE_RAPIDJSON="$(usex json)"
-   -DUSE_QT="$(usex gui)"
-DUSE_TBB="$(usex tbb)"
-DUSE_TK="$(usex tk)"
-DUSE_VTK="$(usex vtk)"
@@ -195,7 +195,7 @@ src_configure() {
)
fi
 
-   if use gui; then
+   if use examples || use gui; then
mycmakeargs+=(
-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
-DBUILD_SAMPLES_QT="$(usex examples)"

diff --git a/sci-libs/opencascade/opencascade-7.7.2.ebuild 
b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.7.2.ebuild
rename to sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
index a83c28ed566c..ce92fcc889e0 100644
--- a/sci-libs/opencascade/opencascade-7.7.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
vtk? (
+   dev-lang/tk:=
sci-libs/vtk:=[rendering]
tbb? (
sci-libs/vtk:=[tbb,-cuda]
@@ -181,7 +182,6 @@ src_configure() {
# no package in tree
-DUSE_OPENVR="no"
-DUSE_RAPIDJSON="$(usex json)"
-   -DUSE_QT="$(usex gui)"
-DUSE_TBB="$(usex tbb)"
-DUSE_TK="$(usex tk)"
-DUSE_VTK="$(usex vtk)"
@@ -195,7 +195,7 @@ src_configure() {
)
fi
 
-   if use gui; then
+   if use examples || use gui; then
mycmakeargs+=(
-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
-DBUILD_SAMPLES_QT="$(usex examples)"

diff --git a/sci-libs/opencascade/opencascade-7.8.0.ebuild 
b/sci-libs/opencascade/opencascade-7.8.0.ebuild
index ffa9e2065e14..fb390401a82b 100644
--- a/sci-libs/opencascade/opencascade-7.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.8.0.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
jemalloc? ( dev-libs/jemalloc )
tbb? ( dev-cpp/tbb:= )
vtk? (
+   dev-lang/tk:=
sci-libs/vtk:=[rendering]
tbb? (
sci-libs/vtk:=[tbb,-cuda]
@@ -182,7 +183,6 @@ src_configure() {
# no package in tree
-DUSE_OPENVR="no"
-DUSE_RAPIDJSON="$(usex json)"
-   -DUSE_QT="$(usex gui)"
-DUSE_TBB="$(usex tbb)"
-DUSE_TK="$(usex tk)"
-DUSE_VTK="$(usex vtk)"
@@ -210,7 +210,7 @@ src_configure() {
)
fi
 
-   if use gui; then
+   if use examples || use gui; then
mycmakeargs+=(
-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
-DBUILD_SAMPLES_QT="$(usex examples)"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2024-03-26 Thread Sam James

commit: 701bc30b5e597655e5cdf02a74c64836333b61e3
Author: Eli Schwartz  gmail  com>
AuthorDate: Tue Mar 26 19:02:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 26 20:23:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701bc30b

sci-libs/opencascade: mark as LTO-unsafe

Closes: https://bugs.gentoo.org/862912
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.7.0-r2.ebuild | 7 ++-
 sci-libs/opencascade/opencascade-7.7.1.ebuild| 7 ++-
 sci-libs/opencascade/opencascade-7.7.2.ebuild| 7 ++-
 sci-libs/opencascade/opencascade-7.8.0.ebuild| 7 ++-
 sci-libs/opencascade/opencascade-.ebuild | 7 ++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
index 547ddb45705a..9db1978c27a0 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
@@ -5,7 +5,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 MY_SLOT="$(ver_cut 1-2)"
 MY_PV="$(ver_rs 3 '-')"
@@ -82,6 +82,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/862912
+   # https://tracker.dev.opencascade.org/view.php?id=33091
+   filter-lto
+
local mycmakeargs=(
-DBUILD_DOC_Overview=$(usex doc)
-DBUILD_Inspector=$(usex examples)

diff --git a/sci-libs/opencascade/opencascade-7.7.1.ebuild 
b/sci-libs/opencascade/opencascade-7.7.1.ebuild
index d9ef51dd1f11..58050d6c5717 100644
--- a/sci-libs/opencascade/opencascade-7.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake virtualx
+inherit cmake flag-o-matic virtualx
 
 DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and 
data exchange"
 HOMEPAGE="https://www.opencascade.com;
@@ -133,6 +133,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/862912
+   # https://tracker.dev.opencascade.org/view.php?id=33091
+   filter-lto
+
local mycmakeargs=(
-D3RDPARTY_DIR="${ESYSROOT}/usr"
-DBUILD_CPP_STANDARD="C++17"

diff --git a/sci-libs/opencascade/opencascade-7.7.2.ebuild 
b/sci-libs/opencascade/opencascade-7.7.2.ebuild
index 606592c2b231..a83c28ed566c 100644
--- a/sci-libs/opencascade/opencascade-7.7.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake virtualx
+inherit cmake flag-o-matic virtualx
 
 DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and 
data exchange"
 HOMEPAGE="https://www.opencascade.com;
@@ -133,6 +133,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/862912
+   # https://tracker.dev.opencascade.org/view.php?id=33091
+   filter-lto
+
local mycmakeargs=(
-D3RDPARTY_DIR="${ESYSROOT}/usr"
-DBUILD_CPP_STANDARD="C++17"

diff --git a/sci-libs/opencascade/opencascade-7.8.0.ebuild 
b/sci-libs/opencascade/opencascade-7.8.0.ebuild
index 33ab0630c4c9..ffa9e2065e14 100644
--- a/sci-libs/opencascade/opencascade-7.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake virtualx
+inherit cmake flag-o-matic virtualx
 
 DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and 
data exchange"
 HOMEPAGE="https://www.opencascade.com;
@@ -134,6 +134,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/862912
+   # https://tracker.dev.opencascade.org/view.php?id=33091
+   filter-lto
+
local mycmakeargs=(
-D3RDPARTY_DIR="${ESYSROOT}/usr"
-DBUILD_CPP_STANDARD="C++17"

diff --git a/sci-libs/opencascade/opencascade-.ebuild 
b/sci-libs/opencascade/opencascade-.ebuild
index 2f819b1746e8..e3da366e699f 100644
--- a/sci-libs/opencascade/opencascade-.ebuild
+++ b/sci-libs/opencascade/opencascade-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake virtualx
+inherit cmake flag-o-matic virtualx
 
 DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and 
data exchange"
 HOMEPAGE="https://www.opencascade.com;
@@ -134,6 +134,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/862912
+   # https://tracker.dev.opencascade.org/view.php?id=33091
+   filter-lto
+
local mycmakeargs=(
-D3RDPARTY_DIR="${ESYSROOT}/usr"
-DBUILD_CPP_STANDARD="C++17"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/, profiles/base/

2024-03-25 Thread Sam James

commit: e3179b6eab5b0d068a54ff39f17cddd9457adcc3
Author: Paul Zander  gmail  com>
AuthorDate: Mon Mar 25 16:16:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 25 18:54:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3179b6e

sci-libs/opencascade: fix 927629, 927592, 925441

Closes: https://bugs.gentoo.org/927629
Closes: https://bugs.gentoo.org/927592
Closes: https://bugs.gentoo.org/925441
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35912
Signed-off-by: Sam James  gentoo.org>

 profiles/base/package.use.mask |  2 +-
 .../files/opencascade-7.7.0-tbb-detection.patch| 53 ++
 sci-libs/opencascade/opencascade-7.7.1.ebuild  | 41 ++---
 sci-libs/opencascade/opencascade-7.7.2.ebuild  | 41 ++---
 sci-libs/opencascade/opencascade-7.8.0.ebuild  | 30 ++--
 5 files changed, 96 insertions(+), 71 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 76b39e86f880..1b39b7a886a6 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -270,7 +270,7 @@ x11-wm/stumpwm doc
 # Bernd Waibel  (2022-11-25)
 # USE=tbb is broken in 7.7.0
 # https://tracker.dev.opencascade.org/view.php?id=33152
->=sci-libs/opencascade-7.7.0 tbb
+ (2022-11-22)
 # app-text/pandoc is not keyworded on most architectures

diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch 
b/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch
new file mode 100644
index ..c93b009a9da6
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-tbb-detection.patch
@@ -0,0 +1,53 @@
+From: Fabio Rossi 
+See-Also: https://tracker.dev.opencascade.org/view.php?id=33612
+Fix tbb detection
+
+--- ./adm/cmake/tbb.cmake  2022-11-11 23:19:44.0 +0100
 ./adm/cmake/tbb.cmake.new  2024-02-24 18:59:32.267165878 +0100
+@@ -56,13 +56,17 @@
+   list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+ endif()
+ 
++# Get installed configuration of tbb
++get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb 
IMPORTED_CONFIGURATIONS)
++list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
++
+ separate_arguments (CSF_TBB)
+ foreach (LIB IN LISTS CSF_TBB)
+   string(TOLOWER "${LIB}" LIB_LOWER)
+   string(TOUPPER "${LIB}" LIB_UPPER)
+ 
+   # Achive *.lib files and directory containing it.
+-  get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" 
IMPORTED_IMPLIB_RELEASE)
++  get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" 
IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
+   # Reserve cache variable for *.lib.
+   if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
+ set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} 
library (*.lib)")
+@@ -89,7 +93,7 @@
+   endif()
+ 
+   # Achive *.dll files and directory containing it.
+-  get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" 
IMPORTED_LOCATION_RELEASE)
++  get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" 
IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+   # Reserve cache variable for *.dll.
+   if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL)
+ set (3RDPARTY_${LIB_UPPER}_DLL "" CACHE FILEPATH "${LIB_UPPER} 
library (*.dll)")
+@@ -185,13 +189,17 @@
+ list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+   endif()
+ 
++  # Get installed configuration of tbb
++  get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb 
IMPORTED_CONFIGURATIONS)
++  list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
++
+   separate_arguments (CSF_TBB)
+   foreach (LIB IN LISTS CSF_TBB)
+ string(TOLOWER "${LIB}" LIB_LOWER)
+ string(TOUPPER "${LIB}" LIB_UPPER)
+ 
+ # Achive *.so files and directory containing it.
+-get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" 
IMPORTED_LOCATION_RELEASE)
++get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" 
IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+ # Reserve cache variable for *.so.
+ if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
+   set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} 
library (*.so)")

diff --git a/sci-libs/opencascade/opencascade-7.7.1.ebuild 
b/sci-libs/opencascade/opencascade-7.7.1.ebuild
index 384a99eaaf44..d9ef51dd1f11 100644
--- a/sci-libs/opencascade/opencascade-7.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.1.ebuild
@@ -32,11 +32,12 @@ fi
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only +gui jemalloc 
json +opengl optimize tbb test testprograms tk vtk"
+IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only gui json 
+opengl optimize tbb test testprograms tk vtk"
 
 REQUIRED_USE="
?? ( optimize tbb )
?? ( opengl gles2-only )
+   examples? ( gui )
test? (

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2024-03-23 Thread Sam James

commit: ee4cd7a0bcc86892b808514a87b864d464925f1f
Author: Paul Zander  gmail  com>
AuthorDate: Fri Feb 16 15:01:07 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 23 08:33:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4cd7a0

sci-libs/opencascade: drop obsolete block

Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.6.3-r2.ebuild | 1 -
 sci-libs/opencascade/opencascade-7.7.0-r2.ebuild | 1 -
 2 files changed, 2 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
index 25a8b78a8a7a..2e561ce32b79 100644
--- a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
@@ -27,7 +27,6 @@ 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

diff --git a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
index 31f9cb4cbfca..547ddb45705a 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
@@ -28,7 +28,6 @@ RESTRICT="test"
 
 # ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871
 RDEPEND="
-   !app-eselect/eselect-opencascade
dev-lang/tcl:=
dev-lang/tk:=
media-libs/fontconfig

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/

2024-03-23 Thread Sam James

commit: 6c55a8ea86f9ccf27bd0def2756262a2d7eafba2
Author: Paul Zander  gmail  com>
AuthorDate: Fri Feb 16 15:02:28 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 23 08:33:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c55a8ea

sci-libs/opencascade: add 7.7.1, 7.7.2, 7.8.0, 

Closes: https://bugs.gentoo.org/923350
Closes: https://bugs.gentoo.org/911578
Closes: https://bugs.gentoo.org/908889
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35374
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/Manifest  |   5 +
 .../opencascade-7.7.0-jemalloc-lib-type.patch  |  27 ++
 .../opencascade-7.8.0-cmake-min-version.patch  |  14 +
 .../files/opencascade-7.8.0-tests.patch|  19 ++
 sci-libs/opencascade/metadata.xml  |  33 +-
 sci-libs/opencascade/opencascade-7.7.1.ebuild  | 366 +
 sci-libs/opencascade/opencascade-7.7.2.ebuild  | 366 +
 sci-libs/opencascade/opencascade-7.8.0.ebuild  | 365 
 sci-libs/opencascade/opencascade-.ebuild   | 365 
 9 files changed, 1539 insertions(+), 21 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index af71bb8b4462..ac0e7aa5db19 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,2 +1,7 @@
 DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B 
ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d
 SHA512 
c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
 DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B 
b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a
 SHA512 
6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
+DIST opencascade-7.7.1.tar.gz 48408076 BLAKE2B 
46e14a47a0ce555ac17a3fca520c1f21d7ca05c67b54259e3d2d8560618db096313d5be3d5e4a24acad1912534c17293ad203f48dd7464690aec86e287d9f230
 SHA512 
f095848d212afbe7e71614d46f57222e347246aec7c92aafae59e6f07798f5371c7a125042c149393ee7d361f28eb89b5196de17a7cc37233f1586ba919c0839
+DIST opencascade-7.7.2.tar.gz 48404428 BLAKE2B 
28d637e75eca570e38401a0a59127ffdbcb06838a91cc3899fe905834bb47e0e9a92d16cde52027d94e78b0fbddc2043340a35dcb0f4a472c4f2bdac2713216c
 SHA512 
d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee
+DIST opencascade-7.8.0.tar.gz 48428565 BLAKE2B 
91253101072af27c94b82b82beed5c1f1d7460f4154600fba805c5b2d27976a4841b9a9dfab9e67706d02463b2c630c5b63d1f056e84c69c9c8eeaca7e7caebf
 SHA512 
af176cbd105c49949282c16bb6e30f69167bc6c00a50e0ae69aea555815d47ac3c4540c233e596c5add7cb846c2b33d7be267d8e02472286e758b662b4a652ab
+DIST opencascade-dataset-7.7.0.tar.gz 128392200 BLAKE2B 
ebfbe6f24520144ca4a82e4ddd0486890552c2de1b62bf5c0d4990d777d4a1458dea54f8a6f08d8a0999582fb4325eda0002fc8a0137b9e66d024a47145d1279
 SHA512 
71d7e807b1d629fe7371b9d1d503024d00b7c1ae1775e62803eeffd127bd1c768e5240fdd1f949a237737089d528b5d4e43d26db025bbe14a4e0e4616ebdc5d8
+DIST opencascade-dataset-7.8.0.tar.xz 97049756 BLAKE2B 
aae5f076d9fc8a0d8a05028b0d9ffb527978e7acfdf5ecbc7e71c5ee3d6060cd7db9e56dba5b94a445bf5cf208126711cda70306607bdc5cd5e8b68df8fc150c
 SHA512 
9b4c91d7b4743c47f2cf8d9a3b6ded73409a13133013424150ee9bdb61fd771c0b8799c7f31b459a7d2ba140399b9c0c972e2d0476188006361b4fb04042d990

diff --git 
a/sci-libs/opencascade/files/opencascade-7.7.0-jemalloc-lib-type.patch 
b/sci-libs/opencascade/files/opencascade-7.7.0-jemalloc-lib-type.patch
new file mode 100644
index ..c80d9946b7c6
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-jemalloc-lib-type.patch
@@ -0,0 +1,27 @@
+From: Paul Zander 
+
+Only try to find the jemalloc libs we are going to use
+
+diff --git a/adm/cmake/jemalloc.cmake b/adm/cmake/jemalloc.cmake
+index b37d5d276..deef66d6c 100644
+--- a/adm/cmake/jemalloc.cmake
 b/adm/cmake/jemalloc.cmake
+@@ -128,6 +128,7 @@ endmacro()
+ # Reset CSF variable
+ set (CSF_MMGR "")
+ 
++if(BUILD_LIBRARY_TYPE EQUAL "Static")
+ # find static jemalloc lib
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
+ if (WIN32)
+@@ -137,7 +138,10 @@ elseif(NOT WIN32)
+   SET(CMAKE_FIND_LIBRARY_SUFFIXES "" "so")
+   JEMALLOC_LIB_SEARCH ("jemalloc.so.2" "SHARED")
+ endif()
++endif()
+ 
++if(BUILD_LIBRARY_TYPE EQUAL "Shared")
+ # find shared jemalloc lib
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".so")
+ JEMALLOC_LIB_SEARCH ("jemalloc" "SHARED")
++endif()

diff --git 
a/sci-libs/opencascade/files/opencascade-7.8.0-cmake-min-version.patch 
b/sci-libs/opencascade/files/opencascade-7.8.0-cmake-min-version.patch
new file mode 100644
index

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, media-libs/lib3mf/, media-libs/assimp/, dev-libs/optix/, ...

2024-03-16 Thread Joonas Niilola

commit: 7d2d1edd62e0d6f07969f7c2568767aa139ddf48
Author: Paul Zander  gmail  com>
AuthorDate: Thu Mar 14 14:18:52 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar 16 08:49:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2d1edd

*/*: Take over waebbl's packages

Bug: https://bugs.gentoo.org/639236
Bug: https://bugs.gentoo.org/659306
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35751
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/imath/metadata.xml   |  4 ++--
 dev-libs/optix/metadata.xml   |  4 ++--
 media-gfx/alembic/metadata.xml|  4 ++--
 media-gfx/freecad/metadata.xml|  4 ++--
 media-gfx/netgen/metadata.xml |  4 ++--
 media-gfx/openscad/metadata.xml   |  4 ++--
 media-libs/assimp/metadata.xml|  4 ++--
 media-libs/lib3mf/metadata.xml|  4 ++--
 media-libs/openexr/metadata.xml   |  4 ++--
 media-libs/ptex/metadata.xml  |  4 
 sci-libs/opencascade/metadata.xml |  4 ++--
 sci-libs/vtk/metadata.xml | 12 
 12 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/dev-libs/imath/metadata.xml b/dev-libs/imath/metadata.xml
index e8c22a1a5aea..2f3f4ae00b0c 100644
--- a/dev-libs/imath/metadata.xml
+++ b/dev-libs/imath/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   waebbl-gen...@posteo.net
-   Bernd Waibel
+   negril.nx+gen...@gmail.com
+   Paul Zander


proxy-ma...@gentoo.org

diff --git a/dev-libs/optix/metadata.xml b/dev-libs/optix/metadata.xml
index 8bd511c9ee2a..dbf8509f40b1 100644
--- a/dev-libs/optix/metadata.xml
+++ b/dev-libs/optix/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 
   
-waebbl-gen...@posteo.net
-Bernd Waibel
+negril.nx+gen...@gmail.com
+Paul Zander
   
   
 ma...@vanvoorden.be

diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index 7dec64f8ad94..b90cd74547ec 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 
 
-   waebbl-gen...@posteo.net
-   Bernd Waibel
+   negril.nx+gen...@gmail.com
+   Paul Zander
 
 
proxy-ma...@gentoo.org

diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 17e33f46262b..b934f4a2b2de 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   waebbl-gen...@posteo.net
-   Bernd Waibel
+   negril.nx+gen...@gmail.com
+   Paul Zander


proxy-ma...@gentoo.org

diff --git a/media-gfx/netgen/metadata.xml b/media-gfx/netgen/metadata.xml
index 3c583c643516..201e5f704aba 100644
--- a/media-gfx/netgen/metadata.xml
+++ b/media-gfx/netgen/metadata.xml
@@ -6,8 +6,8 @@
Gentoo Mathematics Project


-   waebbl-gen...@posteo.net
-   Bernd Waibel
+   negril.nx+gen...@gmail.com
+   Paul Zander


Enable logging through 
dev-libs/spdlog

diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 0b965cbf4ac8..654ea84529a5 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 
 
-   waebbl-gen...@posteo.net
-   Bernd Waibel
+   negril.nx+gen...@gmail.com
+   Paul Zander
 
 
proxy-ma...@gentoo.org

diff --git a/media-libs/assimp/metadata.xml b/media-libs/assimp/metadata.xml
index 5525e184d20e..0d6bbab44f23 100644
--- a/media-libs/assimp/metadata.xml
+++ b/media-libs/assimp/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   waebbl-gen...@posteo.net
-   Bernd Waibel
+   negril.nx+gen...@gmail.com
+   Paul Zander


proxy-ma...@gentoo.org

diff --git a/media-libs/lib3mf/metadata.xml b/media-libs/lib3mf/metadata.xml
index 9dbd22ab368d..d93427ed8a3b 100644
--- a/media-libs/lib3mf/metadata.xml
+++ b/media-libs/lib3mf/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 
 
-   waebbl-gen...@posteo.net
-   Bernd Waibel
+   negril.nx+gen...@gmail.com
+   Paul Zander
 
 
proxy-ma...@gentoo.org

diff --git a/media-libs/openexr/metadata.xml b/media-libs/openexr/metadata.xml
index 8e60441561f5..e70affd96c19 100644
--- a/media-libs/openexr/metadata.xml
+++ b/media-libs/openexr/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   waebbl-gen...@posteo.net
-   Bernd Waibel
+   negril.nx+gen...@gmail.com
+   Paul Zander

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2023-07-31 Thread Joonas Niilola

commit: 15a45083c6adc9b268be5170dd25bc96933f5ecf
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 31 08:42:33 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 31 08:43:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a45083

sci-libs/opencascade: add missing xorg-proto dep

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/opencascade-7.7.0-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
index 076a308ee9ba..87f8035f70d2 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
@@ -49,6 +49,7 @@ RDEPEND="
 "
 DEPEND="
${RDEPEND}
+   x11-base/xorg-proto
json? ( dev-libs/rapidjson )
vtk? ( dev-libs/utfcpp )
 "

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2023-07-31 Thread Joonas Niilola

commit: 5e2d9cb1e3a5ae5e530bef03d12b6b44d7a8c252
Author: Violet Purcell  inventati  org>
AuthorDate: Tue Jul 11 20:24:57 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 31 08:43:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2d9cb1

sci-libs/opencascade: Fix build on musl

Signed-off-by: Violet Purcell  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31496
Signed-off-by: Joonas Niilola  gentoo.org>

 .../opencascade/files/opencascade-7.7.0-musl.patch | 97 ++
 ...7.6.3-r1.ebuild => opencascade-7.6.3-r2.ebuild} |  3 +-
 ...7.7.0-r1.ebuild => opencascade-7.7.0-r2.ebuild} |  1 +
 3 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-musl.patch 
b/sci-libs/opencascade/files/opencascade-7.7.0-musl.patch
new file mode 100644
index ..45aeb449ac73
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-musl.patch
@@ -0,0 +1,97 @@
+From 4351ac37b19bf43ff9a8f21e5126deb7f43f751e Mon Sep 17 00:00:00 2001
+From: Violet Purcell 
+Date: Tue, 11 Jul 2023 16:13:32 -0400
+Subject: [PATCH] Fix building with musl
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -554,6 +554,10 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_EIGEN CAN_USE_EIGEN)
+ # define CSF variable
+ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_csf")
+ 
++# Check for execinfo.h
++include(CheckIncludeFile)
++CHECK_INCLUDE_FILE("execinfo.h" HAS_EXECINFO_H)
++
+ # Tcl (mandatory for Draw Harness)
+ if (USE_TCL)
+   message (STATUS "Info: TCL is used by OCCT")
+--- a/src/OSD/OSD_MemInfo.cxx
 b/src/OSD/OSD_MemInfo.cxx
+@@ -184,12 +184,16 @@ void OSD_MemInfo::Update()
+ #endif
+   #endif
+ 
++  #if defined(__GLIBC__)
+   #ifdef HAS_MALLINFO2
+ const struct mallinfo2 aMI = mallinfo2();
+   #else
+ const struct mallinfo aMI = mallinfo();
+   #endif
+ myCounters[MemHeapUsage] = aMI.uordblks;
++  #else
++myCounters[MemHeapUsage] = 0;
++  #endif
+   }
+ 
+   if (!IsActive (MemVirtual)
+--- a/src/OSD/OSD_signal.cxx
 b/src/OSD/OSD_signal.cxx
+@@ -758,7 +758,7 @@ typedef void (* SIG_PFV) (int);
+ 
+ #include 
+ 
+-#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
++#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) && 
 defined(__GLIBC__)
+   #include 
+ #endif
+ 
+@@ -974,7 +974,7 @@ static void SegvHandler(const int theSignal,
+ //===
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+   feclearexcept (FE_ALL_EXCEPT);
+   if (theFloatingSignal)
+   {
+@@ -1007,7 +1007,7 @@ void OSD::SetFloatingSignal (Standard_Boolean 
theFloatingSignal)
+ //===
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+   return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+   return Standard_False;
+--- a/src/Standard/Standard_StackTrace.cxx
 b/src/Standard/Standard_StackTrace.cxx
+@@ -29,7 +29,7 @@
+   //#include 
+ #elif defined(__QNX__)
+   //#include  // requires linking to libbacktrace
+-#elif !defined(_WIN32) && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
++#elif defined (HAS_EXECINFO_H)
+   #include 
+ #elif defined(_WIN32) && !defined(OCCT_UWP)
+ 
+@@ -313,7 +313,7 @@ Standard_Boolean Standard::StackTrace (char* theBuffer,
+   Message::SendTrace ("Standard::StackTrace() is not implemented for this CPU 
architecture");
+   return false;
+ #endif
+-#else
++#elif defined (HAS_EXECINFO_H)
+   const int aTopSkip = theNbTopSkip + 1; // skip this function call and 
specified extra number
+   int aNbTraces = theNbTraces + aTopSkip;
+   void** aStackArr = (void** )alloca (sizeof(void*) * aNbTraces);
+@@ -360,5 +360,7 @@ Standard_Boolean Standard::StackTrace (char* theBuffer,
+ strcat (theBuffer, "\n=");
+   }
+   return true;
++#else
++  return false;
+ #endif
+ }
+-- 
+2.41.0
+

diff --git a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
rename to sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
index 82352ba3e3a2..0ea3c5736c42 100644
--- a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -69,6 +69,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
"${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
+   "${FILESDIR}"/${PN}-7.7.0-musl.patch
 )
 
 src_prepare() {

diff --git

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2023-02-06 Thread Sam James

commit: 4dec3db3d56a4681432fc336183ad0306a9b3a0e
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  6 19:49:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  6 19:49:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dec3db3

sci-libs/opencascade: Stabilize 7.7.0-r1 amd64, #893360

Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.7.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
index 57907bad4816..c22348558869 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # 
USE_{DRACO,FFMPEG,FREEIMAGE,FREETYPE,GLES2,OPENGL,OPENVR,RAPIDJSON,TBB,TK,VTK,XLIB}
@@ -17,7 +17,7 @@ S="${WORKDIR}/occt-185d29b"
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 IUSE="doc examples ffmpeg freeimage gles2 json optimize tbb vtk"
 
 REQUIRED_USE="?? ( optimize tbb )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2023-01-28 Thread Andreas Sturmlechner

commit: ff9032e688571dde15e9d36cebedf5a247ded1b8
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Jan 27 11:32:35 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 28 22:32:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff9032e6

sci-libs/opencascade: drop 7.5.3-r8

Cleanup old. No consumers left for this version in ::gentoo. There's one
consumer for that version in the ::science repo.

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29296
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 -
 1-0001-allow-default-search-path-for-Qt5.patch |  26 ---
 ...e-7.5.1-0002-remove-unnecessary-Qt5-check.patch |  28 
 ...-7.5.1-0003-add-Gentoo-configuration-type.patch |  26 ---
 ...fix-AllValues-name-collision-with-vtk-9.0.patch | 172 
 sci-libs/opencascade/opencascade-7.5.3-r8.ebuild   | 176 -
 6 files changed, 429 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index b0510b20df5f..af71bb8b4462 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,2 @@
-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

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..
--- 
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 
-Date: Wed, 3 Feb 2021 23:31:23 +0100
-Subject: [PATCH] allow default search path for Qt5
-
-Signed-off-by: Bernd Waibel 

- 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..
--- 
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 
-Date: Wed, 3 Feb 2021 23:45:27 +0100
-Subject: [PATCH] remove unnecessary Qt5 check
-
-Signed-off-by: Bernd Waibel 

- 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..
---

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2023-01-26 Thread Joonas Niilola

commit: a09299ba9747ac81ed4d8deab8d1e682f34879d1
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Fri Jan 27 07:06:41 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jan 27 07:42:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09299ba

sci-libs/opencascade: drop 7.5.2-r6

Signed-off-by: Zoltan Puskas  sinustrom.info>
Closes: https://github.com/gentoo/gentoo/pull/29293
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/Manifest|   1 -
 sci-libs/opencascade/opencascade-7.5.2-r6.ebuild | 175 ---
 2 files changed, 176 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index ff6ab85b0da3..b0510b20df5f 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1,3 @@
-DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 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

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
deleted file mode 100644
index f2acaba15e74..
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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? ( =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
-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2023-01-03 Thread Sam James

commit: 463b1378781aac8534288fd51f0f432dc8fa6690
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Jan  2 07:50:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  4 05:48:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=463b1378

sci-libs/opencascade: simplify vtk logic (v7.7.0)

Avoid using conditional logic to determine the include directory for VTK.

Suggested-by: Sam James  gentoo.org>
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.7.0-r1.ebuild | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
index efd245f9b465..57907bad4816 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
@@ -133,17 +133,14 @@ src_configure() {
fi
 
if use vtk; then
+   local vtk_ver=$(best_version "sci-libs/vtk")
+   vtk_ver=${vtk_ver#sci-libs/vtk-}
+   vtk_ver=$(ver_cut 1-2 ${vtk_ver})
mycmakeargs+=(
-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+   
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver}

-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
)
-   if has_version ">=sci-libs/vtk-9.2.0"; then
-   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
-   elif has_version ">=sci-libs/vtk-9.1.0"; then
-   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
-   elif has_version ">=sci-libs/vtk-9.0.0"; then
-   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 )
-   fi
fi
 
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2023-01-03 Thread Sam James

commit: 0d7bfedb0301cadcf0e96cec0eb182ab1f471553
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Jan  2 07:57:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  4 05:48:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7bfedb

sci-libs/opencascade: simplify vtk logic (v7.6.3)

Backport patch from v7.7.0

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28932
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.6.3-r1.ebuild | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
index 2090e9b45195..82352ba3e3a2 100644
--- a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
@@ -132,17 +132,14 @@ src_configure() {
fi
 
if use vtk; then
+   local vtk_ver=$(best_version "sci-libs/vtk")
+   vtk_ver=${vtk_ver#sci-libs/vtk-}
+   vtk_ver=$(ver_cut 1-2 ${vtk_ver})
mycmakeargs+=(
-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+   
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver}

-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
)
-   if has_version ">=sci-libs/vtk-9.2.0"; then
-   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
-   elif has_version ">=sci-libs/vtk-9.1.0"; then
-   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
-   elif has_version ">=sci-libs/vtk-9.0.0"; then
-   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 )
-   fi
fi
 
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-12-31 Thread Sam James

commit: 3a10bb3a17cd9fa3929de46ca53d76adff94adbd
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Dec 18 16:12:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 31 15:36:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a10bb3a

sci-libs/opencascade: build 7.6.3 against vtk-9.2

Backport patch from v7.7.0

Bug: https://bugs.gentoo.org/886343
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28704
Signed-off-by: Sam James  gentoo.org>

 ...de-7.6.3.ebuild => opencascade-7.6.3-r1.ebuild} | 25 +++---
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild 
b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
similarity index 88%
rename from sci-libs/opencascade/opencascade-7.6.3.ebuild
rename to sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
index cd7888f8818b..2090e9b45195 100644
--- a/sci-libs/opencascade/opencascade-7.6.3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
media-libs/ftgl
virtual/glu
virtual/opengl
-   x11-libs/libXmu
+   x11-libs/libX11
examples? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -49,7 +49,7 @@ RDEPEND="
ffmpeg? ( =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)
-   )
+   mycmakeargs+=(
+   -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+   
-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+   )
+   if has_version ">=sci-libs/vtk-9.2.0"; then
+   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
+   elif has_version ">=sci-libs/vtk-9.1.0"; then
+   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
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)
-   )
+   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 )
fi
fi

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2022-12-31 Thread Sam James

commit: bdaa85f652b25c81c889d9a1bcff53a819b0afc2
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Dec 18 15:37:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 31 15:36:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdaa85f6

sci-libs/opencascade: build 7.7.0 against vtk-9.2

cleanup some X related libraries

Closes: https://bugs.gentoo.org/886343
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 .../opencascade-7.7.0-build-against-vtk-9.2.patch  | 36 ++
 ...de-7.7.0.ebuild => opencascade-7.7.0-r1.ebuild} | 25 ++-
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git 
a/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch 
b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch
new file mode 100644
index ..7e744189a8d2
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch
@@ -0,0 +1,36 @@
+From: 
http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c
+
+From: Aiden Grossman 
+Date: Mon, 10 Oct 2022 18:25:13 + (-0700)
+Subject: Fix naming conflict between X11 headers and VTK 9.2.2+
+X-Git-Url: 
http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c
+
+Fix naming conflict between X11 headers and VTK 9.2.2+
+
+Currently, the GLX headers include the X11 headers which use a
+preprocessor define to make Status an int. However, VTK has a class
+called Status, and this define replaces this class name with int which
+results in compilation errors. This patch undefs Status and Success,
+which are both defined in the X11 headers if they exist so that there
+are no conflicts within the VTK headers for newer versions.
+---
+
+--- a/src/IVtkDraw/IVtkDraw_Interactor.cxx
 b/src/IVtkDraw/IVtkDraw_Interactor.cxx
+@@ -27,6 +27,16 @@
+ #undef AllValues
+ #endif
+ 
++// Prevent naming collisions between X11
++// and VTK versions 9.2.0 and above.
++// X11 is included through glx
++#ifdef Status
++#undef Status
++#endif
++#ifdef Success
++#undef Success
++#endif
++
+ #include 
+ #include 
+ #endif

diff --git a/sci-libs/opencascade/opencascade-7.7.0.ebuild 
b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
similarity index 88%
rename from sci-libs/opencascade/opencascade-7.7.0.ebuild
rename to sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
index c2f7e7dbf7a4..efd245f9b465 100644
--- a/sci-libs/opencascade/opencascade-7.7.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
virtual/opengl
-   x11-libs/libXmu
+   x11-libs/libX11
examples? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -63,6 +63,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.7.0-add-missing-include-limits.patch
"${FILESDIR}"/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch
"${FILESDIR}"/${PN}-7.7.0-avoid-pre-stripping-binaries.patch
+   "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
 )
 
 src_prepare() {
@@ -132,24 +133,16 @@ src_configure() {
fi
 
if use vtk; then
+   mycmakeargs+=(
+   -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+   
-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+   )
if has_version ">=sci-libs/vtk-9.2.0"; then
-   mycmakeargs+=(
-   -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-   
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2
-   
-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-   )
+   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
elif 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)
-   )
+   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
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)
-   )
+   mycmakeargs+=(

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-12-19 Thread Andreas Sturmlechner

commit: caac47cd51854fdbba440c37ecb62f27a2dcd669
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 19 14:48:13 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 19 14:49:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caac47cd

sci-libs/opencascade: Revert "drop 7.5.2-r6"

This reverts commit cce61ad9fb4d880a97dd9d1772972a4863ea5558.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/opencascade/Manifest|   1 +
 sci-libs/opencascade/opencascade-7.5.2-r6.ebuild | 175 +++
 2 files changed, 176 insertions(+)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index b0510b20df5f..ff6ab85b0da3 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,4 @@
+DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 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

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
new file mode 100644
index ..f2acaba15e74
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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? ( =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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-12-19 Thread Andreas Sturmlechner

commit: cce61ad9fb4d880a97dd9d1772972a4863ea5558
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 18 11:35:33 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 19 14:45:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce61ad9

sci-libs/opencascade: drop 7.5.2-r6

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/opencascade/Manifest|   1 -
 sci-libs/opencascade/opencascade-7.5.2-r6.ebuild | 175 ---
 2 files changed, 176 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index ff6ab85b0da3..b0510b20df5f 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1,3 @@
-DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 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

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
deleted file mode 100644
index f2acaba15e74..
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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? ( =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
-
-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-12-13 Thread Andrew Ammerlaan

commit: b1c6afa07316c3b71e4a4c37637b69a351d49ac0
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Dec 13 13:30:34 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Dec 13 13:36:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c6afa0

sci-libs/opencascade: ensure vtk include dirs are found

Closes: https://bugs.gentoo.org/885621
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/opencascade/opencascade-7.5.2-r6.ebuild |  2 +-
 sci-libs/opencascade/opencascade-7.5.3-r8.ebuild |  2 +-
 sci-libs/opencascade/opencascade-7.6.3.ebuild|  2 +-
 sci-libs/opencascade/opencascade-7.7.0.ebuild| 10 --
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
index d4500132ab1f..f2acaba15e74 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
tbb? ( =sci-libs/vtk-9.1.0"; then
+   if has_version ">=sci-libs/vtk-9.2.0"; then
+   mycmakeargs+=(
+   -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+   
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2
+   
-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+   )
+   elif 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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/

2022-11-25 Thread Joonas Niilola

commit: 6f48536ddd49190e89e394361f01864a29ce8e96
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Oct  8 12:20:14 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 25 11:18:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f48536d

sci-libs/opencascade: add 7.7.0

Bug: https://tracker.dev.opencascade.org/view.php?id=32650
Bug: https://tracker.dev.opencascade.org/view.php?id=33216
Closes: https://bugs.gentoo.org/880233
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27696
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 +
 ...ncascade-7.7.0-add-missing-include-limits.patch |  19 +++
 ...ascade-7.7.0-avoid-pre-stripping-binaries.patch |  34 
 0-fix-installation-of-cmake-config-files.patch |  33 
 sci-libs/opencascade/opencascade-7.7.0.ebuild  | 176 +
 5 files changed, 263 insertions(+)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index c3e51ef720d8..ff6ab85b0da3 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,4 @@
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 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

diff --git 
a/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch 
b/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch
new file mode 100644
index ..2bc59319864a
--- /dev/null
+++ 
b/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch
@@ -0,0 +1,19 @@
+From 44a30819131496bf41f2e1dcfd362b23173db6fb Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Wed, 5 Oct 2022 21:55:06 +0200
+Subject: [PATCH] add missing #include 
+
+Signed-off-by: Bernd Waibel 
+--- a/src/ViewerTest/ViewerTest_CmdParser.cxx
 b/src/ViewerTest/ViewerTest_CmdParser.cxx
+@@ -21,6 +21,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ namespace
+ {
+-- 
+2.38.0
+

diff --git 
a/sci-libs/opencascade/files/opencascade-7.7.0-avoid-pre-stripping-binaries.patch
 
b/sci-libs/opencascade/files/opencascade-7.7.0-avoid-pre-stripping-binaries.patch
new file mode 100644
index ..5c351cb32996
--- /dev/null
+++ 
b/sci-libs/opencascade/files/opencascade-7.7.0-avoid-pre-stripping-binaries.patch
@@ -0,0 +1,34 @@
+From e145fb627d199e888267e19eab951c69c2f8151c Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sat, 8 Oct 2022 13:16:47 +0200
+Subject: [PATCH] avoid pre-stripping binaries
+
+Signed-off-by: Bernd Waibel 
+--- a/adm/cmake/occt_defs_flags.cmake
 b/adm/cmake/occt_defs_flags.cmake
+@@ -135,22 +135,12 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
+ # CLang can be used with both libstdc++ and libc++, however on OS X 
libstdc++ is outdated.
+ set (CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")
+   endif()
+-  # Optimize size of binaries
+-  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
+ elseif(MINGW)
+   add_definitions(-D_WIN32_WINNT=0x0601)
+   # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
+   #set (CMAKE_SYSTEM_VERSION "6.1")
+   # workaround bugs in mingw with vtable export
+   set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols")
+-
+-  # Optimize size of binaries
+-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+-elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+-  # Optimize size of binaries
+-  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)
+-- 
+2.38.0
+

diff --git 
a/sci-libs/opencascade/files/opencascade-7.7.0-fix-installation-of-cmake-config-files.patch

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-09-27 Thread Andrew Ammerlaan

commit: fd15b37705f0e3e4251ed993743dc8f587ed772c
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Sep 25 08:02:26 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Sep 27 13:56:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd15b377

sci-libs/opencascade: drop 7.6.2-r1

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27442
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/opencascade/Manifest|   1 -
 sci-libs/opencascade/opencascade-7.6.2-r1.ebuild | 172 ---
 2 files changed, 173 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 2ce18530639e..c3e51ef720d8 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1,3 @@
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
-DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 
62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb
 SHA512 
fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc
 DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B 
ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d
 SHA512 
c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded

diff --git a/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
deleted file mode 100644
index 30553c491ea0..
--- a/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PV="$(ver_rs 1- '_')"
-MY_SLOT="$(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/${MY_SLOT}"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE="doc eigen examples ffmpeg freeimage gles2 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? ( =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
-
-   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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-09-25 Thread Joonas Niilola

commit: e75a91c6cff14f32413759cb041df7ad0049ad5c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Sep 25 07:20:15 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Sep 25 07:20:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e75a91c6

sci-libs/opencascade: Stabilize 7.6.3 amd64, #872644

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/opencascade-7.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild 
b/sci-libs/opencascade/opencascade-7.6.3.ebuild
index 192d6d2408c3..398ea6df2e54 100644
--- a/sci-libs/opencascade/opencascade-7.6.3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/occt-${COMMIT_SHORT}"
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 IUSE="doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk"
 
 REQUIRED_USE="?? ( optimize tbb )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-08-14 Thread Florian Schmaus

commit: 614e6abf6e848b9a983ef3f6cc7ed6eaf990d31d
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Aug  9 11:27:17 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Aug 14 16:03:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=614e6abf

sci-libs/opencascade: add 7.6.3

Closes: https://bugs.gentoo.org/861953
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26793
Signed-off-by: Florian Schmaus  gentoo.org>

 sci-libs/opencascade/Manifest |   1 +
 sci-libs/opencascade/opencascade-7.6.3.ebuild | 175 ++
 2 files changed, 176 insertions(+)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 7f2f7d3cadb3..2ce18530639e 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,4 @@
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
 DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 
62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb
 SHA512 
fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc
+DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B 
ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d
 SHA512 
c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded

diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild 
b/sci-libs/opencascade/opencascade-7.6.3.ebuild
new file mode 100644
index ..192d6d2408c3
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.6.3.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_SLOT="$(ver_cut 1-2)"
+COMMIT="b079fb9877ef64d4a8158a60fa157f59b096debb"
+COMMIT_SHORT="${COMMIT:0:7}"
+
+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=${COMMIT};sf=tgz
 -> ${P}.tar.gz"
+S="${WORKDIR}/occt-${COMMIT_SHORT}"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc eigen examples ffmpeg freeimage gles2 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? ( =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
+
+   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} ||

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-07-27 Thread Conrad Kostecki

commit: 71aac51f1d7b6446066da410b997badcfff4c522
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Jul 26 05:55:36 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Jul 27 19:02:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71aac51f

sci-libs/opencascade: drop 7.6.1-r2

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26599
Signed-off-by: Conrad Kostecki  gentoo.org>

 sci-libs/opencascade/Manifest|   1 -
 sci-libs/opencascade/opencascade-7.6.1-r2.ebuild | 171 ---
 2 files changed, 172 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 01cf7e4ba735..7f2f7d3cadb3 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1,3 @@
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
-DIST opencascade-7.6.1.tar.gz 48201174 BLAKE2B 
7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61
 SHA512 
1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0
 DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 
62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb
 SHA512 
fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc

diff --git a/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
deleted file mode 100644
index e11b24187775..
--- a/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PV="$(ver_rs 1- '_')"
-MY_SLOT="$(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/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc eigen examples ffmpeg freeimage gles2 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? ( =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
-
-   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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-07-26 Thread Joonas Niilola

commit: aca8e7fa013fc4f9e0770a70a3918309cbd7ae00
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jul 26 14:16:16 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jul 26 14:22:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca8e7fa

sci-libs/opencascade: Stabilize 7.6.2-r1 amd64, #861119

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/opencascade-7.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
index 7773a90fb9f2..30553c491ea0 100644
--- a/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 IUSE="doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk"
 
 REQUIRED_USE="?? ( optimize tbb )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2022-06-25 Thread Sam James

commit: d7f8763ca52ef8a17cf9271997fc8e4a4c83e75d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 25 23:06:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 25 23:33:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f8763c

sci-libs/opencascade: allow newer TBB

Bug: https://bugs.gentoo.org/851783
Signed-off-by: Sam James  gentoo.org>

 .../files/opencascade-7.5.3-tbb-2021.patch | 51 ++
 ...7.5.3-r7.ebuild => opencascade-7.5.3-r8.ebuild} |  3 +-
 ...7.6.1-r1.ebuild => opencascade-7.6.1-r2.ebuild} |  3 +-
 ...de-7.6.2.ebuild => opencascade-7.6.2-r1.ebuild} |  3 +-
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch 
b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
new file mode 100644
index ..38770ac9a541
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
@@ -0,0 +1,51 @@
+https://github.com/Open-Cascade-SAS/OCCT/commit/740833a6a88e481f474783c426b6f6311ed586d3
+
+From 740833a6a88e481f474783c426b6f6311ed586d3 Mon Sep 17 00:00:00 2001
+From: kgv 
+Date: Mon, 29 Nov 2021 21:26:45 +0300
+Subject: [PATCH] 0032697: Configuration - fix compilation errors with oneTBB
+ 2021
+
+Removed usage of no more existing tbb::task_scheduler_init and 
tbb::captured_exception.
+--- a/src/OSD/OSD_Parallel_TBB.cxx
 b/src/OSD/OSD_Parallel_TBB.cxx
+@@ -25,7 +25,9 @@ Standard_DISABLE_DEPRECATION_WARNINGS
+ #include 
+ #include 
+ #include 
+-#include 
++#if TBB_VERSION_MAJOR < 2021
++  #include 
++#endif
+ Standard_ENABLE_DEPRECATION_WARNINGS
+ 
+ //===
+@@ -38,12 +40,16 @@ void OSD_Parallel::forEachExternal (UniversalIterator& 
theBegin,
+ const FunctorInterface& theFunctor,
+ Standard_Integer theNbItems)
+ {
++#if TBB_VERSION_MAJOR >= 2021
++  // task_scheduler_init is removed,
++  // exceptions are captured without proxy tbb::captured_exception object
++  (void )theNbItems;
++  tbb::parallel_for_each (theBegin, theEnd, theFunctor);
++#else
+   try
+   {
+ const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool();
+-const Standard_Integer aNbThreads = theNbItems > 0 ?
+-  aThreadPool->NbDefaultThreadsToLaunch() : -1;
+-
++const Standard_Integer aNbThreads = theNbItems > 0 ? 
aThreadPool->NbDefaultThreadsToLaunch() : -1;
+ tbb::task_scheduler_init aScheduler (aNbThreads);
+ tbb::parallel_for_each (theBegin, theEnd, theFunctor);
+   }
+@@ -51,6 +57,7 @@ void OSD_Parallel::forEachExternal (UniversalIterator& 
theBegin,
+   {
+ throw Standard_ProgramError (anException.what());
+   }
++#endif
+ }
+ 
+ #endif /* HAVE_TBB */
+

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
rename to sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
index 8287de53da6b..87b782fa5e6a 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
)
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
-   tbb? (

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-06-21 Thread Andrew Ammerlaan

commit: 2243b8cdfa6361a5831e69102a493419b40e1d71
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Jun 21 05:08:30 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Jun 21 10:12:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2243b8cd

sci-libs/opencascade: drop 7.6.0-r4

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26015
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/opencascade/Manifest|   1 -
 sci-libs/opencascade/opencascade-7.6.0-r4.ebuild | 170 ---
 2 files changed, 171 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index f769dfd54afc..01cf7e4ba735 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,5 +1,4 @@
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
-DIST opencascade-7.6.0.tar.gz 48193117 BLAKE2B 
c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd
 SHA512 
6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be
 DIST opencascade-7.6.1.tar.gz 48201174 BLAKE2B 
7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61
 SHA512 
1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0
 DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 
62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb
 SHA512 
fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc

diff --git a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
deleted file mode 100644
index 41e15cf2bd76..
--- a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PV="$(ver_rs 1- '_')"
-MY_SLOT="$(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/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc eigen examples ffmpeg freeimage gles2 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? ( =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
-
-   sed -e "s|lib/|$(get_libdir)/|" \
-   -e

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-06-14 Thread Joonas Niilola

commit: 04a868c8a47bb0862ea27da0a4b91ee7c36ed41e
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Jun  5 07:40:31 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun 14 16:01:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a868c8

sci-libs/opencascade: add 7.6.2

Closes: https://bugs.gentoo.org/848063
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/Manifest |   1 +
 sci-libs/opencascade/opencascade-7.6.2.ebuild | 169 ++
 2 files changed, 170 insertions(+)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 3fb132e2eb98..f769dfd54afc 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -2,3 +2,4 @@ DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
 DIST opencascade-7.6.0.tar.gz 48193117 BLAKE2B 
c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd
 SHA512 
6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be
 DIST opencascade-7.6.1.tar.gz 48201174 BLAKE2B 
7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61
 SHA512 
1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0
+DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 
62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb
 SHA512 
fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc

diff --git a/sci-libs/opencascade/opencascade-7.6.2.ebuild 
b/sci-libs/opencascade/opencascade-7.6.2.ebuild
new file mode 100644
index ..cd8196d34d06
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.6.2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="$(ver_rs 1- '_')"
+MY_SLOT="$(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/${MY_SLOT}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc eigen examples ffmpeg freeimage gles2 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? ( =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
+
+   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
+
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2022-06-14 Thread Joonas Niilola

commit: b62d48ddf7302a3db272a0ffc494fb0f8defe8f5
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Jun  5 09:05:43 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun 14 16:01:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62d48dd

sci-libs/opencascade: avoid pre-stripping binaries

Remove cmake settings for gcc and clang to not strip the binaries
during linking stage.

Closes: https://bugs.gentoo.org/831800
Bug: https://dev.opencascade.org/content/dont-pre-strip-binaries
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25764
Signed-off-by: Joonas Niilola  gentoo.org>

 ...ascade-7.6.2-avoid-pre-stripping-binaries.patch | 33 ++
 sci-libs/opencascade/opencascade-7.5.2-r6.ebuild   |  1 +
 sci-libs/opencascade/opencascade-7.5.3-r7.ebuild   |  1 +
 sci-libs/opencascade/opencascade-7.6.0-r4.ebuild   |  1 +
 sci-libs/opencascade/opencascade-7.6.1-r1.ebuild   |  1 +
 sci-libs/opencascade/opencascade-7.6.2.ebuild  |  1 +
 6 files changed, 38 insertions(+)

diff --git 
a/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
 
b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
new file mode 100644
index ..144047fba163
--- /dev/null
+++ 
b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/831800
+https://dev.opencascade.org/content/dont-pre-strip-binaries
+
+From 88e59e0199daaf66184833e366e9deb1299078a9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 5 Jun 2022 09:48:09 +0200
+Subject: [PATCH] avoid pre-stripping binaries
+
+Signed-off-by: Bernd Waibel 
+--- a/adm/cmake/occt_defs_flags.cmake
 b/adm/cmake/occt_defs_flags.cmake
+@@ -133,8 +133,6 @@ if ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
+ # does not support option "-std=c++0x"
+ set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+   endif()
+-  # Optimize size of binaries
+-  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
+ elseif(MINGW)
+   add_definitions(-D_WIN32_WINNT=0x0601)
+   # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
+@@ -150,9 +148,6 @@ elseif(MINGW)
+ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+   # Require C++11
+   set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+-  # Optimize size of binaries
+-  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)
+-- 
+2.35.1
+

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
index 4ba6a2ccee23..d4500132ab1f 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
"${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
 )
 
 src_prepare() {

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
index 7dc58dcd6393..8287de53da6b 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
"${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
 )
 
 src_prepare() {

diff --git a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
index cd8196d34d06..41e15cf2bd76 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
@@ -64,6 +64,7 @@ PATCHES=(

"${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.6.2-avoid-pre-stripping-binaries.patch
 )
 
 src_prepare() {

diff --git a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
index cd8196d34d06..41e15cf2bd76 100644
--- a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
@@ -64,6 +64,7 @@ PATCHES=(

"${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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-06-14 Thread Joonas Niilola

commit: b83c7f5ae1de392a1589aa8bee357bc850a004ab
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jun 14 16:00:59 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun 14 16:01:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b83c7f5a

sci-libs/opencascade: add a missing dep dev-libs/utfcpp to 7.6.2

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/opencascade-7.6.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/opencascade/opencascade-7.6.2.ebuild 
b/sci-libs/opencascade/opencascade-7.6.2.ebuild
index 1a0ee2adda8e..7914fe259a7e 100644
--- a/sci-libs/opencascade/opencascade-7.6.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.2.ebuild
@@ -54,6 +54,7 @@ DEPEND="
${RDEPEND}
eigen? ( dev-cpp/eigen )
json? ( dev-libs/rapidjson )
+   vtk? ( dev-libs/utfcpp )
 "
 BDEPEND="
doc? ( app-doc/doxygen[dot] )

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-06-03 Thread Joonas Niilola

commit: 5ba6842a473c75f691487e770716356cefbd5cd3
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun May 29 11:03:31 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun  3 11:01:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba6842a

sci-libs/opencascade: allow some exceptions

Disabling some of the exceptions (BUILD_RELEASE_DISABLE_EXCEPTIONS=ON),
which is the default, can lead to crashes of consumer applications. This
patch disables this option, so those exceptions are enabled.

Bug: https://github.com/FreeCAD/FreeCAD/issues/6200
Closes: https://bugs.gentoo.org/847916
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25673
Signed-off-by: Joonas Niilola  gentoo.org>

 .../{opencascade-7.5.2-r5.ebuild => opencascade-7.5.2-r6.ebuild} | 1 +
 .../{opencascade-7.5.3-r6.ebuild => opencascade-7.5.3-r7.ebuild} | 1 +
 .../{opencascade-7.6.0-r3.ebuild => opencascade-7.6.0-r4.ebuild} | 1 +
 .../{opencascade-7.6.1.ebuild => opencascade-7.6.1-r1.ebuild}| 1 +
 4 files changed, 4 insertions(+)

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
index 5b0cab240b53..4ba6a2ccee23 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -89,6 +89,7 @@ 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}"

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
rename to sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
index 192327a682a5..7dc58dcd6393 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
@@ -89,6 +89,7 @@ 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}"

diff --git a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild 
b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
rename to sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
index ab4bbc4c974b..cd8196d34d06 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
@@ -84,6 +84,7 @@ 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}"

diff --git a/sci-libs/opencascade/opencascade-7.6.1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.1.ebuild
rename to sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
index ab4bbc4c974b..cd8196d34d06 100644
--- a/sci-libs/opencascade/opencascade-7.6.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
@@ -84,6 +84,7 @@ 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}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-05-19 Thread Joonas Niilola

commit: 42bd7306aca7869ffc9c67499ac85c124407dae3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu May 19 12:10:52 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu May 19 12:10:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42bd7306

sci-libs/opencascade: Stabilize 7.5.3-r6 amd64, #829841

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/opencascade-7.5.3-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
index 19b5d7637932..192327a682a5 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk"
 
 REQUIRED_USE="?? ( optimize tbb )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-03-16 Thread Sam James

commit: 5a35a120eb244b1de1dab4d40bcc81596cd90ff8
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 16 22:53:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 16 22:53:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a35a120

sci-libs/opencascade: add link to ffmpeg bug

Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.5.2-r5.ebuild | 1 +
 sci-libs/opencascade/opencascade-7.5.3-r6.ebuild | 1 +
 sci-libs/opencascade/opencascade-7.6.0-r3.ebuild | 1 +
 sci-libs/opencascade/opencascade-7.6.1.ebuild| 1 +
 4 files changed, 4 insertions(+)

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
index 8bf1c6acd11e..5b0cab240b53 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 # 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:=

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
index 1bec9312ad8d..19b5d7637932 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 # 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:=

diff --git a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild 
b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
index e98c9c7e07dd..ab4bbc4c974b 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 # 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:=

diff --git a/sci-libs/opencascade/opencascade-7.6.1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.1.ebuild
index e98c9c7e07dd..ab4bbc4c974b 100644
--- a/sci-libs/opencascade/opencascade-7.6.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 # 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:=

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-03-16 Thread Sam James

commit: 088d1cd3dd668d0460b42632306fc612e13422e2
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Mar 13 09:47:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 16 22:51:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088d1cd3

sci-libs/opencascade: backport fixes from v7.6.1

Package is not yet compatible with ffmpeg-5, so we restrict to
https://bugs.gentoo.org/832742
Closes: https://bugs.gentoo.org/834422
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24525
Signed-off-by: Sam James  gentoo.org>

 .../{opencascade-7.6.0-r2.ebuild => opencascade-7.6.0-r3.ebuild}  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.0-r2.ebuild
rename to sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
index bc1c5b551fbb..fe70db843047 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 # properly set up.
 RESTRICT="test"
 
+# sys-libs/glibc see bug #832742
 RDEPEND="
!app-eselect/eselect-opencascade
dev-lang/tcl:=
@@ -34,6 +35,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/ftgl
+   sys-libs/glibc
virtual/glu
virtual/opengl
x11-libs/libXmu
@@ -44,7 +46,7 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
)
-   ffmpeg? ( media-video/ffmpeg:= )
+   ffmpeg? (

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-03-16 Thread Sam James

commit: 5e6ca21c0846fea81d72cb8267b2ef2f66a5a755
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Mar 13 09:42:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 16 22:50:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e6ca21c

sci-libs/opencascade: bump to 7.6.1

Package is not yet compatible with ffmpeg-5, so we restrict to
https://bugs.gentoo.org/835040
Bug: https://bugs.gentoo.org/832742
Bug: https://bugs.gentoo.org/834422
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/Manifest |   1 +
 sci-libs/opencascade/opencascade-7.6.1.ebuild | 169 ++
 2 files changed, 170 insertions(+)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index bd6eac9d5f78..3fb132e2eb98 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,4 @@
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
 DIST opencascade-7.6.0.tar.gz 48193117 BLAKE2B 
c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd
 SHA512 
6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be
+DIST opencascade-7.6.1.tar.gz 48201174 BLAKE2B 
7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61
 SHA512 
1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0

diff --git a/sci-libs/opencascade/opencascade-7.6.1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.1.ebuild
new file mode 100644
index ..fe70db843047
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.6.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="$(ver_rs 1- '_')"
+MY_SLOT="$(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/${MY_SLOT}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc eigen examples ffmpeg freeimage gles2 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"
+
+# sys-libs/glibc see bug #832742
+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
+   sys-libs/glibc
+   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? ( =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
+
+   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
+
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-03-16 Thread Sam James

commit: 3228209e96de27714701026db5c01ae1f9994be9
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 16 22:50:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 16 22:51:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3228209e

sci-libs/opencascade: drop glibc RDEPEND

Not needed, we're masking on musl profiles, and this isn't
a binary package. It could one day work on non-glibc and
an RDEPEND makes it trickier to test on musl.

Bug: https://bugs.gentoo.org/832742
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.6.0-r3.ebuild | 2 --
 sci-libs/opencascade/opencascade-7.6.1.ebuild| 2 --
 2 files changed, 4 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild 
b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
index fe70db843047..e98c9c7e07dd 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
@@ -24,7 +24,6 @@ REQUIRED_USE="?? ( optimize tbb )"
 # properly set up.
 RESTRICT="test"
 
-# sys-libs/glibc see bug #832742
 RDEPEND="
!app-eselect/eselect-opencascade
dev-lang/tcl:=
@@ -35,7 +34,6 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/ftgl
-   sys-libs/glibc
virtual/glu
virtual/opengl
x11-libs/libXmu

diff --git a/sci-libs/opencascade/opencascade-7.6.1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.1.ebuild
index fe70db843047..e98c9c7e07dd 100644
--- a/sci-libs/opencascade/opencascade-7.6.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1.ebuild
@@ -24,7 +24,6 @@ REQUIRED_USE="?? ( optimize tbb )"
 # properly set up.
 RESTRICT="test"
 
-# sys-libs/glibc see bug #832742
 RDEPEND="
!app-eselect/eselect-opencascade
dev-lang/tcl:=
@@ -35,7 +34,6 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/ftgl
-   sys-libs/glibc
virtual/glu
virtual/opengl
x11-libs/libXmu

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-01-15 Thread Sam James

commit: 4dd0f6791ebdc200a1e41ffd9b55435d8996b31f
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 16 01:31:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 01:31:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd0f679

sci-libs/opencascade: revbump for fixed USE_OPENGL option in 7.6.x

Closes: https://bugs.gentoo.org/831069
Signed-off-by: Sam James  gentoo.org>

 .../{opencascade-7.6.0-r1.ebuild => opencascade-7.6.0-r2.ebuild}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild
similarity index 100%
rename from sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
rename to sci-libs/opencascade/opencascade-7.6.0-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-01-15 Thread Sam James

commit: 78a3dae6d75a4f8846b1a157140cfaafa45eb370
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 16 00:24:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 00:24:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a3dae6

sci-libs/opencascade: rename from gles2->gles2-only for <7.6.0

Bug: https://github.com/gentoo/gentoo/pull/23814
Closes: https://bugs.gentoo.org/831280
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.5.2-r5.ebuild | 2 +-
 sci-libs/opencascade/opencascade-7.5.3-r6.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
index d8764d64ee6d..8bf1c6acd11e 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
@@ -106,7 +106,7 @@ src_configure() {
-DUSE_FFMPEG=$(usex ffmpeg)
-DUSE_FREEIMAGE=$(usex freeimage)
-DUSE_FREETYPE=ON
-   -DUSE_GLES2=$(usex gles2)
+   -DUSE_GLES2=$(usex gles2-only)
-DUSE_RAPIDJSON=$(usex json)
-DUSE_TBB=$(usex tbb)
-DUSE_VTK=$(usex vtk)

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
index f52f6f7b6bd1..1bec9312ad8d 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
@@ -106,7 +106,7 @@ src_configure() {
-DUSE_FFMPEG=$(usex ffmpeg)
-DUSE_FREEIMAGE=$(usex freeimage)
-DUSE_FREETYPE=ON
-   -DUSE_GLES2=$(usex gles2)
+   -DUSE_GLES2=$(usex gles2-only)
-DUSE_RAPIDJSON=$(usex json)
-DUSE_TBB=$(usex tbb)
-DUSE_VTK=$(usex vtk)

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-01-15 Thread Sam James

commit: 0ea126f6c797701fe675896e6a8bca989d9b82bb
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Jan 15 14:52:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 15 22:14:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea126f6

sci-libs/opencascade: fix installation paths for 7.5

Use the same path as for the 7.6 series /usr/$(get_libdir)/${PN}
instead of /usr/$(get_libdir)/${P}, so the changed environment
files works for all versions.

Bugs: https://bugs.gentoo.org/831054
Bugs: https://bugs.gentoo.org/831069
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 ...de-7.5.2-r4.ebuild => opencascade-7.5.2-r5.ebuild} | 19 ---
 ...de-7.5.3-r5.ebuild => opencascade-7.5.3-r6.ebuild} | 19 ---
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
similarity index 90%
rename from sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
index 98fad573f3a8..f4c5fd8ff1e3 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
@@ -88,15 +88,20 @@ src_configure() {
local mycmakeargs=(
-DBUILD_DOC_Overview=$(usex doc)
-DBUILD_Inspector=$(usex examples)
-   -DBUILD_WITH_DEBUG=$(usex debug)
-   -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
-   -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
+
+   -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_LIB="$(get_libdir)/${P}"
-   -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
-   -DINSTALL_DIR_WITH_VERSION=ON
+   -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)
@@ -160,7 +165,7 @@ src_install() {
 
# remove examples
if use !examples; then
-   rm -r "${ED}/usr/share/${P}/samples" || die
+   rm -r "${ED}/usr/share/${PN}/samples" || die
fi
 
docompress -x /usr/share/doc/${PF}/overview/html

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
similarity index 90%
rename from sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
rename to sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
index 55ca127b2053..57cdfcf646b6 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
@@ -88,15 +88,20 @@ src_configure() {
local mycmakeargs=(
-DBUILD_DOC_Overview=$(usex doc)
-DBUILD_Inspector=$(usex examples)
-   -DBUILD_WITH_DEBUG=$(usex debug)
-   -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
-   -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
+
+   -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_LIB="$(get_libdir)/${P}"
-   -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
-   -DINSTALL_DIR_WITH_VERSION=ON
+   -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)
@@ -160,7 +165,7 @@ src_install() {
 
# remove examples
if use !examples; then
-   rm -r "${ED}/usr/share/${P}/samples" || die
+   rm -r "${ED}/usr/share/${PN}/samples" || die
fi
 
docompress -x /usr/share/doc/${PF}/overview/html

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-01-15 Thread Sam James

commit: 2dcf0c603c3975d7f0c01435d64d2bdeddb6f8db
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Jan 15 20:52:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 15 22:14:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcf0c60

sci-libs/opencascade: rename gles2 USE flag to gles2-only

Bugs: https://bugs.gentoo.org/831069
Bugs: https://bugs.gentoo.org/831126
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/23814
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.5.2-r5.ebuild | 2 +-
 sci-libs/opencascade/opencascade-7.5.3-r6.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
index f4c5fd8ff1e3..d8764d64ee6d 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
@@ -16,7 +16,7 @@ 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 json optimize tbb vtk"
+IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk"
 
 REQUIRED_USE="?? ( optimize tbb )"
 

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
index 57cdfcf646b6..f52f6f7b6bd1 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
@@ -16,7 +16,7 @@ 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 json optimize tbb vtk"
+IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk"
 
 REQUIRED_USE="?? ( optimize tbb )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-01-15 Thread Sam James

commit: ec86df92464abd1cd60e9675e9f84f83a9e6e76b
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Jan 15 20:50:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 15 22:14:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec86df92

sci-libs/opencascade: don't pass USE_OPENGL option

The option defaults to on and was erroneously passed as with the
invert value of the gles2 USE flag, which lead to only libTKOpenGles
library being built, but no libTKOpenGL library, resulting in build
failures in revdeps.

Closes: https://bugs.gentoo.rog/831069
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.6.0-r1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
index 2c03ea0ead25..595c605bc985 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
@@ -105,7 +105,6 @@ src_configure() {
-DUSE_FREEIMAGE=$(usex freeimage)
-DUSE_FREETYPE=ON
-DUSE_GLES2=$(usex gles2)
-   -DUSE_OPENGL=$(usex !gles2)
# no package in tree
-DUSE_OPENVR=OFF
-DUSE_RAPIDJSON=$(usex json)

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-01-12 Thread Sam James

commit: 557e00d429f1249c6a15bc56181f369f087a8545
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 13 01:11:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 13 01:25:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557e00d4

sci-libs/opencascade: block eselect-opencascade

We're no longer pursuing slotted OCC. Please emerge --depclean it
if you have it installed (eselect-opencascade).

Deslotting of OCC was already completed.

Bug: https://bugs.gentoo.org/831069
Bug: https://bugs.gentoo.org/831054
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.5.2-r4.ebuild | 1 +
 sci-libs/opencascade/opencascade-7.5.3-r5.ebuild | 1 +
 sci-libs/opencascade/opencascade-7.6.0-r1.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
index 7f662a01ff3a..98fad573f3a8 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 RESTRICT="test"
 
 RDEPEND="
+   !app-eselect/eselect-opencascade
dev-lang/tcl:=
dev-lang/tk:=
dev-tcltk/itcl

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
index 6c9825a5afde..55ca127b2053 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 RESTRICT="test"
 
 RDEPEND="
+   !app-eselect/eselect-opencascade
dev-lang/tcl:=
dev-lang/tk:=
dev-tcltk/itcl

diff --git a/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
index 4791baa0fb60..2c03ea0ead25 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 RESTRICT="test"
 
 RDEPEND="
+   !app-eselect/eselect-opencascade
dev-lang/tcl:=
dev-lang/tk:=
dev-tcltk/itcl

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2022-01-12 Thread Sam James

commit: 4db0fd6113765ff6f6865e47bdbe8f4f2495e4f4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 13 01:07:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 13 01:25:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db0fd61

sci-libs/opencascade: fix installed environment file for non-slotted

We're no longer using slotted OCC but I don't think we fully
completed the version. I was initially going to wait but
upon reflection, I think this is the only way forward
that makes sense (updating the env.in to reflect
the earlier changes).

The old/outdated env file results in build failures
in e.g. kicad.

(Also, change ESYSROOT -> EPREFIX for the env file
as the env file is for the end result system.)

Bug: https://bugs.gentoo.org/831069
Bug: https://bugs.gentoo.org/831054
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/files/opencascade.env.in  | 32 +++---
 ...7.5.2-r3.ebuild => opencascade-7.5.2-r4.ebuild} |  5 ++--
 ...7.5.3-r4.ebuild => opencascade-7.5.3-r5.ebuild} |  5 ++--
 ...de-7.6.0.ebuild => opencascade-7.6.0-r1.ebuild} |  5 ++--
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/sci-libs/opencascade/files/opencascade.env.in 
b/sci-libs/opencascade/files/opencascade.env.in
index d7148c241f11..28006d724806 100644
--- a/sci-libs/opencascade/files/opencascade.env.in
+++ b/sci-libs/opencascade/files/opencascade.env.in
@@ -10,8 +10,8 @@
 
 # define the root directory of Open CASCADE Technology (needed)
 CASROOT="VAR_CASROOT"
-PATH="VAR_CASROOT/lib/opencascade-VAR_PV/bin"
-LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
+PATH="VAR_CASROOT/lib/opencascade/bin"
+LDPATH="VAR_CASROOT/lib/opencascade"
 
 #
 # The MMGT_* variables are used to determine how memory management will work
@@ -79,21 +79,21 @@ LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
 
 # The following CSF_* variables define various directories and files where
 # OCCT is looking for resources.
-CSF_GraphicShr="VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so"
-CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt"
-CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures"
-CSF_PluginDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_XCAFDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_XmlOcafResource="VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource"
+CSF_GraphicShr="VAR_CASROOT/lib/opencascade/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-VAR_PV/resources/XSTEPResource"
-CSF_ShadersDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Shaders"
-CSF_SHMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/SHMessage"
-CSF_STEPDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource"
-CSF_UnitsDefinition="VAR_CASROOT/share/opencascade-VAR_PV/resources/UnitsAPI/Units.dat"
-CSF_XSMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSMessage"
+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

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
similarity index 97%
rename from sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
index 080f7888f0bd..7f662a01ff3a 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -135,8 +135,7 @@

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2022-01-09 Thread Sam James

commit: 62acc9193ee2728e613bb511a483ee16c8947ec1
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Dec 13 05:01:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 10 01:02:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62acc919

sci-libs/opencascade: use single slot/subslot for 7.5.2

Instead of using different slots for different versions, the package now
uses a single slot with subslots. This is to simplify dependency handling
in revdeps.

Allow to build against sci-libs/vtk-9.1.0

Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 ...7.5.2-r2.ebuild => opencascade-7.5.2-r3.ebuild} | 34 ++
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
similarity index 87%
rename from sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
index cf90cc0c8aa1..080f7888f0bd 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/ta
 S="${WORKDIR}/occt-V${MY_PV}"
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV_MAJ}"
+SLOT="0/${PV_MAJ}"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug doc examples ffmpeg freeimage gles2 json optimize tbb vtk"
 
@@ -25,7 +25,6 @@ REQUIRED_USE="?? ( optimize tbb )"
 RESTRICT="test"
 
 RDEPEND="
-   app-eselect/eselect-opencascade
dev-lang/tcl:=
dev-lang/tk:=
dev-tcltk/itcl
@@ -49,13 +48,11 @@ RDEPEND="
tbb? ( =sci-libs/vtk-9.0.0"; 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
@@ -134,11 +137,11 @@ src_configure() {
sed -e "s|lib/|$(get_libdir)/|" \
-e "s|VAR_PV|${PV}|" \
-e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
-   < "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
+   < "${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}"/${PV_MAJ} || die
+   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
@@ -146,16 +149,14 @@ src_configure() {
if use optimize ; then
sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
-   -i "${T}"/${PV_MAJ} || die
+   -i "${T}"/99${PN} || die
fi
 }
 
 src_install() {
cmake_src_install
 
-   # respect slotting
-   insinto "/etc/env.d/${PN}"
-   doins "${T}/${PV_MAJ}"
+   doenvd "${T}/99${PN}"
 
# remove examples
if use !examples; then
@@ -164,8 +165,3 @@ src_install() {
 
docompress -x /usr/share/doc/${PF}/overview/html
 }
-
-pkg_postinst() {
-   eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated 
implementation"
-   einfo "You can switch between available ${PN} implementations using 
eselect ${PN}"
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/

2022-01-09 Thread Sam James

commit: 3adf9db9fe478c3b272c0284a81c10f00ca87df7
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Dec 13 07:36:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 10 01:02:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3adf9db9

sci-libs/opencascade: use single slot/subslot for 7.5.3

Instead of using different slots for different versions, the package now
uses a single slot with subslots. This is to simplyfy dependency handling
in revdeps.

Allow build against sci-libs/vtk-9.1.0

Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/files/opencascade-7.5.env.in  | 102 -
 ...7.5.3-r3.ebuild => opencascade-7.5.3-r4.ebuild} |  34 +++
 2 files changed, 15 insertions(+), 121 deletions(-)

diff --git a/sci-libs/opencascade/files/opencascade-7.5.env.in 
b/sci-libs/opencascade/files/opencascade-7.5.env.in
deleted file mode 100644
index d7148c241f11..
--- a/sci-libs/opencascade/files/opencascade-7.5.env.in
+++ /dev/null
@@ -1,102 +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="VAR_CASROOT/lib/opencascade-VAR_PV/bin"
-LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
-
-#
-# 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: 1)
-#   defines the size of memory chunks allocated for small blocks in pages
-#  (OS dependant)
-#MMGT_NBPAGES=1
-
-# MMGT_THRESHOLD (default: 4)
-#   defines the maximal size of blocks that are recycled internally instead
-#   of being returned to the heap.
-#MMGT_THRESHOLD=4
-
-# 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/opencascade-VAR_PV/libTKOpenGl.so"
-CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt"
-CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures"
-CSF_PluginDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/

2022-01-09 Thread Sam James

commit: 5ff97289ab2e63afcb5dfa0591312e0716ccada9
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Nov  5 18:31:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 10 01:02:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff97289

sci-libs/opencascade: bump to 7.6.0

- move to using single slot/subslot mechanism to simplify the use
of the library in revdeps

Bug: https://tracker.dev.opencascade.org/view.php?id=32650

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/Manifest |   1 +
 sci-libs/opencascade/files/opencascade.env.in | 102 
 sci-libs/opencascade/metadata.xml |   4 +
 sci-libs/opencascade/opencascade-7.6.0.ebuild | 168 ++
 4 files changed, 275 insertions(+)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index eddc8789850f..bd6eac9d5f78 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,2 +1,3 @@
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
+DIST opencascade-7.6.0.tar.gz 48193117 BLAKE2B 
c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd
 SHA512 
6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be

diff --git a/sci-libs/opencascade/files/opencascade.env.in 
b/sci-libs/opencascade/files/opencascade.env.in
new file mode 100644
index ..d7148c241f11
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade.env.in
@@ -0,0 +1,102 @@
+#
+# 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="VAR_CASROOT/lib/opencascade-VAR_PV/bin"
+LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
+
+#
+# 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: 1)
+#   defines the size of memory chunks allocated for small blocks in pages
+#  (OS dependant)
+#MMGT_NBPAGES=1
+
+# MMGT_THRESHOLD (default: 4)
+#   defines the maximal size of blocks that are recycled internally instead
+#   of being returned to the heap.
+#MMGT_THRESHOLD=4
+
+# 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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-11-06 Thread Sam James

commit: ae4b8cf469e002f7ec97970895dfaea33a084ee5
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Nov  5 16:32:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  6 06:03:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae4b8cf4

sci-libs/opencascade: drop 7.5.2-r1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.5.2-r1.ebuild | 171 ---
 1 file changed, 171 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild
deleted file mode 100644
index b05376833bc..000
--- a/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc examples ffmpeg freeimage gles2 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"
-
-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:=[rendering] )
-"
-DEPEND="
-   ${RDEPEND}
-   dev-cpp/eigen
-   dev-libs/rapidjson
-"
-BDEPEND="
-   app-eselect/eselect-opencascade
-   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
-)
-
-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_WITH_DEBUG=$(usex debug)
-   -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
-   -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
-   -DINSTALL_DIR_DOC="share/doc/${PF}"
-   -DINSTALL_DIR_LIB="$(get_libdir)/${P}"
-   -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
-   -DINSTALL_DIR_WITH_VERSION=ON
-   -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)
-   -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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-11-06 Thread Sam James

commit: 9f74703d8f9637f484ee9cdbe18d23efb5704a19
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Nov  5 16:31:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  6 06:03:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f74703d

sci-libs/opencascade: restrict dependency on dev-cpp/tbb

Version tbb-2021.4.0 has some header files removed, so we restrict to
earlier versions.

Bug: https://bugs.gentoo.org/821655
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.5.2-r2.ebuild | 171 +++
 1 file changed, 171 insertions(+)

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
new file mode 100644
index 000..cf90cc0c8aa
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="${PV_MAJ}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug doc examples ffmpeg freeimage gles2 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"
+
+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? ( =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_PV|${PV}|" \
+   -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+   < "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
+
+   # use TBB for memory allocation optimizations
+   if use tbb; then
+   sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/${PV_MAJ} || 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}"/${PV_MAJ} || die
+   fi
+}
+
+src_install() {
+   cmake_src_install
+
+   # respect slotting
+   insinto "/etc/env.d/${PN}"
+   doins "${T}/${PV_MAJ}"
+
+   # remove examples
+   if use !examples; then
+   rm -r "${ED}/usr/share/${P}/samples" || die
+   fi
+
+   docompress -x /usr/share/doc/${PF}/overview/html
+}
+
+pkg_postinst() {
+   eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated 
implementation"
+   einfo "You can switch between available ${PN} implementations using 
eselect ${PN}"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-11-06 Thread Sam James

commit: 91fcc8e56f971057697496a5b1db114442862558
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Nov  5 16:38:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  6 06:03:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91fcc8e5

sci-libs/opencascade: drop 7.5.3-r2

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22832
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.5.3-r2.ebuild | 171 ---
 1 file changed, 171 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild
deleted file mode 100644
index 14258f13db4..000
--- a/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 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="${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc examples ffmpeg freeimage gles2 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"
-
-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:=[rendering] )
-"
-DEPEND="
-   ${RDEPEND}
-   dev-cpp/eigen
-   dev-libs/rapidjson
-"
-BDEPEND="
-   app-eselect/eselect-opencascade
-   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
-)
-
-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_WITH_DEBUG=$(usex debug)
-   -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
-   -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
-   -DINSTALL_DIR_DOC="share/doc/${PF}"
-   -DINSTALL_DIR_LIB="$(get_libdir)/${P}"
-   -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
-   -DINSTALL_DIR_WITH_VERSION=ON
-   -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)
-   -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
-   )
-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-11-06 Thread Sam James

commit: 261afe53c2fb4e7d5fcdb1bb12395f04f1bf62dd
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Nov  5 16:37:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  6 06:03:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=261afe53

sci-libs/opencascade: restrict dependency on dev-cpp/tbb

Version tbb-2021.4.0 has some header files removed, so we need to
restrict to earlier versions.

Closes: https://bugs.gentoo.org/821655
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.5.3-r3.ebuild | 171 +++
 1 file changed, 171 insertions(+)

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r3.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r3.ebuild
new file mode 100644
index 000..0296150b6b0
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.5.3-r3.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 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="${PV_MAJ}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug doc examples ffmpeg freeimage gles2 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"
+
+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? ( =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_PV|${PV}|" \
+   -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+   < "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
+
+   # use TBB for memory allocation optimizations
+   if use tbb; then
+   sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/${PV_MAJ} || 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}"/${PV_MAJ} || die
+   fi
+}
+
+src_install() {
+   cmake_src_install
+
+   # respect slotting
+   insinto "/etc/env.d/${PN}"
+   doins "${T}/${PV_MAJ}"
+
+   # remove examples
+   if use !examples; then
+   rm -r "${ED}/usr/share/${P}/samples" || die
+   fi
+
+   docompress -x /usr/share/doc/${PF}/overview/html
+}
+
+pkg_postinst() {
+   eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated 
implementation"
+   einfo "You can switch between available ${PN} implementations using 
eselect ${PN}"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-11-04 Thread Ionen Wolkens

commit: a828b50d2918f4bd7d572ef8f0c133a08eeb5ec7
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Aug  9 19:41:16 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Nov  4 07:25:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a828b50d

sci-libs/opencascade: drop 7.5.1

cleanup

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21937
Signed-off-by: Ionen Wolkens  gentoo.org>

 sci-libs/opencascade/Manifest|   1 -
 sci-libs/opencascade/opencascade-7.5.1-r2.ebuild | 175 ---
 2 files changed, 176 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index aa5f02d0bfc..eddc8789850 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,2 @@
-DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B 
b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a
 SHA512 
ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a4621c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47

diff --git a/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild
deleted file mode 100644
index 375cc0a8d77..000
--- a/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild
+++ /dev/null
@@ -1,175 +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
-
-EAPI=7
-
-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="${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc examples ffmpeg freeimage gles2 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"
-
-RDEPEND="
-   app-eselect/eselect-opencascade
-   dev-cpp/eigen
-   dev-lang/tcl:0=
-   dev-lang/tk:0=
-   dev-libs/rapidjson
-   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 )
-   json? ( dev-libs/rapidjson )
-   tbb? ( dev-cpp/tbb:= )
-   vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   doc? ( app-doc/doxygen )
-   examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-0001-allow-default-search-path-for-Qt5.patch
-   "${FILESDIR}"/${P}-0002-remove-unnecessary-Qt5-check.patch
-   "${FILESDIR}"/${P}-0003-add-Gentoo-configuration-type.patch
-   "${FILESDIR}"/${P}-0004-fix-installation-of-cmake-config-files.patch
-   "${FILESDIR}"/${P}-0005-fix-write-permissions-on-scripts.patch
-   "${FILESDIR}"/${P}-0006-fix-creation-of-custom.sh-script.patch
-   "${FILESDIR}"/${P}-fix-AllValues-name-collision-with-vtk-9.0.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   if use debug; then
-   append-cppflags -DDEBUG
-   append-flags -g
-   fi
-
-   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.

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2021-10-30 Thread Sam James

commit: 82fb77334931d62d9811a1c361d2a3756dc10c86
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Oct 27 17:31:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 02:22:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82fb7733

sci-libs/opencascade: drop 7.4.0

Bugs: https://github.com/gentoo/sci/issues/1119

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22729
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 -
 ...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, 574 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index a6e46ffdc98..aa5f02d0bfc 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1,3 @@
-DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B 
c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f
 SHA512 
eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
 DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B 
b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a
 SHA512 
ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a4621c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47

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 0d4015cabd7..000
--- 
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 1ebc1106a31..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-10-29 Thread Sam James

commit: 4a2cadb3202d6edf64262944e60d3d7df74fe62a
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 29 22:20:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 29 22:22:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2cadb3

sci-libs/opencascade: add tbb subslot operator

Signed-off-by: Sam James  gentoo.org>

 .../{opencascade-7.4.0-r4.ebuild => opencascade-7.4.0-r5.ebuild}| 2 +-
 .../{opencascade-7.5.1-r1.ebuild => opencascade-7.5.1-r2.ebuild}| 2 +-
 .../{opencascade-7.5.2.ebuild => opencascade-7.5.2-r1.ebuild}   | 2 +-
 .../{opencascade-7.5.3.ebuild => opencascade-7.5.3-r2.ebuild}   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
rename to sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
index 7a53a10d350..b6dbf4121d0 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
@@ -50,7 +50,7 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
)
-   tbb? ( dev-cpp/tbb )
+   tbb? ( dev-cpp/tbb:= )
vtk? (
>=sci-libs/vtk-8.1.0[rendering]

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-10-23 Thread Sam James

commit: 5480f8d93ea900ea085b9de0be2f6b14f668eacf
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Oct 22 08:53:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 04:06:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5480f8d9

sci-libs/opencascade: bump to 7.5.3

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22669
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/Manifest |   1 +
 sci-libs/opencascade/opencascade-7.5.3.ebuild | 171 ++
 2 files changed, 172 insertions(+)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 29f10ccec88..a6e46ffdc98 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,4 @@
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B 
c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f
 SHA512 
eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
 DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B 
b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a
 SHA512 
ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a4621c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
+DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47

diff --git a/sci-libs/opencascade/opencascade-7.5.3.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3.ebuild
new file mode 100644
index 000..23b32a16122
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.5.3.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 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="${PV_MAJ}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug doc examples ffmpeg freeimage gles2 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"
+
+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:=[rendering] )
+"
+DEPEND="
+   ${RDEPEND}
+   dev-cpp/eigen
+   dev-libs/rapidjson
+"
+BDEPEND="
+   app-eselect/eselect-opencascade
+   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
+)
+
+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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/

2021-07-07 Thread Ionen Wolkens

commit: 17c99e0bcaa5ed97c1e737d0c1bae60c1d35a69c
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Jun  6 19:01:10 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jul  7 20:04:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c99e0b

sci-libs/opencascade: bump to 7.5.2

Quote paths in template env file

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21149
Signed-off-by: Ionen Wolkens  gentoo.org>

 sci-libs/opencascade/Manifest |   1 +
 sci-libs/opencascade/files/opencascade-7.5.env.in |  40 ++---
 sci-libs/opencascade/opencascade-7.5.2.ebuild | 171 ++
 3 files changed, 192 insertions(+), 20 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 77c4e42f391..29f10ccec88 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,2 +1,3 @@
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B 
c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f
 SHA512 
eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
 DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B 
b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a
 SHA512 
ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a4621c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
+DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676

diff --git a/sci-libs/opencascade/files/opencascade-7.5.env.in 
b/sci-libs/opencascade/files/opencascade-7.5.env.in
index 50766cbb6bb..d7148c241f1 100644
--- a/sci-libs/opencascade/files/opencascade-7.5.env.in
+++ b/sci-libs/opencascade/files/opencascade-7.5.env.in
@@ -9,9 +9,9 @@
 # were enabled. Those values are marked as such.
 
 # define the root directory of Open CASCADE Technology (needed)
-CASROOT=VAR_CASROOT
-PATH=VAR_CASROOT/lib/opencascade-VAR_PV/bin
-LDPATH=VAR_CASROOT/lib/opencascade-VAR_PV
+CASROOT="VAR_CASROOT"
+PATH="VAR_CASROOT/lib/opencascade-VAR_PV/bin"
+LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
 
 #
 # The MMGT_* variables are used to determine how memory management will work
@@ -70,7 +70,7 @@ LDPATH=VAR_CASROOT/lib/opencascade-VAR_PV
 #
 # 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_DEBUG_BOP="/var/tmp"
 
 # CSF_EXCEPTION_PROMPT (default: 1) optional
 #   not documented upstream (maybe a flag indicating whether the user shall
@@ -79,24 +79,24 @@ LDPATH=VAR_CASROOT/lib/opencascade-VAR_PV
 
 # The following CSF_* variables define various directories and files where
 # OCCT is looking for resources.
-CSF_GraphicShr=VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so
-CSF_MIGRATION_TYPES=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt
-CSF_MDTVTexturesDirectory=VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures
-CSF_PluginDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
-CSF_StandardDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
-CSF_StandardLiteDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
-CSF_XCAFDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
-CSF_XmlOcafResource=VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource
+CSF_GraphicShr="VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so"
+CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt"
+CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures"
+CSF_PluginDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
+CSF_StandardDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
+CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
+CSF_XCAFDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
+CSF_XmlOcafResource="VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource"
 # The below values might be optional.
-CSF_IGESDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource
-CSF_ShadersDirectory=VAR_CASROOT/share/opencascade-VAR_PV/resources/Shaders
-CSF_SHMessage=VAR_CASROOT/share/opencascade-VAR_PV/resources/SHMessage
-CSF_STEPDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/

2021-06-24 Thread Alexey Shvetsov

commit: 0f7a957b96c79b35bd8cbb7c712bb7358188853e
Author: Roman Beranek  prusa3d  com>
AuthorDate: Thu Jun  3 14:09:09 2021 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Thu Jun 24 10:06:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7a957b

sci-libs/opencascade[vtk]: prevent name collision

VTK-9.0 declares in their headers 'struct AllValues' which collides with
a macro defined by GLX.

This has been only partially fixed in the upstream:
https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commit;h=2c276f91da0

It was necessary to put `#undef`s in a few other places.

Closes: https://bugs.gentoo.org/794031
Signed-off-by: Roman Beranek  prusa3d.com>
Closes: https://github.com/gentoo/gentoo/pull/21105
Signed-off-by: Alexey Shvetsov  gentoo.org>

 ...fix-AllValues-name-collision-with-vtk-9.0.patch | 172 +
 sci-libs/opencascade/opencascade-7.5.1-r1.ebuild   |   1 +
 2 files changed, 173 insertions(+)

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
new file mode 100644
index 000..e2725ebb2c6
--- /dev/null
+++ 
b/sci-libs/opencascade/files/opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
@@ -0,0 +1,172 @@
+From f624c55d7b75ccbe3fdfef0db141fdbe1f6b383a Mon Sep 17 00:00:00 2001
+From: anv 
+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 
+ #else
+ #include 
++
++// Preventing naming collisions between
++// GLX and VTK versions 9.0 and above
++#ifdef AllValues
++#undef AllValues
++#endif
++
+ #include 
+ #include 
+ #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,

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-06-04 Thread Joonas Niilola

commit: 4ad62687497908e2f353cf68756253d0a860e68b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Jun  4 07:38:04 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun  4 07:38:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad62687

sci-libs/opencascade: add missing die to 7.5.1-r1

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/opencascade-7.5.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
index 88f0fd45888..ffa4d80678e 100644
--- a/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
@@ -86,7 +86,7 @@ src_prepare() {
# 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"
+   -i "adm/cmake/occt_toolkit.cmake" || die
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-06-04 Thread Joonas Niilola

commit: 947d701c21889771f1f6839f2b46d96789fcee59
Author: Wolfgang E. Sanyer  gmail  com>
AuthorDate: Mon May 17 19:36:44 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun  4 07:38:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947d701c

sci-libs/opencascade: patch cmake config so that find_package works

Signed-off-by: Wolfgang E. Sanyer  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20856
Signed-off-by: Joonas Niilola  gentoo.org>

 .../{opencascade-7.5.1.ebuild => opencascade-7.5.1-r1.ebuild}  | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/sci-libs/opencascade/opencascade-7.5.1.ebuild 
b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
similarity index 92%
rename from sci-libs/opencascade/opencascade-7.5.1.ebuild
rename to sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
index 474b381f556..88f0fd45888 100644
--- a/sci-libs/opencascade/opencascade-7.5.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
@@ -80,6 +80,13 @@ src_prepare() {
 
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"
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2021-05-04 Thread Sam James

commit: 2ff6f73b2c6c62702952b3e712f878c32a1597da
Author: Bernd Waibel  gmail  com>
AuthorDate: Sat Feb  6 09:31:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 22:02:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff6f73b

sci-libs/opencascade: bump to 7.5.1

Closes: https://bugs.gentoo.org/762775
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20443
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 +
 .../opencascade/files/opencascade-7.4.0.env.in |   6 +-
 1-0001-allow-default-search-path-for-Qt5.patch |  26 
 ...e-7.5.1-0002-remove-unnecessary-Qt5-check.patch |  28 
 ...-7.5.1-0003-add-Gentoo-configuration-type.patch |  26 
 ...04-fix-installation-of-cmake-config-files.patch |  40 +
 ...5.1-0005-fix-write-permissions-on-scripts.patch |  43 ++
 ...5.1-0006-fix-creation-of-custom.sh-script.patch |  34 +
 ...cascade-7.4.0.env.in => opencascade-7.5.env.in} |  35 +++--
 sci-libs/opencascade/metadata.xml  |  10 +-
 sci-libs/opencascade/opencascade-7.5.1.ebuild  | 167 +
 11 files changed, 392 insertions(+), 24 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 3c6a4c44796..77c4e42f391 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1 +1,2 @@
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B 
c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f
 SHA512 
eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
+DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B 
b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a
 SHA512 
ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a4621c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f

diff --git a/sci-libs/opencascade/files/opencascade-7.4.0.env.in 
b/sci-libs/opencascade/files/opencascade-7.4.0.env.in
index 2eefe188c1a..cf7cc6a724d 100644
--- a/sci-libs/opencascade/files/opencascade-7.4.0.env.in
+++ b/sci-libs/opencascade/files/opencascade-7.4.0.env.in
@@ -76,7 +76,7 @@ LDPATH=VAR_CASROOT/lib
 # 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
+#CSF_EXCEPTION_PROMPT=1
 
 # The following CSF_* variables define various directories and files where
 # OCCT is looking for resources.
@@ -93,8 +93,8 @@ 
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=/usr/lib64/opencascade-7.3.0/ros/share/opencascade/resources/UnitsAPI/Units.dat
-CSF_XSMessage=/usr/lib64/opencascade-7.3.0/ros/share/opencascade/resources/XSMessage
+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

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
new file mode 100644
index 000..68be3e1c880
--- /dev/null
+++ 
b/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
@@ -0,0 +1,26 @@
+From c7d8a7374284186136d72fc285f9e55045b306fb Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Wed, 3 Feb 2021 23:31:23 +0100
+Subject: [PATCH] allow default search path for Qt5
+
+Signed-off-by: Bernd Waibel 
+---
+ 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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-05-04 Thread Sam James

commit: da53808432edde9896401246635ea5e3c153c4fb
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Apr 19 05:52:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 22:01:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da538084

sci-libs/opencascade: fix Qt dependency

Changes a dependency on dev-qt/linguist-tool

Closes: https://bugs.gentoo.org/783810
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20449
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.4.0-r4.ebuild | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index 2c5adfb7524..7a53a10d350 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -9,19 +9,21 @@ 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;
-MY_PV="$(ver_rs 1- '_')"
 
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"
-# gl2ps
-IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 
tbb +vtk"
+IUSE="debug doc +examples ffmpeg freeimage gles2 inspector java optimize qt5 
tbb +vtk"
 
 REQUIRED_USE="
inspector? ( qt5 )
+   qt5? ( examples )
?? ( optimize tbb )
 "
 
@@ -56,10 +58,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-   doc? (
-   app-doc/doxygen
-   qt5? ( dev-qt/linguist-tools:5 )
-   )
+   doc? ( app-doc/doxygen )
+   qt5? ( dev-qt/linguist-tools:5 )
 "
 
 # There's no easy way to test. Testing needs a rather big environment
@@ -71,8 +71,6 @@ CHECKREQS_DISK_BUILD="3584M"
 
 CMAKE_BUILD_TYPE=Release
 
-S="${WORKDIR}/occt-V${MY_PV}"
-
 PATCHES=(
"${FILESDIR}/${P}-find-qt.patch"
"${FILESDIR}/${P}-fix-install.patch"
@@ -116,7 +114,7 @@ src_configure() {
cmake_src_configure
 
# prepare /etc/env.d file
-   sed -e 's|VAR_CASROOT|'${EROOT%}'/usr/'$(get_libdir)'/'${P}'/ros|g' < 
"${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
+   sed -e 's|VAR_CASROOT|'${ESYSROOT}'/usr/'$(get_libdir)'/'${P}'/ros|g' < 
"${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
sed -i -e 's|ros/lib|ros/'$(get_libdir)'|' "${T}/${PV}" || die
 
# use TBB for memory allocation optimizations?

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-03-01 Thread Joonas Niilola

commit: b287fc1826ac151436a72ee0e385c386ea069b00
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Feb 24 21:10:40 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Mar  1 08:25:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b287fc18

sci-libs/opencascade: restrict vtk version

Restrict vtk to versions prio v9. This version of
opencascade does not build against >=vtk-9.

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19637
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/opencascade-7.4.0-r4.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index 4b7371a287c..2c5adfb7524 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -49,7 +49,10 @@ RDEPEND="
dev-qt/qtxml:5
)
tbb? ( dev-cpp/tbb )
-   vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
+   vtk? (
+   >=sci-libs/vtk-8.1.0[rendering]
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2021-03-01 Thread Joonas Niilola

commit: a05456f36a8e1c4c3c37695f3e9a621fccb4e801
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Feb 24 21:07:32 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Mar  1 08:25:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05456f3

sci-libs/opencascade: fix flow control

dev-util/cmake >= 3.20.0_rc1 has restricted flow control
checks. This patch fixes an issue with these new version
on unbalanced flow control statements.

Closes: https://bugs.gentoo.org/771300
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 ...pencascade-7.4.0-fix-flow-control-nesting.patch | 31 ++
 sci-libs/opencascade/opencascade-7.4.0-r4.ebuild   |  1 +
 2 files changed, 32 insertions(+)

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
new file mode 100644
index 000..7e2bb1d7b2a
--- /dev/null
+++ 
b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
@@ -0,0 +1,31 @@
+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/opencascade-7.4.0-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index d46a66fe600..4b7371a287c 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -75,6 +75,7 @@ PATCHES=(
"${FILESDIR}/${P}-fix-install.patch"
"${FILESDIR}/${P}-fix-issue-with-cmake-path-variables.patch"
"${FILESDIR}/${P}-Gentoo-specific-avoid-pre-stripping-files.patch"
+   "${FILESDIR}/${P}-fix-flow-control-nesting.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-02-22 Thread Sam James

commit: f71ec0e5159508aaf91e6ac72841e1e4d9f8f5c6
Author: Roy Bamford  gentoo  org>
AuthorDate: Thu Feb 18 19:44:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 22 18:57:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f71ec0e5

sci-libs/opencascade: added ~arm64

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Roy Bamford  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/opencascade-7.4.0-r4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index 669ac8caecb..d46a66fe600 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -16,7 +16,8 @@ 
SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/ta
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
+# gl2ps
 IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 
tbb +vtk"
 
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/

2021-02-18 Thread Joonas Niilola

commit: 1c351b875bed560e5954ddf4db1ae25c3141f13b
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Feb  9 22:40:18 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 18 09:36:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c351b87

sci-libs/opencascade: fix pre-stripping files

Closes: https://bugs.gentoo.org/769410
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 ...Gentoo-specific-avoid-pre-stripping-files.patch | 30 ++
 sci-libs/opencascade/opencascade-7.4.0-r4.ebuild   |  8 ++
 2 files changed, 32 insertions(+), 6 deletions(-)

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
new file mode 100644
index 000..0d4015cabd7
--- /dev/null
+++ 
b/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
@@ -0,0 +1,30 @@
+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/opencascade-7.4.0-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index a6b119a193b..669ac8caecb 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -17,7 +17,6 @@ 
SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/ta
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
-# gl2ps
 IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 
tbb +vtk"
 
 REQUIRED_USE="
@@ -25,7 +24,6 @@ REQUIRED_USE="
?? ( optimize tbb )
 "
 
-#  gl2ps? ( x11-libs/gl2ps )
 RDEPEND="
app-eselect/eselect-opencascade
dev-cpp/eigen
@@ -75,6 +73,7 @@ PATCHES=(
"${FILESDIR}/${P}-find-qt.patch"
"${FILESDIR}/${P}-fix-install.patch"
"${FILESDIR}/${P}-fix-issue-with-cmake-path-variables.patch"
+   "${FILESDIR}/${P}-Gentoo-specific-avoid-pre-stripping-files.patch"
 )
 
 pkg_setup() {
@@ -85,8 +84,6 @@ pkg_setup() {
 src_prepare() {
cmake_src_prepare
use java && java-pkg-opt-2_src_prepare
-#  sed -e 's/\/lib\$/\/'$(get_libdir)'\$/' \
-#  -i adm/templates/OpenCASCADEConfig.cmake.in || die
 }
 
 src_configure() {
@@ -98,18 +95,17 @@ src_configure() {
-DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}/ros"
-DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
-DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
-#  -DINSTALL_DOC_Overview=$(usex doc)
-DINSTALL_SAMPLES=$(usex examples)
-DINSTALL_TEST_CASES=NO
-DUSE_D3D=no
-DUSE_FFMPEG=$(usex ffmpeg)
-DUSE_FREEIMAGE=$(usex freeimage)
-#  -DUSE_GL2PS=$(usex gl2ps)
-DUSE_GLES2=$(usex gles2)
-DUSE_TBB=$(usex tbb)
-DUSE_VTK=$(usex vtk)
)
 
+   use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
use examples && mycmakeargs+=( -DBUILD_SAMPLES_QT=$(usex qt5) )
 
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/

2021-02-18 Thread Joonas Niilola

commit: 3a529685c95f6c74ed4b46d4c7501373b0a55769
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Feb  9 21:20:39 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 18 09:36:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a529685

sci-libs/opencascade: fix paths in cmake config

Thanks to Fabio Rossi for reporting the issue.
See also upstream bug at
https://tracker.dev.opencascade.org/view.php?id=32035

Closes: https://bugs.gentoo.org/763162
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 ...7.4.0-fix-issue-with-cmake-path-variables.patch |  41 ++
 sci-libs/opencascade/opencascade-7.4.0-r4.ebuild   | 148 +
 2 files changed, 189 insertions(+)

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
new file mode 100644
index 000..aacb642019f
--- /dev/null
+++ 
b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch
@@ -0,0 +1,41 @@
+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/opencascade-7.4.0-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
new file mode 100644
index 000..a6b119a193b
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -0,0 +1,148 @@
+# 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
+
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and 
data exchange"
+HOMEPAGE="https://www.opencascade.com;
+MY_PV="$(ver_rs 1- '_')"
+SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz
 -> ${P}.tar.gz"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+# gl2ps
+IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 
tbb +vtk"
+
+REQUIRED_USE="
+   inspector? ( qt5 )
+   ?? ( optimize tbb )
+"
+
+#  gl2ps? ( x11-libs/gl2ps )
+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 )
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-02-18 Thread Joonas Niilola

commit: 3641a1664c3b19eda94f05a04fe4652dd544abd2
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Feb  9 22:42:34 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 18 09:36:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3641a166

sci-libs/opencascade: drop old 7.4.0-r3

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19394
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/opencascade-7.4.0-r3.ebuild | 147 ---
 1 file changed, 147 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
deleted file mode 100644
index a6957289df1..000
--- a/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 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
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and 
data exchange"
-HOMEPAGE="https://www.opencascade.com;
-MY_PV="$(ver_rs 1- '_')"
-SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz
 -> ${P}.tar.gz"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-# gl2ps
-IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 
tbb +vtk"
-
-REQUIRED_USE="
-   inspector? ( qt5 )
-   ?? ( optimize tbb )
-"
-
-#  gl2ps? ( x11-libs/gl2ps )
-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] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   doc? (
-   app-doc/doxygen
-   qt5? ( dev-qt/linguist-tools:5 )
-   )
-"
-
-# There's no easy way to test. Testing needs a rather big environment
-# properly set up.
-RESTRICT="test"
-
-CHECKREQS_MEMORY="256M"
-CHECKREQS_DISK_BUILD="3584M"
-
-CMAKE_BUILD_TYPE=Release
-
-S="${WORKDIR}/occt-V${MY_PV}"
-
-PATCHES=(
-   "${FILESDIR}/${P}-find-qt.patch"
-   "${FILESDIR}/${P}-fix-install.patch"
-)
-
-pkg_setup() {
-   check-reqs_pkg_setup
-   use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-   use java && java-pkg-opt-2_src_prepare
-   sed -e 's/\/lib\$/\/'$(get_libdir)'\$/' \
-   -i adm/templates/OpenCASCADEConfig.cmake.in || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_DOC_Overview=$(usex doc)
-   -DBUILD_Inspector=$(usex inspector)
-   -DBUILD_WITH_DEBUG=$(usex debug)
-   -DCMAKE_CONFIGURATION_TYPES="Gentoo"
-   -DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}/ros"
-   -DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
-   -DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
-#  -DINSTALL_DOC_Overview=$(usex doc)
-   -DINSTALL_SAMPLES=$(usex examples)
-   -DINSTALL_TEST_CASES=NO
-   -DUSE_D3D=no
-   -DUSE_FFMPEG=$(usex ffmpeg)
-   -DUSE_FREEIMAGE=$(usex freeimage)
-#  -DUSE_GL2PS=$(usex gl2ps)
-   -DUSE_GLES2=$(usex gles2)
-   -DUSE_TBB=$(usex tbb)
-   -DUSE_VTK=$(usex vtk)
-   )
-
-   use examples && mycmakeargs+=( -DBUILD_SAMPLES_QT=$(usex qt5) )
-
-   cmake_src_configure
-
-   # prepare /etc/env.d file
-   sed -e 's|VAR_CASROOT|'${EROOT%}'/usr/'$(get_libdir)'/'${P}'/ros|g' < 
"${FILESDIR}/${P}.env.in" >> "${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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2021-02-07 Thread Conrad Kostecki

commit: 066585e37ce67fe47f8045e0d2c2534736235956
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Feb  7 16:20:07 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Feb  7 17:07:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=066585e3

sci-libs/opencascade: fix metadata email

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Conrad Kostecki  gentoo.org>

 sci-libs/opencascade/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/metadata.xml 
b/sci-libs/opencascade/metadata.xml
index 471a91a9796..2402194e836 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -2,7 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 
 
-   wae...@gmail.com
+   waebbl-gen...@posteo.net
Bernd Waibel

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2020-10-26 Thread Joonas Niilola

commit: ba489315ed494b0038ea44fbf2ccff8c420a1a58
Author: Bernd Waibel  gmail  com>
AuthorDate: Sat Oct 17 14:50:51 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Oct 26 10:14:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba489315

sci-libs/opencascade: fix check in cmake config

Fix a check for library path in the OpenCASCADEConfig.cmake
file.

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17956
Signed-off-by: Joonas Niilola  gentoo.org>

 .../{opencascade-7.4.0-r2.ebuild => opencascade-7.4.0-r3.ebuild}| 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
similarity index 97%
rename from sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
rename to sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
index 5abfadcc3ce..a6957289df1 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
@@ -84,6 +84,8 @@ pkg_setup() {
 src_prepare() {
cmake_src_prepare
use java && java-pkg-opt-2_src_prepare
+   sed -e 's/\/lib\$/\/'$(get_libdir)'\$/' \
+   -i adm/templates/OpenCASCADEConfig.cmake.in || die
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2020-04-27 Thread Matthias Maier

commit: 0c80e6025a81328f5d4efaf95bcc1b805c9dad51
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Apr 27 14:40:01 2020 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Apr 27 14:42:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c80e602

sci-libs/opencascade: Use $P instead of $PF for install directory

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier  gentoo.org>

 .../{opencascade-7.4.0-r1.ebuild => opencascade-7.4.0-r2.ebuild}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-7.4.0-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
rename to sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
index ac229f1e071..5abfadcc3ce 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
@@ -92,7 +92,7 @@ src_configure() {
-DBUILD_Inspector=$(usex inspector)
-DBUILD_WITH_DEBUG=$(usex debug)
-DCMAKE_CONFIGURATION_TYPES="Gentoo"
-   -DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${PF}/ros"
+   -DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}/ros"
-DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
-DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
 #  -DINSTALL_DOC_Overview=$(usex doc)

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2020-04-26 Thread David Seifert

commit: 4f22d9f19fab425d3f4746197b3b9a6d18da138b
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 26 10:59:12 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 26 10:59:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f22d9f1

sci-libs/opencascade: Replace virtual/ffmpeg

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 .../{opencascade-7.4.0.ebuild => opencascade-7.4.0-r1.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-7.4.0.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.4.0.ebuild
rename to sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
index 871c8a8e49c..ac229f1e071 100644
--- a/sci-libs/opencascade/opencascade-7.4.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
virtual/glu
virtual/opengl
x11-libs/libXmu
-   ffmpeg? ( virtual/ffmpeg )
+   ffmpeg? ( media-video/ffmpeg )
freeimage? ( media-libs/freeimage )
java? ( virtual/jdk:1.8 )
qt5? (

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2020-04-01 Thread Joonas Niilola

commit: c2f3367d854b4fb511750932e9f3424d68da7202
Author: Bernd Waibel  gmail  com>
AuthorDate: Fri Mar 27 16:21:41 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr  1 14:37:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f3367d

sci-libs/opencascade: drop old

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15140
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 -
 .../files/opencascade-7.3.0-ffmpeg4.patch  |  38 --
 .../files/opencascade-7.3.0-fixed-DESTDIR.patch|  31 -
 .../files/opencascade-7.3.0-vtk-compat.patch   |  13 --
 sci-libs/opencascade/metadata.xml  |   3 -
 sci-libs/opencascade/opencascade-7.3.0.ebuild  | 141 -
 6 files changed, 227 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index d999b843d5d..3c6a4c44796 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,2 +1 @@
-DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B 
bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6
 SHA512 
17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B 
c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f
 SHA512 
eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a

diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch 
b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
deleted file mode 100644
index fc572a4f5bc..000
--- a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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.cxx2017-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 (, 0, sizeof(aPacket));
-   av_init_packet ();
-+#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, );
-   }
-   else
-+#endif
-   {
- // encode the image
- myFrame->pts = myFrameCount;

diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch 
b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
deleted file mode 100644
index c0a6363e19f..000
--- a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 a/CMakeLists.txt   2016-11-25 11:50:18.0 +0100
-+++ b/CMakeLists.txt   2017-03-18 08:44:10.406668714 +0100
-@@ -885,7 +885,7 @@ 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 
\"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/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}")
- endif()
-@@ -906,7 +906,7 @@
- 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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2020-04-01 Thread Joonas Niilola

commit: 15ab981cf372fab8ced5299f7ee1d06a23c4f027
Author: Bernd Waibel  gmail  com>
AuthorDate: Fri Mar 27 16:18:59 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr  1 14:37:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ab981c

sci-libs/opencascade: fix unused cmake variable

Closes: https://bugs.gentoo.org/710694
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernd Waibel  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/opencascade-7.4.0.ebuild | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.4.0.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0.ebuild
index 372cacad7c8..871c8a8e49c 100644
--- a/sci-libs/opencascade/opencascade-7.4.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0.ebuild
@@ -53,7 +53,12 @@ RDEPEND="
vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="
+   doc? (
+   app-doc/doxygen
+   qt5? ( dev-qt/linguist-tools:5 )
+   )
+"
 
 # There's no easy way to test. Testing needs a rather big environment
 # properly set up.
@@ -90,7 +95,7 @@ src_configure() {
-DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${PF}/ros"
-DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
-DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
-   -DINSTALL_DOC_Overview=$(usex doc)
+#  -DINSTALL_DOC_Overview=$(usex doc)
-DINSTALL_SAMPLES=$(usex examples)
-DINSTALL_TEST_CASES=NO
-DUSE_D3D=no

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2020-01-03 Thread Andreas Sturmlechner

commit: 4bfb6fed9ab59bbdeb4451dfabaf8a066d0c4dca
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan  3 19:00:07 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan  3 19:00:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bfb6fed

sci-libs/opencascade: Switch to cmake.eclass

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/opencascade/opencascade-7.4.0.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.4.0.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0.ebuild
index 5c0a6496857..372cacad7c8 100644
--- a/sci-libs/opencascade/opencascade-7.4.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO:
@@ -7,7 +7,7 @@
 
 EAPI=7
 
-inherit check-reqs cmake-utils flag-o-matic java-pkg-opt-2 multilib
+inherit check-reqs cmake flag-o-matic java-pkg-opt-2
 
 DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and 
data exchange"
 HOMEPAGE="https://www.opencascade.com;
@@ -77,7 +77,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
use java && java-pkg-opt-2_src_prepare
 }
 
@@ -104,7 +104,7 @@ src_configure() {
 
use examples && mycmakeargs+=( -DBUILD_SAMPLES_QT=$(usex qt5) )
 
-   cmake-utils_src_configure
+   cmake_src_configure
 
# prepare /etc/env.d file
sed -e 's|VAR_CASROOT|'${EROOT%}'/usr/'$(get_libdir)'/'${P}'/ros|g' < 
"${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
@@ -122,7 +122,7 @@ src_configure() {
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
# respect slotting
insinto "/etc/env.d/${PN}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2019-11-16 Thread Joonas Niilola

commit: 4909a322be06b7abd27e2954ea5f89e5c3ffc46b
Author: Bernd Waibel  gmail  com>
AuthorDate: Sat Oct 19 09:17:54 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Nov 17 07:45:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4909a322

sci-libs/opencascade: bump to version 7.4.0

Closes: https://bugs.gentoo.org/696596
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13596
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 +
 .../files/opencascade-7.4.0-find-qt.patch  |  85 +
 .../files/opencascade-7.4.0-fix-install.patch  | 133 
 .../opencascade/files/opencascade-7.4.0.env.in | 103 +++
 sci-libs/opencascade/metadata.xml  |  27 +++-
 sci-libs/opencascade/opencascade-7.4.0.ebuild  | 140 +
 6 files changed, 484 insertions(+), 5 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 52dffdbc97c..d999b843d5d 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1 +1,2 @@
 DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B 
bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6
 SHA512 
17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
+DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B 
c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f
 SHA512 
eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a

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
new file mode 100644
index 000..1ebc1106a31
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch
@@ -0,0 +1,85 @@
+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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2019-04-21 Thread Andreas Sturmlechner

commit: 5a0a541e5695ded2639283d2fde7ba1ece03014b
Author: Bernd Waibel  gmail  com>
AuthorDate: Sun Apr 21 10:25:47 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 21 18:21:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a0a541e

sci-libs/opencascade: fix flag description

USE flag description for vtk has been wrong in metadata.xml.
Thanks to Dirk Gouders for pointing it out.

Reported-by: Dirk Gouders  gouders.net>
Closes: https://bugs.gentoo.org/683138
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11763
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/opencascade/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/metadata.xml 
b/sci-libs/opencascade/metadata.xml
index 38f461d22b3..cfb5bac89f9 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -14,6 +14,6 @@
Use gl2ps PostScript printing library
Use OpenGL ES 2.0
Enable multithreading with the Intel Threads Building 
Block dev-cpp/tbb
-   Enable Virtualisation Toolkit
+   Enable Visualization Toolkit

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2019-02-06 Thread Patrice Clement

commit: 0f730b1ce4c3fac673499bc42c47bbe3f523a394
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Feb  3 11:48:56 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Feb  6 22:37:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f730b1c

sci-libs/opencascade: use HTTPS.

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10969
Signed-off-by: Patrice Clement  gentoo.org>

 sci-libs/opencascade/opencascade-7.3.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild 
b/sci-libs/opencascade/opencascade-7.3.0.ebuild
index 6d40cf35bba..15dce82b6a9 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 Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit check-reqs cmake-utils eapi7-ver java-pkg-opt-2
 MY_PV="$(ver_rs 1- '_')"
 
 DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and 
data exchange"
-HOMEPAGE="http://www.opencascade.com/;
+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"
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2019-01-15 Thread Patrice Clement

commit: a82de88707e5e4e3d8a8a3bc1521d4f34c31e18c
Author: Bernd Waibel  gmail  com>
AuthorDate: Sun Dec 23 21:48:59 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jan 15 23:12:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82de887

sci-libs/opencascade: add maintainer.

Add myself as maintainer (see
https://archives.gentoo.org/gentoo-dev/message/3d497dc197a35250614437572ef80e4b)

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10688
Signed-off-by: Patrice Clement  gentoo.org>

 sci-libs/opencascade/metadata.xml | 23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/sci-libs/opencascade/metadata.xml 
b/sci-libs/opencascade/metadata.xml
index ac137460a1e..38f461d22b3 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -1,12 +1,19 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-  
-Enable support for image i/o via 
media-libs/freeimage
-Use gl2ps PostScript printing library
-Use OpenGL ES 2.0
-Enable multithreading with the Intel Threads Building 
Block dev-cpp/tbb
-Enable Virtualisation Toolkit
-  
+
+   wae...@gmail.com
+   Bernd Waibel
+
+
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+
+
+   Enable support for image i/o via 
media-libs/freeimage
+   Use gl2ps PostScript printing library
+   Use OpenGL ES 2.0
+   Enable multithreading with the Intel Threads Building 
Block dev-cpp/tbb
+   Enable Virtualisation Toolkit
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2018-11-29 Thread Andreas Sturmlechner

commit: 19716b32ad42b4dc3a0e7a7b3d8e3a100be84f01
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 20:14:09 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 20:18:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19716b32

sci-libs/opencascade: Drop 6.9.1-r2

Closes: https://bugs.gentoo.org/651772
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 -
 .../files/opencascade-6.8.0-fixed-DESTDIR.patch|  47 --
 .../files/opencascade-6.9.1-vtk-6.3.patch  |  70 
 .../files/opencascade-6.9.1-vtk-8.1.patch  |  48 --
 .../files/opencascade-6.9.1-vtk-configure.patch|  13 --
 sci-libs/opencascade/opencascade-6.9.1-r2.ebuild   | 177 -
 6 files changed, 356 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 922670cf0cf..52dffdbc97c 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,2 +1 @@
-DIST opencascade-6.9.1.tgz 209589289 BLAKE2B 
266d68042dbbb8c9bc5f167b9aefaf84b3f1568c25530acb36271443429e67972aae913ebcea09c9ea27164e2e3f007eb287350d7ad69486755cdcb713fdb1af
 SHA512 
92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963
 DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B 
bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6
 SHA512 
17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da

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 1f37eace760..000
--- 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 8e1d3361dde..000
---

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2018-11-29 Thread Andreas Sturmlechner

commit: 22c33947b0ef4c26437b62ebdd76e2ad19fdb8b1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 20:02:59 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 20:18:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c33947

sci-libs/opencascade: Fix build with ffmpeg-4

Reported-by: Boris Vingradov  gmail.com>
Closes: https://bugs.gentoo.org/672248
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/opencascade-7.3.0-ffmpeg4.patch  | 38 ++
 sci-libs/opencascade/opencascade-7.3.0.ebuild  |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

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 000..fc572a4f5bc
--- /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.cxx2017-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 (, 0, sizeof(aPacket));
+   av_init_packet ();
++#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, );
+   }
+   else
++#endif
+   {
+ // encode the image
+ myFrame->pts = myFrameCount;

diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild 
b/sci-libs/opencascade/opencascade-7.3.0.ebuild
index 48f4c0775e4..6d40cf35bba 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() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/

2018-10-27 Thread Amy Liffey

commit: 0b00b035e79aed9609ac7e8e921267d75de2ee94
Author: Michael Perlov  gmail  com>
AuthorDate: Sat Sep 15 14:23:51 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Oct 27 10:35:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b00b035

sci-libs/opencascade: Version bump to 7.3.0

Closes: https://github.com/gentoo/gentoo/pull/9871
Closes: https://bugs.gentoo.org/610362
Signed-off-by: Michael Perlov  gmail.com>
Signed-off-by: Amy Liffey  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sci-libs/opencascade/Manifest  |   1 +
 .../files/opencascade-7.3.0-fixed-DESTDIR.patch|  31 +
 .../files/opencascade-7.3.0-vtk-compat.patch   |  13 ++
 sci-libs/opencascade/metadata.xml  |   1 +
 sci-libs/opencascade/opencascade-7.3.0.ebuild  | 140 +
 5 files changed, 186 insertions(+)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 29c34b19d5a..922670cf0cf 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1 +1,2 @@
 DIST opencascade-6.9.1.tgz 209589289 BLAKE2B 
266d68042dbbb8c9bc5f167b9aefaf84b3f1568c25530acb36271443429e67972aae913ebcea09c9ea27164e2e3f007eb287350d7ad69486755cdcb713fdb1af
 SHA512 
92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963
+DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B 
bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6
 SHA512 
17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da

diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch 
b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
new file mode 100644
index 000..c0a6363e19f
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
@@ -0,0 +1,31 @@
+--- a/CMakeLists.txt   2016-11-25 11:50:18.0 +0100
 b/CMakeLists.txt   2017-03-18 08:44:10.406668714 +0100
+@@ -885,7 +885,7 @@ 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 
\"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/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}")
+ endif()
+@@ -906,7 +906,7 @@
+ 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}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\"
 COPYONLY)")
+ 
+ foreach (OCCT_MODULE ${OCCT_MODULES})
+   if (BUILD_MODULE_${OCCT_MODULE})
+--- a/adm/cmake/occt_macros.cmake  2016-11-25 11:50:18.0 +0100
 b/adm/cmake/occt_macros.cmake  2017-03-18 08:44:10.406668714 +0100
+@@ -558,7 +558,7 @@
+   "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}/${INSTALL_DIR_CMAKE}/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}\")

diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch 
b/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch
new file mode 100644
index 000..71700a57f1d
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch
@@ -0,0 +1,13 @@
+--- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx   2018-09-15 01:57:25.086783255 +0300
 b/src/IVtkVTK/IVtkVTK_ShapeData.cxx   2018-09-15 01:58:20.89839 +0300
+@@ -29,6 +29,10 @@
+ #pragma warning(pop)
+ #endif
+ 
++#ifdef vtkGenericDataArray_h
++#define InsertNextTupleValue InsertNextTypedTuple
++#endif
++
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2018-04-05 Thread Andreas Sturmlechner

commit: 7f4ed1058c3e345c926bc2b67810bca7cd65b050
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  5 12:01:27 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  5 12:24:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f4ed105

sci-libs/opencascade: epatch -> eapply

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index bf868ce0ef5..b8abc59a41a 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2018-04-05 Thread Andreas Sturmlechner

commit: 34251046e57f6eefc3576839fb1c333c8420a604
Author: switch87  pellin  be>
AuthorDate: Thu Mar 15 21:05:46 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  5 12:24:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34251046

sci-libs/opencascade: Fix build with >=vtk-8.1.0

Closes: https://bugs.gentoo.org/650596
Closes: https://github.com/gentoo/gentoo/pull/7470

 .../files/opencascade-6.9.1-vtk-8.1.patch  | 48 ++
 sci-libs/opencascade/opencascade-6.9.1-r2.ebuild   |  4 +-
 2 files changed, 50 insertions(+), 2 deletions(-)

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 000..d1f560320c6
--- /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, );
+   const vtkIdType aShapeIDVTK = theShapeID;
+-  mySubShapeIDs->InsertNextTupleValue ();
++  mySubShapeIDs->InsertNextTypedTuple ();
+   const vtkIdType aType = theMeshType;
+-  myMeshTypes->InsertNextTupleValue ();
++  myMeshTypes->InsertNextTypedTuple ();
+ }
+ 
+ //
+@@ -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 ();
++  mySubShapeIDs->InsertNextTypedTuple ();
+   const vtkIdType aType = theMeshType;
+-  myMeshTypes->InsertNextTupleValue ();
++  myMeshTypes->InsertNextTypedTuple ();
+ }
+ 
+ //
+@@ -124,9 +124,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType  
 theShapeID,
+ 
+ myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList);
+ const vtkIdType aShapeIDVTK = theShapeID;
+-mySubShapeIDs->InsertNextTupleValue ();
++mySubShapeIDs->InsertNextTypedTuple ();
+ const vtkIdType aType = theMeshType;
+-myMeshTypes->InsertNextTupleValue ();
++myMeshTypes->InsertNextTypedTuple ();
+ 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 ();
++  mySubShapeIDs->InsertNextTypedTuple ();
+   const vtkIdType aType = theMeshType;
+-  myMeshTypes->InsertNextTupleValue ();
++  myMeshTypes->InsertNextTypedTuple ();
+ }

diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 8eff7a5ab1a..bf868ce0ef5 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() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2017-12-22 Thread Michael Weber

commit: 79c7b34b303dcc7dca8cfc2df66925604627370d
Author: Michael Weber  gentoo  org>
AuthorDate: Fri Dec 22 11:44:19 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri Dec 22 11:44:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79c7b34b

sci-libs/opencascade: Quote has_version argument.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 4a855150295..8eff7a5ab1a 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -118,7 +118,7 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER 
/usr/include/tcl.h | sed 's/^.*"\(.*
-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
+   if has_version ">=sys-libs/glibc-2.26" ; then
sed -e '/#include /d' \
-i inc/Standard_CLocaleSentry.hxx || die
fi

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2017-12-22 Thread Michael Weber

commit: 422d70a744d3b4a1947f0f6b07c3fd4f1b2b0fe8
Author: Michael Weber  gentoo  org>
AuthorDate: Fri Dec 22 11:35:22 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri Dec 22 11:37:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422d70a7

sci-libs/opencascade: Drop xlocale.h include.

Bug: https://bugs.gentoo.org/610362
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 5b581add74b..4a855150295 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -117,6 +117,12 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER 
/usr/include/tcl.h | sed 's/^.*"\(.*
-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 /d' \
+   -i inc/Standard_CLocaleSentry.hxx || die
+   fi
+
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2017-11-05 Thread Andreas Sturmlechner

commit: 0d2a598ccf73735880a42e5f67212dadec0fde0c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov  5 19:55:52 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov  6 01:57:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2a598c

sci-libs/opencascade: Drop USE=qt4

Thanks-to: Fabio Rossi  inwind.it>
Closes: https://bugs.gentoo.org/624194
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 3f0de66418d..5b581add74b 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -12,9 +12,10 @@ 
SRC_URI="http://www.opencascade.com/sites/default/files/private/occt/OCC_${PV}_r
 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 +vtk"
+IUSE="debug doc examples freeimage gl2ps java +tbb +vtk"
 
-DEPEND="app-eselect/eselect-opencascade
+DEPEND="
+   app-eselect/eselect-opencascade
dev-lang/tcl:0=
dev-lang/tk:0=
dev-tcltk/itcl
@@ -28,14 +29,16 @@ DEPEND="app-eselect/eselect-opencascade
gl2ps? ( x11-libs/gl2ps )
java? ( >=virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )
-   vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[qt4] 
sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )"
+   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 )
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
+   "${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch
+)
 
 pkg_setup() {
check-reqs_pkg_setup
@@ -111,9 +114,9 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER 
/usr/include/tcl.h | sed 's/^.*"\(.*
 
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"\
+   -e "/\$qt directory is not 
exists/s/AC_MSG_ERROR/AC_MSG_NOTICE/" \
-i configure.ac || die
+
eautoreconf
 }
 
@@ -123,9 +126,9 @@ src_configure() {
--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 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") \
@@ -162,9 +165,7 @@ src_install() {
 
 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
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/

2017-11-05 Thread Andreas Sturmlechner

commit: 5e7c5d97488b5b46e20db03862f2502f91335286
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov  5 19:30:20 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov  6 01:57:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e7c5d97

sci-libs/opencascade: Drop old

Bug: https://bugs.gentoo.org/624194
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 sci-libs/opencascade/Manifest  |   3 -
 .../opencascade-6.5.4-fixed-tbb-VERSION.patch  |  10 --
 .../files/opencascade-6.7.0-fixed-DESTDIR.patch|  51 ---
 .../opencascade-6.7.1-deprecated-glx-api.patch |  89 ---
 sci-libs/opencascade/opencascade-6.7.1-r1.ebuild   | 161 
 sci-libs/opencascade/opencascade-6.8.0-r1.ebuild   | 158 
 sci-libs/opencascade/opencascade-6.9.0-r1.ebuild   | 163 
 sci-libs/opencascade/opencascade-6.9.1-r1.ebuild   | 164 -
 8 files changed, 799 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 2bc71fba802..635f58a5844 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1 @@
-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
-DIST opencascade-6.9.0.tgz 203915299 SHA256 
e9da098b304f6b65c3958947c3c687f00128ce020b67d97554a3e3be9cf3d090 SHA512 
79c7f715087ca627447a1cfd0b19a216150d71865f53f791978842ca9663181c5b608d93a7dc81945ad0dba287ea003cfa3ff47ebae07602a8fd38e6e1344aee
 WHIRLPOOL 
ab3bf2d1e369f87501bc5f3f63c092b6586a76b56443179e542fc2c1b10e9d504429c60096b7bd555c578ba54212693d4b495f34bb9045c3e1fb519b1d480538
 DIST opencascade-6.9.1.tgz 209589289 SHA256 
f92659ae3fb09c28233fb9178bc24fd2aab6776f6d9ea2479c3bdfe6296b873f SHA512 
92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963
 WHIRLPOOL 
02fe93b6e6dc7de45a3bf55ce9c5d826cb83ffda565273d008961c5824475d8f4dda04b782071b821c017409aeb0f6be05ea29a5d89ca57db85ea757aec27e4a

diff --git 
a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch 
b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch
deleted file mode 100644
index 88b13acd21c..000
--- a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 src/Standard/Standard_MMgrTBBalloc.cxx
-+++ src/Standard/Standard_MMgrTBBalloc.cxx
-@@ -12,6 +12,7 @@
- 
- // paralleling with Intel TBB
- #ifdef HAVE_TBB
-+#undef VERSION
- #include 
- using namespace tbb;
- #else

diff --git a/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch 
b/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch
deleted file mode 100644
index 3a3f9809344..000
--- a/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch
+++ /dev/null
@@ -1,51 +0,0 @@
 Makefile.am.old2014-01-13 09:43:18.530500362 +0100
-+++ Makefile.am2014-01-13 09:45:40.430496833 +0100
-@@ -82,29 +82,29 @@
-   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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/

2017-06-22 Thread Michael Weber

commit: 82adaded86fa4c9b710da76851edf52749edfb87
Author: Michael Weber  gentoo  org>
AuthorDate: Thu Jun 22 08:15:16 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Thu Jun 22 08:15:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82adaded

sci-libs/opencascade: Fix path spec in vtk-6.3 patch (bug 621160).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index e6b011b1e03..8e1d3361dde 100644
--- 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
@@ -1,5 +1,5 @@
 work/opencascade-6.9.1/configure.ac
-+++ work/opencascade-6.9.1/configure.ac
+--- opencascade-6.9.1/configure.ac
 opencascade-6.9.1/configure.ac
 @@ -1044,7 +1044,7 @@
  fi
  if test "x$vtk_lib" != "x"; then

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2017-06-07 Thread Michael Weber

commit: 29c93fad765e6a21197b9e8cb6c3b2df2c037ab8
Author: Michael Weber  gentoo  org>
AuthorDate: Wed Jun  7 07:08:05 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Wed Jun  7 07:09:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c93fad

sci-libs/opencascade: Revbump with patches for >=sci-libs/vtk-6.3 (thanks 
Juergen Rose, bug 605304). EAPI 6.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../files/opencascade-6.9.1-vtk-6.3.patch  | 70 ++
 .../files/opencascade-6.9.1-vtk-configure.patch| 13 
 sci-libs/opencascade/opencascade-6.9.1-r1.ebuild   |  9 +--
 ...6.9.1-r1.ebuild => opencascade-6.9.1-r2.ebuild} | 25 +---
 4 files changed, 104 insertions(+), 13 deletions(-)

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
new file mode 100644
index 000..e6b011b1e03
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
@@ -0,0 +1,70 @@
+--- work/opencascade-6.9.1/configure.ac
 work/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-configure.patch 
b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch
new file mode

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2017-06-04 Thread Michael Weber

commit: 5c5a29323b20138103ace226b0048059d792b779
Author: Michael Weber  gentoo  org>
AuthorDate: Sun Jun  4 22:51:52 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sun Jun  4 22:52:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5a2932

sci-libs/opencascade: Remove RESTRICT=fetch (bug 619300, bug 600514).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/opencascade/opencascade-6.7.1-r1.ebuild | 3 ---
 sci-libs/opencascade/opencascade-6.8.0-r1.ebuild | 3 ---
 sci-libs/opencascade/opencascade-6.9.0-r1.ebuild | 3 ---
 sci-libs/opencascade/opencascade-6.9.1-r1.ebuild | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild 
b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
index 1883666c47d..de1201862ab 100644
--- a/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
@@ -30,9 +30,6 @@ DEPEND="app-eselect/eselect-opencascade
tbb? ( dev-cpp/tbb )"
 RDEPEND="${DEPEND}"
 
-# https://bugs.gentoo.org/show_bug.cgi?id=600514
-RESTRICT="fetch"
-
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"
 

diff --git a/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild 
b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
index d646e876d67..1164f28ccc4 100644
--- a/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
@@ -30,9 +30,6 @@ DEPEND="app-eselect/eselect-opencascade
tbb? ( dev-cpp/tbb )"
 RDEPEND="${DEPEND}"
 
-# https://bugs.gentoo.org/show_bug.cgi?id=600514
-RESTRICT="fetch"
-
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"
 

diff --git a/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild 
b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
index 18a7db0b2d8..df80ca41482 100644
--- a/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
@@ -32,9 +32,6 @@ DEPEND="app-eselect/eselect-opencascade
vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] 
=sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] 
=sci-libs/${MY_VTK}*[all-modules] ) )"
 RDEPEND="${DEPEND}"
 
-# https://bugs.gentoo.org/show_bug.cgi?id=600514
-RESTRICT="fetch"
-
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"
 

diff --git a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
index 45c52394ebb..02db66a9487 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
@@ -32,9 +32,6 @@ DEPEND="app-eselect/eselect-opencascade
vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] 
=sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] 
=sci-libs/${MY_VTK}*[all-modules] ) )"
 RDEPEND="${DEPEND}"
 
-# https://bugs.gentoo.org/show_bug.cgi?id=600514
-RESTRICT="fetch"
-
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/

2017-02-01 Thread David Seifert

commit: 24245dad85ece9d1f34a3874a258271f2d73328f
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Feb  1 18:36:54 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Feb  1 22:39:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24245dad

sci-libs/opencascade: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/3763

 sci-libs/opencascade/files/env.sh.template | 40 --
 1 file changed, 40 deletions(-)

diff --git a/sci-libs/opencascade/files/env.sh.template 
b/sci-libs/opencascade/files/env.sh.template
deleted file mode 100644
index 146c86b..
--- a/sci-libs/opencascade/files/env.sh.template
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh -f
-
-export CASROOT=VAR_CASROOT
-
-if [ -z "PATH" ];
-then PATH=VAR_CASROOT/Linux/bin;
-else PATH=VAR_CASROOT/Linux/bin:$PATH;
-fi
-export PATH
-if [ -z "LD_LIBRARY_PATH" ];
-then LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib;
-else LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:$LD_LIBRARY_PATH;
-fi
-export LD_LIBRARY_PATH
-export CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
-export CSF_LANGUAGE=us
-export MMGT_CLEAR=1
-export CSF_EXCEPTION_PROMPT=1
-export CSF_SHMessage=VAR_CASROOT/src/SHMessage
-export CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures
-export CSF_XSMessage=VAR_CASROOT/src/XSMessage
-export CSF_StandardDefaults=VAR_CASROOT/src/StdResource
-export CSF_PluginDefaults=VAR_CASROOT/src/StdResource
-export CSF_XCAFDefaults=VAR_CASROOT/src/StdResource
-export CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource
-export CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so
-export CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
-export CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat
-export CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource
-export CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource
-export CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource
-export CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt
-
-export TCLHOME=VAR_SYS_BIN
-export TCLLIBPATH=VAR_SYS_LIB
-export ITK_LIBRARY=VAR_SYS_LIB/VAR_ITK
-export ITCL_LIBRARY=VAR_SYS_LIB/VAR_ITCL
-export TIX_LIBRARY=VAR_SYS_LIB/VAR_TIX
-export TK_LIBRARY=VAR_SYS_LIB/VAR_TK
-export TCL_LIBRARY=VAR_SYS_LIB/VAR_TCL

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2017-01-31 Thread Robin H. Johnson

commit: aa861d9b221519dedf0a332a5b0a5dacdd955993
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Jan 31 08:34:32 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Tue Jan 31 08:37:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa861d9b

sci-libs/opencascade: update RESTRICT

As per bug 600514, upstream licensing has changed since the older bug
352435 that caused the RESTRICT. It is now LGPL, and most the
restrictions can be removed.  RESTRICT=fetch is still in place as
upstream would like you to register before downloading.

Package-Manager: portage-2.3.2
Signed-off-by: Robin H. Johnson  gentoo.org>
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=600514
See-Also: 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
See-Also: https://bugs.gentoo.org/show_bug.cgi?id=352435
Signed-off-by: Robin H. Johnson  gentoo.org>

 sci-libs/opencascade/opencascade-6.7.1-r1.ebuild | 7 +++
 sci-libs/opencascade/opencascade-6.8.0-r1.ebuild | 7 +++
 sci-libs/opencascade/opencascade-6.9.0-r1.ebuild | 7 +++
 sci-libs/opencascade/opencascade-6.9.1-r1.ebuild | 7 +++
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild 
b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
index 3570e2d..276acdc 100644
--- a/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,9 +31,8 @@ DEPEND="app-eselect/eselect-opencascade
tbb? ( dev-cpp/tbb )"
 RDEPEND="${DEPEND}"
 
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist mirror"
+# https://bugs.gentoo.org/show_bug.cgi?id=600514
+RESTRICT="fetch"
 
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"

diff --git a/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild 
b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
index 6ce45c8..15b0bbb 100644
--- a/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,9 +31,8 @@ DEPEND="app-eselect/eselect-opencascade
tbb? ( dev-cpp/tbb )"
 RDEPEND="${DEPEND}"
 
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist mirror"
+# https://bugs.gentoo.org/show_bug.cgi?id=600514
+RESTRICT="fetch"
 
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"

diff --git a/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild 
b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
index c155ba1..48cb0a9 100644
--- a/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -33,9 +33,8 @@ DEPEND="app-eselect/eselect-opencascade
vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] 
=sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] 
=sci-libs/${MY_VTK}*[all-modules] ) )"
 RDEPEND="${DEPEND}"
 
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist mirror"
+# https://bugs.gentoo.org/show_bug.cgi?id=600514
+RESTRICT="fetch"
 
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"

diff --git a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
index ce5a35c..01d43e6 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -33,9 +33,8 @@ DEPEND="app-eselect/eselect-opencascade
vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] 
=sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] 
=sci-libs/${MY_VTK}*[all-modules] ) )"
 RDEPEND="${DEPEND}"
 
-# https://bugs.gentoo.org/show_bug.cgi?id=352435
-# 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist fetch mirror"
+# https://bugs.gentoo.org/show_bug.cgi?id=600514
+RESTRICT="fetch"
 
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2016-11-19 Thread David Seifert

commit: 3664bcddc74344ead74fe8b27488662bbd6228c7
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 19 17:54:53 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 19 17:55:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3664bcdd

sci-libs/opencascade: Restore installing modules into /etc/env.d/${PN}

Gentoo-bug: 599920

Package-Manager: portage-2.3.2

 .../{opencascade-6.7.1.ebuild => opencascade-6.7.1-r1.ebuild}  | 3 ++-
 .../{opencascade-6.8.0.ebuild => opencascade-6.8.0-r1.ebuild}  | 3 ++-
 .../{opencascade-6.9.0.ebuild => opencascade-6.9.0-r1.ebuild}  | 3 ++-
 .../{opencascade-6.9.1.ebuild => opencascade-6.9.1-r1.ebuild}  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-6.7.1.ebuild 
b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-6.7.1.ebuild
rename to sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
index b768338..3570e2d 100644
--- a/sci-libs/opencascade/opencascade-6.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1-r1.ebuild
@@ -141,7 +141,8 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
 
-   newenvd 50${PN} ${PV}
+   insinto /etc/env.d/${PN}
+   newins 50${PN} ${PV}
 
#cd "${S}"
if use examples ; then

diff --git a/sci-libs/opencascade/opencascade-6.8.0.ebuild 
b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-6.8.0.ebuild
rename to sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
index dbe6658..6ce45c8 100644
--- a/sci-libs/opencascade/opencascade-6.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.8.0-r1.ebuild
@@ -139,7 +139,8 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
 
-   newenvd 50${PN} ${PV}
+   insinto /etc/env.d/${PN}
+   newins 50${PN} ${PV}
 
if use examples ; then
insinto /usr/share/doc/${PF}/examples

diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild 
b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-6.9.0.ebuild
rename to sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
index 6058f7f..c155ba1 100644
--- a/sci-libs/opencascade/opencascade-6.9.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0-r1.ebuild
@@ -144,7 +144,8 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
 
-   newenvd 50${PN} ${PV}
+   insinto /etc/env.d/${PN}
+   newins 50${PN} ${PV}
 
if use examples ; then
insinto /usr/share/doc/${PF}/examples

diff --git a/sci-libs/opencascade/opencascade-6.9.1.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-6.9.1.ebuild
rename to sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
index a9b5077..ce5a35c 100644
--- a/sci-libs/opencascade/opencascade-6.9.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
@@ -144,7 +144,8 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
 
-   newenvd 50${PN} ${PV}
+   insinto /etc/env.d/${PN}
+   newins 50${PN} ${PV}
 
if use examples ; then
insinto /usr/share/doc/${PF}/examples

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2016-11-06 Thread David Seifert

commit: 8ba76897c9404c75c2abcba000dfdd830c4ee1b5
Author: David Seifert  gentoo  org>
AuthorDate: Thu Nov  3 21:17:55 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov  6 10:29:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba76897

sci-libs/opencascade: [QA] Fix multiple violations

* Overlong DESCRIPTION
* insinto/newins /etc/env.d/

Package-Manager: portage-2.3.2

 sci-libs/opencascade/opencascade-6.7.1.ebuild | 7 +++
 sci-libs/opencascade/opencascade-6.8.0.ebuild | 7 +++
 sci-libs/opencascade/opencascade-6.9.0.ebuild | 5 ++---
 sci-libs/opencascade/opencascade-6.9.1.ebuild | 5 ++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-6.7.1.ebuild 
b/sci-libs/opencascade/opencascade-6.7.1.ebuild
index 831e170..b768338 100644
--- a/sci-libs/opencascade/opencascade-6.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ 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"
+DESCRIPTION="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;
 
@@ -141,8 +141,7 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
 
-   insinto /etc/env.d/${PN}
-   newins 50${PN} ${PV}
+   newenvd 50${PN} ${PV}
 
#cd "${S}"
if use examples ; then

diff --git a/sci-libs/opencascade/opencascade-6.8.0.ebuild 
b/sci-libs/opencascade/opencascade-6.8.0.ebuild
index af9f50e..dbe6658 100644
--- a/sci-libs/opencascade/opencascade-6.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ 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"
+DESCRIPTION="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;
 
@@ -139,8 +139,7 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
 
-   insinto /etc/env.d/${PN}
-   newins 50${PN} ${PV}
+   newenvd 50${PN} ${PV}
 
if use examples ; then
insinto /usr/share/doc/${PF}/examples

diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild 
b/sci-libs/opencascade/opencascade-6.9.0.ebuild
index dd95900..6058f7f 100644
--- a/sci-libs/opencascade/opencascade-6.9.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0.ebuild
@@ -6,7 +6,7 @@ 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"
+DESCRIPTION="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;
 
@@ -144,8 +144,7 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
 
-   insinto /etc/env.d/${PN}
-   newins 50${PN} ${PV}
+   newenvd 50${PN} ${PV}
 
if use examples ; then
insinto /usr/share/doc/${PF}/examples

diff --git a/sci-libs/opencascade/opencascade-6.9.1.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1.ebuild
index 894b2e6..a9b5077 100644
--- a/sci-libs/opencascade/opencascade-6.9.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1.ebuild
@@ -6,7 +6,7 @@ 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"
+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;
 
@@ -144,8 +144,7 @@ src_install() {
dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
fi
 
-   insinto /etc/env.d/${PN}
-   newins 50${PN} ${PV}
+   newenvd 50${PN} ${PV}
 
if use examples ; then
insinto /usr/share/doc/${PF}/examples

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2016-09-26 Thread Michael Weber

commit: f50af8ad1cd34db7f2e841d36222d8d507e011fd
Author: Michael Weber  gentoo  org>
AuthorDate: Mon Sep 26 12:03:56 2016 +
Commit: Michael Weber  gentoo  org>
CommitDate: Mon Sep 26 12:03:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f50af8ad

sci-libs/opencascade: USE=vtk needs vtkInteractionStyle, bug 557602.

Package-Manager: portage-2.2.28

 sci-libs/opencascade/opencascade-6.9.0.ebuild | 4 ++--
 sci-libs/opencascade/opencascade-6.9.1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild 
b/sci-libs/opencascade/opencascade-6.9.0.ebuild
index 7762a18..dd95900 100644
--- a/sci-libs/opencascade/opencascade-6.9.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -30,7 +30,7 @@ DEPEND="app-eselect/eselect-opencascade
gl2ps? ( x11-libs/gl2ps )
java? ( >=virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )
-   vtk? ( =sci-libs/${MY_VTK}* )"
+   vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] 
=sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] 
=sci-libs/${MY_VTK}*[all-modules] ) )"
 RDEPEND="${DEPEND}"
 
 # https://bugs.gentoo.org/show_bug.cgi?id=352435

diff --git a/sci-libs/opencascade/opencascade-6.9.1.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1.ebuild
index 0b66059..894b2e6 100644
--- a/sci-libs/opencascade/opencascade-6.9.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -30,7 +30,7 @@ DEPEND="app-eselect/eselect-opencascade
gl2ps? ( x11-libs/gl2ps )
java? ( >=virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )
-   vtk? ( =sci-libs/${MY_VTK}* )"
+   vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] 
=sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] 
=sci-libs/${MY_VTK}*[all-modules] ) )"
 RDEPEND="${DEPEND}"
 
 # https://bugs.gentoo.org/show_bug.cgi?id=352435

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2016-06-17 Thread Michael Weber

commit: 6f8ade7322a104908646aef4366c271b4e6bfc70
Author: Michael Weber  gentoo  org>
AuthorDate: Fri Jun 17 15:10:41 2016 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri Jun 17 15:14:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8ade73

sci-libs/opencascade: Version bump.

Package-Manager: portage-2.2.28

 sci-libs/opencascade/Manifest |   1 +
 sci-libs/opencascade/opencascade-6.9.1.ebuild | 168 ++
 2 files changed, 169 insertions(+)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 9314c97..2bc71fb 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,4 @@
 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
 DIST opencascade-6.9.0.tgz 203915299 SHA256 
e9da098b304f6b65c3958947c3c687f00128ce020b67d97554a3e3be9cf3d090 SHA512 
79c7f715087ca627447a1cfd0b19a216150d71865f53f791978842ca9663181c5b608d93a7dc81945ad0dba287ea003cfa3ff47ebae07602a8fd38e6e1344aee
 WHIRLPOOL 
ab3bf2d1e369f87501bc5f3f63c092b6586a76b56443179e542fc2c1b10e9d504429c60096b7bd555c578ba54212693d4b495f34bb9045c3e1fb519b1d480538
+DIST opencascade-6.9.1.tgz 209589289 SHA256 
f92659ae3fb09c28233fb9178bc24fd2aab6776f6d9ea2479c3bdfe6296b873f SHA512 
92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963
 WHIRLPOOL 
02fe93b6e6dc7de45a3bf55ce9c5d826cb83ffda565273d008961c5824475d8f4dda04b782071b821c017409aeb0f6be05ea29a5d89ca57db85ea757aec27e4a

diff --git a/sci-libs/opencascade/opencascade-6.9.1.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1.ebuild
new file mode 100644
index 000..0b66059
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-6.9.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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://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 qt4 +tbb +vtk"
+
+MY_VTK="vtk-6.1"
+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/${MY_VTK}* )"
+RDEPEND="${DEPEND}"
+
+# https://bugs.gentoo.org/show_bug.cgi?id=352435
+# 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+RESTRICT="bindist fetch 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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2015-08-23 Thread Michael Weber

commit: 410d3a68e98a87f63e117175a506fd292134f865
Author: Michael Weber xmw AT gentoo DOT org
AuthorDate: Sun Aug 23 11:15:09 2015 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Sun Aug 23 11:15:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410d3a68

sci-libs/opencascade: Fix USE=java dep to =virtual/jdk-0:= (thanks to all 
contributors on bug 541644).

Package-Manager: portage-2.2.20.1

 sci-libs/opencascade/opencascade-6.7.1.ebuild | 2 +-
 sci-libs/opencascade/opencascade-6.8.0.ebuild | 2 +-
 sci-libs/opencascade/opencascade-6.9.0.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-6.7.1.ebuild 
b/sci-libs/opencascade/opencascade-6.7.1.ebuild
index e18a372..f64ba6a 100644
--- a/sci-libs/opencascade/opencascade-6.7.1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.7.1.ebuild
@@ -27,7 +27,7 @@ DEPEND=app-eselect/eselect-opencascade
x11-libs/libXmu
freeimage? ( media-libs/freeimage )
gl2ps? ( x11-libs/gl2ps )
-   java? ( virtual/jdk:= )
+   java? ( =virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )
 RDEPEND=${DEPEND}
 

diff --git a/sci-libs/opencascade/opencascade-6.8.0.ebuild 
b/sci-libs/opencascade/opencascade-6.8.0.ebuild
index 0c09d22..a2eb96f 100644
--- a/sci-libs/opencascade/opencascade-6.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.8.0.ebuild
@@ -27,7 +27,7 @@ DEPEND=app-eselect/eselect-opencascade
x11-libs/libXmu
freeimage? ( media-libs/freeimage )
gl2ps? ( x11-libs/gl2ps )
-   java? ( virtual/jdk:= )
+   java? ( =virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )
 RDEPEND=${DEPEND}
 

diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild 
b/sci-libs/opencascade/opencascade-6.9.0.ebuild
index 1f59e16..690dde6 100644
--- a/sci-libs/opencascade/opencascade-6.9.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0.ebuild
@@ -28,7 +28,7 @@ DEPEND=app-eselect/eselect-opencascade
x11-libs/libXmu
freeimage? ( media-libs/freeimage )
gl2ps? ( x11-libs/gl2ps )
-   java? ( virtual/jdk:= )
+   java? ( =virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )
vtk? ( =sci-libs/${MY_VTK}* )
 RDEPEND=${DEPEND}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/

2015-08-11 Thread Michael Weber

commit: 06e649ca4f4dab96b9663ee1af659755bdabd10b
Author: Michael Weber xmw AT gentoo DOT org
AuthorDate: Tue Aug 11 09:16:52 2015 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Tue Aug 11 09:16:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e649ca

sci-libs/opencascade/opencascade: drop old versions

Package-Manager: portage-2.2.20

 sci-libs/opencascade/Manifest  |   3 -
 .../files/opencascade-6.5-fixed-DESTDIR.patch  | 174 ---
 .../opencascade/files/opencascade-6.5-ftgl.patch   |  77 -
 .../opencascade/files/opencascade-6.5-tcl8.6.patch |  46 -
 .../files/opencascade-6.5.4-fixed-DESTDIR.patch|  46 -
 .../files/opencascade-6.5.4-tcl8.6.patch   |  38 -
 .../opencascade-6.5.5-deprecated-glx-api.patch |  30 
 .../opencascade-6.6.0-deprecated-glx-api.patch |  50 --
 .../files/opencascade-6.6.0-fixed-DESTDIR.patch|  45 -
 sci-libs/opencascade/opencascade-6.5.5.ebuild  | 171 ---
 sci-libs/opencascade/opencascade-6.5.ebuild| 187 -
 sci-libs/opencascade/opencascade-6.6.0.ebuild  | 169 ---
 12 files changed, 1036 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index fc426c2..9314c97 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,6 +1,3 @@
-DIST OpenCASCADE650.tar.gz 214819922 SHA256 
fb95d8a542bbfc26af6186495f752a683b40137b34d6afd8f9bb02730c2436c6 SHA512 
ea2c3703e3338584d84fb8e06664e79f5f113a117e94a4eefcf39bac3bcc28d81ace2340c83399ecbe5774c348faa3713e90623f8329562e10700ad7e2048be7
 WHIRLPOOL 
78e092b9ea892d7686578696bcba67f649b65b8d520f358cf2aac9a2c49baf75ff3717899865d7f752a5577b123f8d0eadce06173e5b1bad3dcf0c31052b09d6
-DIST OpenCASCADE655.tgz 146901035 SHA256 
f5c6ab58aeb5c514428ae1b802e2820ca9267d19eecd64776f06baa60098d1b6 SHA512 
848057a8a9fd41f1d13c4634c5e3366d37f3b4c81b7b194be9d4e48f5608f0bdfbc8cedd2a466e1724649a04ee87bfd0d1a445be47d832cc12fba5647689ceb2
 WHIRLPOOL 
18413460491c8a2fd10e97c22dd4b9b4772d97f19d27f59f33faa6618a1aac348877abc3ab9526878b38aba22328986a5c656ac91930cad460d33e93653bb463
-DIST OpenCASCADE660.tgz 119153607 SHA256 
e39fa4b2255b9bd9bf97aa122043f4608d97b6b79d922375da53275e42b25d60 SHA512 
8ee232f96ad650e55ac1f5fb1fe684b9d8198279dee4d7fd80a569c35562fffa643dd362fed7c5aff79541dbc463acc38b1364d8396c2c92c2d73f4955893866
 WHIRLPOOL 
29f0eaee2c64e4fb3fbb958e7cd043a2738a9d62414f332b81c65a009a100f39f56c38b20ffad4e76754522bfcbdc915470c84f9c218109650f9fd23d7bb3813
 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
 DIST opencascade-6.9.0.tgz 203915299 SHA256 
e9da098b304f6b65c3958947c3c687f00128ce020b67d97554a3e3be9cf3d090 SHA512 
79c7f715087ca627447a1cfd0b19a216150d71865f53f791978842ca9663181c5b608d93a7dc81945ad0dba287ea003cfa3ff47ebae07602a8fd38e6e1344aee
 WHIRLPOOL 
ab3bf2d1e369f87501bc5f3f63c092b6586a76b56443179e542fc2c1b10e9d504429c60096b7bd555c578ba54212693d4b495f34bb9045c3e1fb519b1d480538

diff --git a/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch 
b/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch
deleted file mode 100644
index ea0f9b6..000
--- a/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -urN opencascade.orig/ros/Makefile.am opencascade/ros/Makefile.am
 opencascade.orig/ros/Makefile.am   2011-03-06 16:08:59.0 +0100
-+++ opencascade/ros/Makefile.am2011-03-06 16:13:35.0 +0100
-@@ -86,106 +86,106 @@
- dir_SunOS=sun
- 
- 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 ];

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/

2015-08-09 Thread Michael Weber

commit: 40b3fd64ec9c5d6d94f0f0897740bc77622c24a1
Author: Michael Weber xmw AT gentoo DOT org
AuthorDate: Sun Aug  9 13:58:26 2015 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Sun Aug  9 13:58:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40b3fd64

sci-libs/opencascade: add USE=vtk (bug 557022, thanks Helmut Jarausch).

Package-Manager: portage-2.2.20

 sci-libs/opencascade/metadata.xml | 3 ++-
 sci-libs/opencascade/opencascade-6.9.0.ebuild | 9 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-libs/opencascade/metadata.xml 
b/sci-libs/opencascade/metadata.xml
index ccbd7c2..7d64287 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -8,6 +8,7 @@
   use
 flag name=freeimageEnable support for image i/o via 
media-libs/freeimage/flag
 flag name=gl2psUse gl2ps PostScript printing library/flag
-flag name=tbbtEnable multithreading with the Intel Threads Building 
Block dev-cpp/tbb/flag
+flag name=tbbEnable multithreading with the Intel Threads Building 
Block dev-cpp/tbb/flag
+flag name=vtkEnable Virtualisation Toolkit/flag
   /use
 /pkgmetadata

diff --git a/sci-libs/opencascade/opencascade-6.9.0.ebuild 
b/sci-libs/opencascade/opencascade-6.9.0.ebuild
index da82dfc..1f59e16 100644
--- a/sci-libs/opencascade/opencascade-6.9.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.0.ebuild
@@ -13,8 +13,9 @@ 
SRC_URI=http://files.opencascade.com/OCCT/OCC_${PV}_release/opencascade-${PV}.t
 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
+IUSE=debug doc examples freeimage gl2ps java qt4 +tbb +vtk
 
+MY_VTK=vtk-6.1
 DEPEND=app-eselect/eselect-opencascade
dev-lang/tcl:0=
dev-lang/tk:0=
@@ -28,7 +29,8 @@ DEPEND=app-eselect/eselect-opencascade
freeimage? ( media-libs/freeimage )
gl2ps? ( x11-libs/gl2ps )
java? ( virtual/jdk:= )
-   tbb? ( dev-cpp/tbb )
+   tbb? ( dev-cpp/tbb )
+   vtk? ( =sci-libs/${MY_VTK}* )
 RDEPEND=${DEPEND}
 
 # http://bugs.gentoo.org/show_bug.cgi?id=352435
@@ -108,6 +110,7 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER 
/usr/include/tcl.h | sed 's/^.*\(.*
-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\
+   -e /CSF_VTK_LIB=/s:-${MY_VTK/vtk-}::g \
-i configure.ac || die
eautoreconf
 }
@@ -124,6 +127,8 @@ src_configure() {
$(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} 
) \
+   $(usex vtk --with-vtk-library=${EROOT}usr/$(get_libdir) ) \
$(use_enable debug) \
$(use_enable !debug production)
 }

1 2 >

100 matches

Mail list logo