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

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

[Amy Liffey]

commit:     b8794f90839cb9074493a782dfd2e6f8e70e6c37
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Wed Dec 26 03:58:57 2018 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Jan  2 18:46:53 2019 +0000
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 <zoltan <AT> sinustrom.info>
Closes: https://github.com/gentoo/gentoo/pull/10694
Signed-off-by: Amy Liffey <amynka <AT> 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 00000000000..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
 }