gentoo resync : 12.01.2019

8 files changed, 40 insertions, 19 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 27a1a147000d..113626ce8efb 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 9abab49a38c7..344608836207 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,4 +1,4 @@
 AUX cholmod-1.7.4-parmetis32.patch 702 BLAKE2B 241d68fa25ac2ab3f9a425702559736fb15657eda82c5ba0a413174c146c09e0be167746f866a64189d027892d180445adcf92f55fc913c9bff0085f87051c94 SHA512 a1694a7f42f10c7619e23817e93f76df35bc208200918b74a6dd68bb4662d57ce2f3665be424ad4b5c8a4ea9c3957676c48716aa0e47d9fb19337dc43e759ecc
 DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
-EBUILD cholmod-2.1.2.ebuild 1775 BLAKE2B 6540adeeb55b8f0503041f5f21c93c7e0fc0b33dc36984112c44cba4308f4181f5429ae62e1c275da39272f90024f640939976e7e37010350f1e051bdbfe3914 SHA512 1f088d390bb3fa40f99308b0fa3a24d10b2de86abc0dc00ae77ca5807e9e2c7b793ecc6c2e526f5b99d0b508fea845fd63cb07a62d3eaa46d0ebbc7e07b6dc1b
+EBUILD cholmod-2.1.2.ebuild 1781 BLAKE2B 4fefd52e696a325edcf03866f18f459568ec0c2e41593cbd49485f20303206acb97a35c67eb2ede6cb893f9a41c4b0a15be2c0639e18815654611052566bc35a SHA512 d0ce97878df14b01fa42b3c01b1976509918a4fb52403101ea4db3843d0e670619147d88d5b14b604ab1e66213eef10cad459d6f8e7b03e3b1e06006ea5d65cb
 MISC metadata.xml 603 BLAKE2B ce6355915a22fd4bb81f619a1b946f83b971b43caf86929441452938c1bee5971c5f95d0349d13d740efcf51883015334db167d2fab49c8954ac6af1d5ca3348 SHA512 da9db58edeab0b40813e47567cbaa4e54ae8aa9f4cdc89cd87f1e35bb65991c305bc955e6aba744d322c6375de0e8ba1253415814175cf1f4bc2a01de2e11d22
diff --git a/sci-libs/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
index a0460f5c4b64..2f32156ec941 100644
--- a/sci-libs/cholmod/cholmod-2.1.2.ebuild
+++ b/sci-libs/cholmod/cholmod-2.1.2.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=5
@@ -22,7 +22,7 @@ RDEPEND="
 	metis? (
 		>=sci-libs/camd-2.3
 		>=sci-libs/ccolamd-2.8
-		|| ( sci-libs/metis sci-libs/parmetis ) )"
+		|| ( <sci-libs/metis-5 <sci-libs/parmetis-4 ) )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/sci-libs/oce/Manifest b/sci-libs/oce/Manifest
index a752ebf3f6ce..fe29e968db28 100644
--- a/sci-libs/oce/Manifest
+++ b/sci-libs/oce/Manifest
@@ -1,3 +1,4 @@
+AUX oce-0.18.3-test-fix.patch 1273 BLAKE2B 40c3fec8e3d5b703c39a2eee32d663e6dc7c6a1bad6a9885608679cb86f8047d6a50e1f625beac50dca045393f0d0290b5ca9d56a7498ba869a4af5028eb1fa0 SHA512 822bee12ee259801a3a242d3877fa3c6dd07043f65857d635a4790cdfd936be4016d1441e4dd3b8e7ff1cd1d187d1ab8fc7634e39376e91d06d8666d38632689
 DIST OCE-0.18.3.tar.gz 24633768 BLAKE2B c1923fb6310ea30318251fedac371655a575bf4dfcc4c38e7c748d316416e08c33a3f27bd5db7f5b437265cf2f518651d69a6920f9f487dc7e0065a6406c653f SHA512 6fdeb6ca4ce25361379872ccc465799d4a43407974c4f626b32df695e582b9e553cce17af6a6a7ff46ebed9b813d910ad23eb308a5356dabb9b9bbd4f42a8636
-EBUILD oce-0.18.3.ebuild 1763 BLAKE2B 13ffa2330159736666b46f07fb2592fc03a26d07d9f7bde82b28a735f552dde34cf84aba642b04dddd69862c2c25a1d1bec0b273953cdc8f2e346e75b301ab84 SHA512 934ce2c83353e8879b8b104fef7fb6c0aad2f688ac86279921b2c605edaf3c94aab1f0552fa157018ccd79e547dae6158a6cf6edf5d5a9768ec62d39303fbcf5
+EBUILD oce-0.18.3-r1.ebuild 1809 BLAKE2B d2c1de828d9b1845077f114fe78af3061bcb3d30d15217144c21c6b7f2cadade1b0b3370f8802602ef6397c39956c58f7a0a933e237955afbb197fe2486b3369 SHA512 9537e2bf8ff0234ddbb87c9e4ac42021545167e544f10f947b8f24cdf90bbb319247f213d75ffdf36419e5a8df111d302d44f57586442184f1b124e3d2d23dfe
 MISC metadata.xml 900 BLAKE2B aec66b3c98aaaadf1727f4522a79ad01e8d195ac62799a5112a2d61ca9d916635ff110f99840f97ebad81a1324780d15218757c1b982536ae9e14945699e6b5b SHA512 86a44a573579df2416b949b62fe931172681f36bf7af9f90f7224e3fc433cb7091c3ef757581337aa87d80962a4800fa03e005e5360233f570f7d926553735ba
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 000000000000..bec55d9d36b4
--- /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
index 69c85c7057f2..0835a64d2bf5 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
 }
diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index 6a53363f76a6..ba9de7da7493 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -3,5 +3,5 @@ DIST ParMetis-3.2.0.tar.gz 5291841 BLAKE2B f18b5144f2814a83c3a0b945b1bdbad812cce
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
 DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132
 EBUILD parmetis-3.2.0.ebuild 867 BLAKE2B 98b33fe947e2c2b596d698d6923c18c7a22c144261d1a1ac2132af047be7366a18932e4e40d2e2a513000e0b895127623be456eaaa4b40da8ef56d7e00643c8d SHA512 d7d4ba4be5f372187796ac6c6d9c80a342b54bb7a01034d84676eca9cff2e88f4cda9c4b6170560faa342038b94616a9444690fa13472372cca48c964feaa0ef
-EBUILD parmetis-4.0.3.ebuild 4025 BLAKE2B 5dc751ed37a54d10310642c30bcc6048b150bf965f5458b453ea2a622fe4c1994c69b625ee5540aec4b10d077c78595950eb812953da8e3ae7ada2c7aaba05f4 SHA512 9e613b42f111a8313528a0a293889f6c1a43e30261ce3ca1a53609831f00ba1677e8d66fcc97c487916e13ad9235589f68a458d2110dc5122c7136a526aaff61
+EBUILD parmetis-4.0.3.ebuild 4083 BLAKE2B a26a6988ac29f6e6107626141a377cb732cafb3b17aa6ac8840f8ae1cf604b6009f89f495c3833f7e7ef3cdb3cbb00645b7860463ced3b46d38f5dd5a4c86633 SHA512 902ca8d5d974ebded7aacaaf5d9d099eb42078b4c3e601a4b250c5fa5689caea6a213bab75abdb0b691c6d42026123f81e9046575fef4e877ccbb99ca71f3e80
 MISC metadata.xml 851 BLAKE2B 8c8fc30f50378b05ae59ca1f829da71f2a5cf66dfab03f645ceed4379bc8edc176fb9e5d1f1f83bbb695519a9e14bfd7855e040f56070a344791eb70eed12721 SHA512 6309c02babe871cd0bdaf509caab79dd8b81face5f6f5a39a1473284dbae6859223ae4f65d61fcf08370bac29dfd0e174cb722fbeeaeb5c80d53b749c265c73a
diff --git a/sci-libs/parmetis/parmetis-4.0.3.ebuild b/sci-libs/parmetis/parmetis-4.0.3.ebuild
index 71ee81fcbc9d..bb48b4e600fe 100644
--- a/sci-libs/parmetis/parmetis-4.0.3.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils cmake-utils toolchain-funcs
+EAPI=6
 
 # Check metis version bundled in parmetis tar ball
 # by diff of metis and parmetis tar ball
 METISPV=5.1.0
 METISP=metis-${METISPV}
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Parallel (MPI) unstructured graph partitioning library"
 HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/parmetis/"
@@ -36,6 +35,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# libdir love
 	sed -i \
 		-e '/DESTINATION/s/lib/lib${LIB_SUFFIX}/g' \
@@ -47,7 +48,9 @@ src_prepare() {
 	sed -i \
 		-e '/programs/d' \
 		CMakeLists.txt metis/CMakeLists.txt || die
-	use static-libs && mkdir "${WORKDIR}/${PN}_static"
+	if use static-libs; then
+		mkdir "${WORKDIR}/${PN}_static" || die
+	fi
 
 	if use mpi; then
 		export CC=mpicc CXX=mpicxx
@@ -56,14 +59,15 @@ src_prepare() {
 			-e '/add_subdirectory(include/d' \
 			-e '/add_subdirectory(libparmetis/d' \
 			CMakeLists.txt || die
-
 	fi
 
-	use int64 && \
-		sed -i -e '/IDXTYPEWIDTH/s/32/64/' metis/include/metis.h
+	if use int64; then
+		sed -i -e '/IDXTYPEWIDTH/s/32/64/' metis/include/metis.h || die
+	fi
 
-	use double-precision && \
-		sed -i -e '/REALTYPEWIDTH/s/32/64/' metis/include/metis.h
+	if use double-precision; then
+		sed -i -e '/REALTYPEWIDTH/s/32/64/' metis/include/metis.h || die
+	fi
 }
 
 src_configure() {
@@ -73,16 +77,17 @@ src_configure() {
 			-DMETIS_PATH="${S}/metis"
 			-DGKRAND=ON
 			-DMETIS_INSTALL=ON
-			$(cmake-utils_use openmp OPENMP)
-			$(cmake-utils_use pcre PCRE)
+			-DOPENMP=$(usex openmp)
+			-DPCRE=$(usex pcre)
 			$@
 		)
 		cmake-utils_src_configure
 	}
 	parmetis_configure -DSHARED=ON
-	use static-libs && \
-		sed -i -e '/fPIC/d' metis/GKlib/GKlibSystem.cmake && \
+	if use static-libs; then
+		sed -i -e '/fPIC/d' metis/GKlib/GKlibSystem.cmake || die
 		BUILD_DIR="${WORKDIR}/${PN}_static" parmetis_configure
+	fi
 }
 
 src_compile() {