gentoo resync : 30.09.2018

5 files changed, 100 insertions, 7 deletions

diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index e661e6f7536a..ab4898904e76 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,4 +1,6 @@
 DIST starpu-1.1.5.tar.gz 5209660 BLAKE2B 3caf313402a840b8196dc94b6c4f973f87a21878bcbfe1a44ce14218c02290c8701eb3829ce0b89f3029f768c7760ea94c4f307c850e6e42ec877be017c50b4a SHA512 e22a51c601c1997f6a9279e87b22a96f2b25a9c8bb4b715ee3a048ed8af638997610ba72c7b42f61d9401464464c57402feebc76368f9df6ca84fa1305baeedd
-EBUILD starpu-1.1.5-r1.ebuild 2005 BLAKE2B 1e249d69ca9b6ad097a472c6cc0e0ac0ec141bac968dbc291340c10815482a0c3ce64721c81c91f082789496d6ab247863646ed3dafbf780efaab9bcd54692dd SHA512 477d14b9a4a4269c0c61963feb8e7eced569365709128456ca75bae00c8bb30c6f3bdf1950097faf52ab4ab674d784a9a826f3bbbd8d50d622a724c0d374e325
-EBUILD starpu-1.1.5.ebuild 2060 BLAKE2B 265d77704570bc9832c2ee4274eb2e7c7a4ccfe77714ea2ae32b3947df738a971d79ca8ae8ab24bdb815f821f087dedc283042becff12b93c61e5283696e86c2 SHA512 201b79423b2f6b9ba2ae810853427a55e0758b9e8a5136f610f54fc1a4255673c3f78c8caab3099f6740739d0b83eb7c4f2e53c8400c96c66797f63669ae5df7
-MISC metadata.xml 853 BLAKE2B 5873820e19a10507aa381bdc5e80defaa2dac2e65fc923aff907c7c28795205c271b82f756c5255e64ec0147726b2a305573a49d0a7694bf583b59a3e1c5eddd SHA512 43b79ddb2dbc234bf4715ee5d7c7dbd78dd9828f1fbd930198eed2a8dea66ebc28d09c105d2d3fc0685ae8123496b360f20e11b4a199c99743373ad9774bc964
+DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
+EBUILD starpu-1.1.5-r1.ebuild 2009 BLAKE2B 8108a1aad37f34e75c54b7b2ed011fa5afbfd21a436ac9cea63fde602317c61adf3e6b08c7a0e2f726662cc33268697c55f03a46b8d12aab7e958c74e41b6969 SHA512 172f45aa450a7da1d32c9cfdf696fe901b1a484c34cc18f8ecd5f7fe38ee3a90738036a62b45306ae833daffe57ea28ed49f1817e58fcbebd7a6b2f4a28f834b
+EBUILD starpu-1.1.5.ebuild 2064 BLAKE2B 29fb61f9568888e0e0082eaa88eea1c95f628db242ab23d24e193eb6fbe593b47fdd76c9b7efb67baf201849974d55f1924b7945b83a9a7b2608e39492ad75d0 SHA512 34ffc4452b891f419a5674550763619eebe913e4e8c7cdd38dbf5be3a6de0dd0cbdd64fd592010587097ec4b6928c62a2b16443c19053eb313e6263a07edf5f7
+EBUILD starpu-1.2.6.ebuild 2228 BLAKE2B b18ad13549226219c501e5001cff5071b05aaf612ace3eeafd99ac10f3cc4234ffcc9a12c1a316fe8a73723154f2a35b3291e85d1ada7c349045aa92d4e619b3 SHA512 f22759ded89d44f5d37e06ef46ac0747e129244758609df96b2b80280ab931119829652f820dd00545a06abce2253442441acd517c5390862458c150bc29a48e
+MISC metadata.xml 987 BLAKE2B 7b8a207da7c02ecbc5e1daab83666d19d8c1128c6e05376167707ea6b411b4bed2673d9f0c9840284ab5c6f684bed3a67fddb8fc6f25289799470a4e33792e11 SHA512 97e9412721fcec2cdee55d75ce4d8c6eb20af75adfc21bcd556a336a8ee57c138be47afb881fa77180cdc4c27975d000be965f2170f7f29db85056bfbb01cee9
diff --git a/dev-libs/starpu/metadata.xml b/dev-libs/starpu/metadata.xml
index 8e975146000a..e3bd900a60ad 100644
--- a/dev-libs/starpu/metadata.xml
+++ b/dev-libs/starpu/metadata.xml
@@ -15,5 +15,7 @@
   <flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>
   <flag name="gcc-plugin">Enable GCC extension plugin (experimental)</flag>
   <flag name="opencl">Enable OpenCL support</flag>
+  <flag name="spinlock-check">Enable spinlock check</flag>
+  <flag name="valgrind">Enable <pkg>dev-util/valgrind</pkg> support</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/starpu/starpu-1.1.5-r1.ebuild b/dev-libs/starpu/starpu-1.1.5-r1.ebuild
index c6fda9dd478c..0b56d95e947a 100644
--- a/dev-libs/starpu/starpu-1.1.5-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.1.5-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
@@ -19,7 +19,7 @@ IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl
 	static-libs test"
 
 RDEPEND="
-	sys-apps/hwloc:0=
+	<sys-apps/hwloc-2.0.0:0=
 	sci-mathematics/glpk:0=
 	blas? ( virtual/blas )
 	cuda? ( dev-util/nvidia-cuda-toolkit
diff --git a/dev-libs/starpu/starpu-1.1.5.ebuild b/dev-libs/starpu/starpu-1.1.5.ebuild
index ce3ab4e90515..a9865022a16d 100644
--- a/dev-libs/starpu/starpu-1.1.5.ebuild
+++ b/dev-libs/starpu/starpu-1.1.5.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=5
@@ -20,7 +20,7 @@ IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl
 	static-libs test"
 
 RDEPEND="
-	sys-apps/hwloc:0=
+	<sys-apps/hwloc-2.0.0:0=
 	sci-mathematics/glpk:0=
 	blas? ( virtual/blas )
 	cuda? ( dev-util/nvidia-cuda-toolkit
diff --git a/dev-libs/starpu/starpu-1.2.6.ebuild b/dev-libs/starpu/starpu-1.2.6.ebuild
new file mode 100644
index 000000000000..00bae6ae10a6
--- /dev/null
+++ b/dev-libs/starpu/starpu-1.2.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+FORTRAN_STANDARD=90
+FORTRAN_NEEDED="fortran"
+inherit autotools cuda fortran-2 toolchain-funcs
+
+DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
+HOMEPAGE="http://starpu.gforge.inria.fr/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/37744/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="
+	blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl
+	spinlock-check static-libs test valgrind
+"
+
+RDEPEND="
+	sci-mathematics/glpk:0=
+	sys-apps/hwloc:0=
+	blas? ( virtual/blas )
+	cuda? ( dev-util/nvidia-cuda-toolkit
+			x11-drivers/nvidia-drivers
+			blas? ( sci-libs/magma ) )
+	fftw? ( sci-libs/fftw:3.0= )
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	opengl? ( media-libs/freeglut:0= )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen virtual/latex-base )
+	test? ( gcc-plugin? ( dev-scheme/guile ) )
+"
+
+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 cuda && use_enable blas magma) \
+		$(use mpi && use_enable test mpi-check) \
+		$(use_enable cuda) \
+		$(use_enable doc build-doc) \
+		$(use_enable fftw starpufft) \
+		$(use_enable fortran) \
+		$(use_enable gcc-plugin gcc-extensions) \
+		$(use_enable opencl) \
+		$(use_enable opengl opengl-render) \
+		$(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 \
+		--disable-starpu-top
+}
+
+src_test() {
+	emake -j1 showcheck
+}
+
+src_install() {
+	default
+	use doc && dodoc -r doc/doxygen/*.pdf doc/doxygen/html
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+	prune_libtool_files --all
+}