gentoo resync : 13.11.2021

4 files changed, 6 insertions, 173 deletions

diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index a78bc6da7168..c78b302cf7a1 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,9 +1,6 @@
 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09
-DIST dealii-9.3.0-offline_documentation.tar.gz 342390250 BLAKE2B 5ed1e5d5f7cd6a44f0dccc4b092c241fadc430facb77ec2a9ffb30d00dc13751f0ac08e2f05960584fbb60b26b64fa070c437f392e2e62b4ba1328e4efcd0677 SHA512 ff04cf3690160119041a9dc102ece81c351c41809fe1717cbc95aa97f2f1fe2ccc36e1b4b3045b73056a54fc7e3a27d3d734908760e9c34203b566b328b104b7
-DIST dealii-9.3.0.tar.gz 24458373 BLAKE2B 27cdaee4e7ec9c170e11c5ba9bff8fd654bb2a9452df3402d5639268a6fe31565faa38d240810a0323b7253f2ed665c25fa0948c56b9924f1836531f2414bc92 SHA512 d558b5dda1067f7d995bc5f265614e3bc5e70190d24c1c61047af1ddc52fa007013c51901b9b8eacfbe8b360dffcb22aca87e0019ee09581b928e00c39198c98
 DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18
 DIST dealii-9.3.1.tar.gz 24459280 BLAKE2B c7f1d461017da24efd6f3247217fd1b889e0cbf2ac62c3fd305e03aed90d5ba82b58ceb84d34a84608b833b734e12abc77a63693aaa6eed767b4f5f157233ba0 SHA512 c3ba3e16fa4792bb4f3e85163e67b08271c84faff72c49b858a955851401adf2499e278790803061a61c4024964f6da3f0ef7b09c0370d8d0b5af16b7c3bdaef
-EBUILD dealii-9.3.0-r2.ebuild 5325 BLAKE2B 2ccdf092e3872661328bee434776862e44483fbd747d7d44d652d91a29e0dd3a809813f1dde5cbff5bb80a7b9c58d1561a7b173152175ecf721e105a026736c8 SHA512 330c7d209a2b0050591de9256cc69c583a7a46ae45d8fe68846ca355ded2f1289147cb2a60e9b2eda338cbe46a541f615491bc611e775d3c516c0f45bb4482dd
-EBUILD dealii-9.3.1-r1.ebuild 5422 BLAKE2B 895d7b04be25b9d4d712cae74c52bf48af0481eef22eda28c650e141cc95e9e1157a504dac995af5b3a70aecb95c64f4bccbef3fd3e6a9db7a5359f1471c1da8 SHA512 ba94cce899ee5bc2a76509e582b7f402097a0db57fce5d125830e13253bf34bd52fee0e3110dd09dc27165b686c45f5bb036ec82606a33655463458f010022ed
-EBUILD dealii-9999.ebuild 5376 BLAKE2B 5628c124d9c39b6fdf9ca74097fc56c710241fcbe92b450380cc16c11d4374b287074afde2cf368766e63775de8c1f5591ee00b784144dc0caad90dcf5f05a85 SHA512 3cc0cacdd17236d8d23243d72824d81b5272bed8c29554c35209ea5a33e67387e1bc6bf3c86ef2fc71bc4ba3c36f9ccdb995e3bf0ee58c84295c691f04c4987d
+EBUILD dealii-9.3.1-r1.ebuild 5427 BLAKE2B b31fee6ba46141d188049a9afdf2ad5d0b2669c920508f339993cff86a1c46bc42e8b87186660588fb15046a12cb8865196f242b56245b9036cb1968dc64aebd SHA512 6c3843e330b044cac3db878dc64ae28af1d268ae5c7bfa9b1bfb321ad630c63ae94cebf3fbbd9bae382f8de9b86eb7bdfde16f418947c8008baf1eaaae8e894c
+EBUILD dealii-9999.ebuild 5381 BLAKE2B e62b374b535c2d0811dab0815a89c6dba7a9cf5e53d78dc57819f9ea64116886ef1d91a8cf5f5d742afe9f58907a61a40e3bf36fa783e8d249017c5f503c6c44 SHA512 c2ca23e70f8c6286b4157bdabcbc5b19c123c65f87c41298ab96f7299910fb14ad4cf6937b6eede901bffb0e356bdaa3898ac696f86cc5928d768c911682fa3c
 MISC metadata.xml 2440 BLAKE2B 60d4ffa5f20f88642507203f63dfbbe347ce6399cff96bf7728b929b59fc8d30e8046b7c002d48e59cfac1df73fe8f78b7fd58780673b645cf6549cb56580f39 SHA512 da2925396422db90cc0770faaad06e4bead71a34ef32416e4ab507e0c67d79b75824d1f95d24f9f0c46e2b8ea577229f2fbae6aff163090e058d2df6269b2c87
diff --git a/sci-libs/dealii/dealii-9.3.0-r2.ebuild b/sci-libs/dealii/dealii-9.3.0-r2.ebuild
deleted file mode 100644
index 883959073dba..000000000000
--- a/sci-libs/dealii/dealii-9.3.0-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# deal.II uses its own FindLAPACK.cmake file that calls into the system
-# FindLAPACK.cmake module and does additional internal setup. Do not remove
-# any of these modules:
-CMAKE_REMOVE_MODULES_LIST=""
-
-inherit cmake multilib
-
-DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="https://www.dealii.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dealii/dealii.git"
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
-		doc? (
-			https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
-			)"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="
-	adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
-	cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
-	+lapack metis mpi muparser opencascade p4est petsc
-	scalapack slepc +sparse static-libs sundials symengine trilinos
-"
-
-# TODO: add slepc use flag once slepc is packaged for gentoo-science
-REQUIRED_USE="
-	p4est? ( mpi )
-	slepc? ( petsc )
-	trilinos? ( mpi )"
-
-# FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where
-# the names of the correct include and library directories are not easily
-# accessible. Just fix the version for the time being.
-CAS_VERSION=7.5.1
-
-RDEPEND="dev-libs/boost:=
-	app-arch/bzip2
-	sys-libs/zlib
-	dev-cpp/tbb:=
-	adolc? ( sci-libs/adolc )
-	arpack? ( sci-libs/arpack[mpi=] )
-	assimp? ( media-libs/assimp )
-	cuda? ( dev-util/nvidia-cuda-sdk )
-	ginkgo? ( sci-libs/ginkgo )
-	gmsh? ( sci-libs/gmsh )
-	gsl? ( sci-libs/gsl:= )
-	hdf5? ( sci-libs/hdf5[mpi=] )
-	lapack? ( virtual/lapack )
-	metis? (
-		>=sci-libs/metis-5
-		mpi? ( >=sci-libs/parmetis-4 )
-	)
-	mpi? ( virtual/mpi )
-	muparser? ( dev-cpp/muParser )
-	opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= )
-	p4est? ( sci-libs/p4est[mpi] )
-	petsc? ( sci-mathematics/petsc[mpi=] )
-	scalapack? ( sci-libs/scalapack )
-	slepc? ( sci-mathematics/slepc[mpi=] )
-	sparse? ( sci-libs/umfpack )
-	sundials? ( sci-libs/sundials:= )
-	symengine? ( >=sci-libs/symengine-0.4:= )
-	trilinos? ( sci-libs/trilinos )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] dev-lang/perl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
-)
-
-src_configure() {
-	# deal.II needs a custom build type:
-	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
-
-	local mycmakeargs=(
-		-DDEAL_II_PACKAGE_VERSION="${PV}"
-		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
-		-DDEAL_II_ALLOW_AUTODETECTION=OFF
-		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
-		-DDEAL_II_COMPILE_EXAMPLES=OFF
-		-DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
-		-DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
-		-DDEAL_II_COMPILE_EXAMPLES=OFF
-		-DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
-		-DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
-		-DDEAL_II_SHARE_RELDIR="share/${PN}"
-		-DDEAL_II_WITH_ZLIB=ON
-		-DDEAL_II_WITH_ADOLC="$(usex adolc)"
-		-DDEAL_II_WITH_ASSIMP="$(usex assimp)"
-		-DDEAL_II_WITH_ARPACK="$(usex arpack)"
-		-DDEAL_II_WITH_CUDA="$(usex cuda)"
-		-DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
-		-DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
-		-DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
-		-DDEAL_II_WITH_GMSH="$(usex gmsh)"
-		-DDEAL_II_WITH_GSL="$(usex gsl)"
-		-DDEAL_II_WITH_HDF5="$(usex hdf5)"
-		-DDEAL_II_WITH_LAPACK="$(usex lapack)"
-		-DDEAL_II_WITH_METIS="$(usex metis)"
-		-DDEAL_II_WITH_MPI="$(usex mpi)"
-		-DDEAL_II_WITH_MUPARSER="$(usex muparser)"
-		-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
-		-DDEAL_II_WITH_P4EST="$(usex p4est)"
-		-DDEAL_II_WITH_PETSC="$(usex petsc)"
-		-DDEAL_II_WITH_SCALAPACK="$(usex scalapack)"
-		-DDEAL_II_WITH_SLEPC="$(usex slepc)"
-		-DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
-		-DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
-		-DDEAL_II_WITH_UMFPACK="$(usex sparse)"
-		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
-		-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
-		-DDEAL_II_WITH_TBB=ON
-		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
-	)
-
-	# Do a little dance for purely cosmetic "QA" reasons.
-	use opencascade && mycmakeargs+=(
-		-DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade-${CAS_VERSION}"
-		-DOPENCASCADE_INCLUDE_DIR="${CASROOT}/include/opencascade-${CAS_VERSION}"
-	)
-
-	# Do a little dance for purely cosmetic "QA" reasons. The build system
-	# does query for the highest instruction set first and skips the other
-	# variables if a "higher" variant is set
-	if use cpu_flags_x86_avx512f; then
-		mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
-	elif use cpu_flags_x86_avx; then
-		mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
-	elif use cpu_flags_x86_avx; then
-		mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	if use doc && [[ ${PV} != *9999* ]]; then
-		# copy missing images to the build directory:
-		cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
-			"${BUILD_DIR}"/doc/doxygen/deal.II || die
-		# replace links:
-		sed -i \
-			's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
-			"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
-	fi
-	cmake_src_install
-
-	# decompress the installed example sources:
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-libs/dealii/dealii-9.3.1-r1.ebuild b/sci-libs/dealii/dealii-9.3.1-r1.ebuild
index ef012f290e0f..d04780a09d95 100644
--- a/sci-libs/dealii/dealii-9.3.1-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1-r1.ebuild
@@ -43,7 +43,7 @@ REQUIRED_USE="
 # FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where
 # the names of the correct include and library directories are not easily
 # accessible. Just fix the version for the time being.
-CAS_VERSION=7.5.2
+CAS_VERSION=7.5.3
 
 RDEPEND="dev-libs/boost:=
 	app-arch/bzip2
@@ -62,7 +62,7 @@ RDEPEND="dev-libs/boost:=
 		>=sci-libs/metis-5
 		mpi? ( >=sci-libs/parmetis-4 )
 	)
-	mpi? ( virtual/mpi )
+	mpi? ( virtual/mpi[cxx] )
 	muparser? ( dev-cpp/muParser )
 	opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= )
 	p4est? ( sci-libs/p4est[mpi] )
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index f1bc0ba2589b..3b0443a7d4cc 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -43,7 +43,7 @@ REQUIRED_USE="
 # FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where
 # the names of the correct include and library directories are not easily
 # accessible. Just fix the version for the time being.
-CAS_VERSION=7.5.2
+CAS_VERSION=7.5.3
 
 RDEPEND="dev-libs/boost:=
 	app-arch/bzip2
@@ -63,7 +63,7 @@ RDEPEND="dev-libs/boost:=
 		>=sci-libs/metis-5
 		mpi? ( >=sci-libs/parmetis-4 )
 	)
-	mpi? ( virtual/mpi )
+	mpi? ( virtual/mpi[cxx] )
 	muparser? ( dev-cpp/muParser )
 	opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= )
 	p4est? ( sci-libs/p4est[mpi] )