gentoo resync : 30.10.2021

3 files changed, 112 insertions, 1 deletions

diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 0ff7ab619bf0..2a49fe15b18c 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,5 +1,7 @@
 DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
 DIST starpu-1.3.8.tar.gz 12895856 BLAKE2B f04096b03d5c035fb9cc6c193a482bfe9cd348c2245ac9e5cc22ad7595f8bd61ee71d7734c6e10db227c4185fc5719d3de804d82639ce0446b923ecb5c0c4249 SHA512 cd1a8c0246d91c6d405576329222292577282fa175201c758a9d5bd75d827ff59c7e2d9418082ffd5f14a26272fef449eed4a34778d0376d44c3594a2033849a
+DIST starpu-1.3.9.tar.gz 12961635 BLAKE2B a6eede7c369cacaba5b7330bd6a003f624f58972432d43619aeaf47c1e9e16da871a18c24f8f511f002cb7667c247c13562b4fed2348e2af4f8e402418e1801d SHA512 7150fc11828e8f9ede036af782ff0f89946d9aaed341771436eb8cbb91be7b0faccb6280a5c3bd63800d1a73ec8518a45a02d9f3e137007751cf1c5979678295
 EBUILD starpu-1.2.6-r1.ebuild 2240 BLAKE2B e3d592e26f28f5a0602504586da7c884f69de8ac8b95b1e11e973a4eb8b78d11a60e1c491543195686c4665b34f61684bf5c559bbbb85426513161f1fa647b19 SHA512 2b4a0497aac7cbdede5ebcd18ffe6ff424d4abd26f75f49366cb14125656f48a2ff5c3f1e7853219924ce13e3a7c90b927e580a2b6a7835998b01af5407f576a
-EBUILD starpu-1.3.8.ebuild 2267 BLAKE2B 3d3f70701dfcf6ec74ab39c75b7552681e31fde47557148a80db8e76efc902a07ea842a27f7be4884c440015bc0efbdf70cd65a0c00013afeae029627d250b86 SHA512 7a70618315d6c3fbcb675ef2e5e17e4af383aa58facbba1c7566019ec148ab390a51a12e6477dd24c7d973474049588057a6889f5a69543aeeff0b16bad3fd61
+EBUILD starpu-1.3.8.ebuild 2714 BLAKE2B 566fac6d80e57eb1cf3d3bd9561f299df6def4a57a0985f91d7942b3425ebc3c7156f363e4be49038298d4888586789cabce2bee48adf7860ecc1e7f009318c6 SHA512 ca3d3e98f826392182325a3ff2c26ba5c877f4b02bdbc402cf5bab4856e0cbd6432fb42b97e5b297a15cc8d395c72133ab814fd5370ad6ba896a78d1009812e3
+EBUILD starpu-1.3.9.ebuild 2714 BLAKE2B 566fac6d80e57eb1cf3d3bd9561f299df6def4a57a0985f91d7942b3425ebc3c7156f363e4be49038298d4888586789cabce2bee48adf7860ecc1e7f009318c6 SHA512 ca3d3e98f826392182325a3ff2c26ba5c877f4b02bdbc402cf5bab4856e0cbd6432fb42b97e5b297a15cc8d395c72133ab814fd5370ad6ba896a78d1009812e3
 MISC metadata.xml 988 BLAKE2B bfede0842fa1b62f1d0d75100b4efdbaf79940933ef579d9f52344df20a9b235a9e2f77739f488cb1906a89349d470738636d17dd4e2083235c7a1cfb2b55afe SHA512 5755a2d92298f299a164b60d40040edac8eb6ac86205e214cc89bbd7a0c71aa097315a9a107b358a9e9238d7ebfbf57ef33168a368ec4a2cec970636b42e7838
diff --git a/dev-libs/starpu/starpu-1.3.8.ebuild b/dev-libs/starpu/starpu-1.3.8.ebuild
index 748f3df483f0..33fa716eb10b 100644
--- a/dev-libs/starpu/starpu-1.3.8.ebuild
+++ b/dev-libs/starpu/starpu-1.3.8.ebuild
@@ -82,6 +82,14 @@ src_configure() {
 }
 
 src_test() {
+	# Avoids timeouts in e.g. starpu_task_wait_for_all, starpu_task_wait
+	# See bug #803158
+	# https://gitub.u-bordeaux.fr/starpu/starpu/-/blob/master/contrib/ci.inria.fr/job-1-check.sh
+	export STARPU_TIMEOUT_ENV=3600
+	export MPIEXEC_TIMEOUT=3600
+
+	# Could switch(?) to quick check if timeouts end up being a real problem, but let's not
+	# do it for now. https://gitub.u-bordeaux.fr/starpu/starpu/-/blob/master/contrib/ci.inria.fr/job-1-check.sh#L85
 	MAKEOPTS='-j1' default
 }
 
diff --git a/dev-libs/starpu/starpu-1.3.9.ebuild b/dev-libs/starpu/starpu-1.3.9.ebuild
new file mode 100644
index 000000000000..33fa716eb10b
--- /dev/null
+++ b/dev-libs/starpu/starpu-1.3.9.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="fortran"
+FORTRAN_STANDARD=90
+
+inherit autotools cuda fortran-2 toolchain-funcs
+
+DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
+HOMEPAGE="https://starpu.gitlabpages.inria.fr/"
+SRC_URI="https://files.inria.fr/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="
+	blas cuda doc examples fftw fortran hdf5 mpi opencl opengl
+	openmp spinlock-check static-libs test valgrind
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-mathematics/glpk:0=
+	>=sys-apps/hwloc-2.3.0:0=
+	blas? ( virtual/blas )
+	cuda? ( dev-util/nvidia-cuda-toolkit
+			x11-drivers/nvidia-drivers )
+	fftw? ( sci-libs/fftw:3.0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	opengl? ( media-libs/freeglut:0= )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen virtual/latex-base )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die
+	sed -i -e 's/-O3//g;s/-D_FORTIFY_SOURCE=1//g' configure.ac || die
+	eautoreconf
+
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+
+	econf \
+		$(use mpi && use_enable test mpi-check) \
+		$(use_enable cuda) \
+		$(use_enable doc build-doc) \
+		$(use_enable doc build-doc-pdf) \
+		$(use_enable fftw starpufft) \
+		$(use_enable fortran) \
+		$(use_enable hdf5) \
+		$(use_enable mpi) \
+		$(use_enable opencl) \
+		$(use_enable opengl opengl-render) \
+		$(use_enable openmp) \
+		$(use_enable spinlock-check) \
+		$(use_enable static-libs static) \
+		$(use_enable valgrind) \
+		$(use_with mpi mpicc "$(type -P mpicc)") \
+		--disable-build-examples \
+		--disable-debug \
+		--disable-fstack-protector-all \
+		--disable-full-gdb-information
+}
+
+src_test() {
+	# Avoids timeouts in e.g. starpu_task_wait_for_all, starpu_task_wait
+	# See bug #803158
+	# https://gitub.u-bordeaux.fr/starpu/starpu/-/blob/master/contrib/ci.inria.fr/job-1-check.sh
+	export STARPU_TIMEOUT_ENV=3600
+	export MPIEXEC_TIMEOUT=3600
+
+	# Could switch(?) to quick check if timeouts end up being a real problem, but let's not
+	# do it for now. https://gitub.u-bordeaux.fr/starpu/starpu/-/blob/master/contrib/ci.inria.fr/job-1-check.sh#L85
+	MAKEOPTS='-j1' default
+}
+
+src_install() {
+	default
+	use doc && dodoc -r doc/doxygen/*.pdf doc/doxygen/html
+	use examples && dodoc -r examples
+	find "${ED}" -name '*.la' -delete || die
+}