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

2022-03-02 Thread Jakov Smolić
commit: b4fe643d6188f1c81c7ec0207e2331c938abcf03
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar  2 12:26:02 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar  2 12:26:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4fe643d

sci-libs/oce: treeclean

Closes: https://bugs.gentoo.org/832625
Signed-off-by: Jakov Smolić  gentoo.org>

 profiles/package.mask|  8 ---
 sci-libs/oce/Manifest|  1 -
 sci-libs/oce/files/oce-0.18.3-test-fix.patch | 13 -
 sci-libs/oce/metadata.xml| 22 
 sci-libs/oce/oce-0.18.3-r3.ebuild| 78 
 5 files changed, 122 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 2291d9a9db87..6dc377f556ae 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -170,14 +170,6 @@ x11-misc/sisctrl
 # Removal after 2022-07-01.  Bug #832953.
 x11-misc/easystroke
 
-# Zoltan Puskas  (2022-02-07)
-# Fork of sci-libs/opencascade. Upstream unmaintained due to opencascade
-# becoming community friendly and making this fork obsolete. Recommends moving
-# to opencascade. See: https://github.com/tpaviot/oce/issues/745
-# Blocks deprecation of sci-libs/vtk-8.2.0.
-# Removal on 2022-03-01. Bug #832625.
-sci-libs/oce
-
 # Stephan Hartmann  (2022-02-06)
 # Dev channel releases are only for people who
 # are developers or want more experimental features

diff --git a/sci-libs/oce/Manifest b/sci-libs/oce/Manifest
deleted file mode 100644
index 07ffde282d29..
--- a/sci-libs/oce/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OCE-0.18.3.tar.gz 24633768 BLAKE2B 
c1923fb6310ea30318251fedac371655a575bf4dfcc4c38e7c748d316416e08c33a3f27bd5db7f5b437265cf2f518651d69a6920f9f487dc7e0065a6406c653f
 SHA512 
6fdeb6ca4ce25361379872ccc465799d4a43407974c4f626b32df695e582b9e553cce17af6a6a7ff46ebed9b813d910ad23eb308a5356dabb9b9bbd4f42a8636

diff --git a/sci-libs/oce/files/oce-0.18.3-test-fix.patch 
b/sci-libs/oce/files/oce-0.18.3-test-fix.patch
deleted file mode 100644
index bec55d9d36b4..
--- a/sci-libs/oce/files/oce-0.18.3-test-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/OCAFExport_test/CMakeLists.txt 
b/test/OCAFExport_test/CMakeLists.txt
-index f81798a3a4..8d9f6ad86c 100644
 a/test/OCAFExport_test/CMakeLists.txt
-+++ b/test/OCAFExport_test/CMakeLists.txt
-@@ -5,6 +5,6 @@ if (OCE_OCAF AND NOT OCE_DISABLE_X11)
-   file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../src/StdResource" 
BuildPluginDir)
-   # Semi-colon is a delimiter in SET_TESTS_PROPERTIES and have to be 
escaped
-   string(REPLACE ";" "\\;" BuildPluginDir "${BuildPluginDir}")
--  set_tests_properties(OCAFExportTestSuite.testExportAscii PROPERTIES 
ENVIRONMENT 
"CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir}")
--  set_tests_properties(OCAFExportTestSuite.testExportNonAscii PROPERTIES 
ENVIRONMENT 
"CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir}")
-+  set_tests_properties(OCAFExportTestSuite.testExportAscii PROPERTIES 
ENVIRONMENT 
"CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir};LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
-+  set_tests_properties(OCAFExportTestSuite.testExportNonAscii PROPERTIES 
ENVIRONMENT 
"CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir};LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
- endif ()

diff --git a/sci-libs/oce/metadata.xml b/sci-libs/oce/metadata.xml
deleted file mode 100644
index 2fecd54ca110..
--- a/sci-libs/oce/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   zol...@sinustrom.info
-   Zoltan Puskas
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   
-   
-   oce is a C++ 3D modeling library. It can be used to develop 
CAD/CAM 
-   softwares. oce stands for opencascade community edition. This 
project
-   aims at gathering patches/ changes/ improvements from the OCC 
community.
-   
-
-   Enable support for image i/o via 
media-libs/freeimage
-   Use gl2ps PostScript printing library
-   Enable parallel meshing
-   Enable Virtualisation Toolkit
-

diff --git a/sci-libs/oce/oce-0.18.3-r3.ebuild 
b/sci-libs/oce/oce-0.18.3-r3.ebuild
deleted file mode 100644
index 532ed8f8dd54..
--- a/sci-libs/oce/oce-0.18.3-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake check-reqs java-pkg-opt-2
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and 
data exchange"
-HOMEPAGE="https://github.com/tpaviot/oce;

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

2019-01-02 Thread Amy Liffey
commit: b8794f90839cb9074493a782dfd2e6f8e70e6c37
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Wed Dec 26 03:58:57 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Jan  2 18:46:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8794f90

sci-libs/oce: Fix failing tests

Closes: https://bugs.gentoo.org/665596
Signed-off-by: Zoltan Puskas  sinustrom.info>
Closes: https://github.com/gentoo/gentoo/pull/10694
Signed-off-by: Amy Liffey  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.12

 sci-libs/oce/files/oce-0.18.3-test-fix.patch | 13 +
 sci-libs/oce/{oce-0.18.3.ebuild => oce-0.18.3-r1.ebuild} |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/sci-libs/oce/files/oce-0.18.3-test-fix.patch 
b/sci-libs/oce/files/oce-0.18.3-test-fix.patch
new file mode 100644
index 000..bec55d9d36b
--- /dev/null
+++ b/sci-libs/oce/files/oce-0.18.3-test-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/test/OCAFExport_test/CMakeLists.txt 
b/test/OCAFExport_test/CMakeLists.txt
+index f81798a3a4..8d9f6ad86c 100644
+--- a/test/OCAFExport_test/CMakeLists.txt
 b/test/OCAFExport_test/CMakeLists.txt
+@@ -5,6 +5,6 @@ if (OCE_OCAF AND NOT OCE_DISABLE_X11)
+   file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../src/StdResource" 
BuildPluginDir)
+   # Semi-colon is a delimiter in SET_TESTS_PROPERTIES and have to be 
escaped
+   string(REPLACE ";" "\\;" BuildPluginDir "${BuildPluginDir}")
+-  set_tests_properties(OCAFExportTestSuite.testExportAscii PROPERTIES 
ENVIRONMENT 
"CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir}")
+-  set_tests_properties(OCAFExportTestSuite.testExportNonAscii PROPERTIES 
ENVIRONMENT 
"CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir}")
++  set_tests_properties(OCAFExportTestSuite.testExportAscii PROPERTIES 
ENVIRONMENT 
"CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir};LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
++  set_tests_properties(OCAFExportTestSuite.testExportNonAscii PROPERTIES 
ENVIRONMENT 
"CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir};LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
+ endif ()

diff --git a/sci-libs/oce/oce-0.18.3.ebuild b/sci-libs/oce/oce-0.18.3-r1.ebuild
similarity index 95%
rename from sci-libs/oce/oce-0.18.3.ebuild
rename to sci-libs/oce/oce-0.18.3-r1.ebuild
index 69c85c7057f..0835a64d2bf 100644
--- a/sci-libs/oce/oce-0.18.3.ebuild
+++ b/sci-libs/oce/oce-0.18.3-r1.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
@@ -37,6 +37,8 @@ RDEPEND="${DEPEND}"
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"
 
+PATCHES=( "${FILESDIR}"/"${P}-test-fix.patch" )
+
 pkg_setup() {
check-reqs_pkg_setup
 }