6 files changed, 109 insertions, 2 deletions
diff --git a/dev-cpp/kokkos/Manifest b/dev-cpp/kokkos/Manifest
index aead5200cb02..5a04b2ab21bf 100644
--- a/dev-cpp/kokkos/Manifest
+++ b/dev-cpp/kokkos/Manifest
@@ -1 +1,2 @@
 DIST kokkos-3.7.1.tar.gz 2305103 BLAKE2B c94493077190c1e5d2681d0e138012fcd82f91a1f7616ea7373f3c12f577a195937d507dd2d64f82902fa6760f63da8b3e2c1ef31a7114b9da21841280e22e33 SHA512 97cb7e05aec145ba9adae30b20ae3138a532db3a56cdd5e092d8f9c1e1788efe7a6f721282e2a5c5bf9c0da4c53d28f30b27fcb546b68aa8eaa589a362eb40c1
+DIST kokkos-4.0.1.tar.gz 2322402 BLAKE2B a4aba2f7ffe7b7c93051ad65d398f442b753975eceb3f83ed1bff0b8c468e4ffdcb6437989e740c65fc550f17ef8ddf78ca50ca881d3953f886309dc7d6fc597 SHA512 cf6742f4be777b52673858b49cf68fdf335e760509688483e62ef41af5026070f69dcf39d010134c85dc6c4868f82a38900872be11ed43190432c8530b90deee
diff --git a/dev-cpp/kokkos/kokkos-4.0.1.ebuild b/dev-cpp/kokkos/kokkos-4.0.1.ebuild
new file mode 100644
index 000000000000..fb34ce9b8546
--- /dev/null
+++ b/dev-cpp/kokkos/kokkos-4.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="C++ Performance Portability Programming EcoSystem"
+HOMEPAGE="https://github.com/kokkos"
+MY_PV="$(ver_cut 1-2).0$(ver_cut 3)"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 -x86"
+IUSE="+openmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-apps/hwloc:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_INCLUDEDIR=include/kokkos
+		-DKokkos_ENABLE_TESTS=$(usex test)
+		-DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
+		-DKokkos_ENABLE_SERIAL=ON
+		-DKokkos_ENABLE_HWLOC=ON
+		-DKokkos_HWLOC_DIR="${EPREFIX}/usr"
+		-DKokkos_ENABLE_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Contains "death tests" which are known/expected(?) to fail
+		# https://github.com/kokkos/kokkos/issues/3033
+		# bug #791514
+		-E "(KokkosCore_UnitTest_OpenMP|KokkosCore_UnitTest_Serial)"
+	)
+
+	cmake_src_test
+}
diff --git a/dev-cpp/kokkos/metadata.xml b/dev-cpp/kokkos/metadata.xml
index d6ca948f0873..a201f557fceb 100644
--- a/dev-cpp/kokkos/metadata.xml
+++ b/dev-cpp/kokkos/metadata.xml
@@ -5,6 +5,10 @@
   <email>tamiko@gentoo.org</email>
   <name>Matthias Maier</name>
  </maintainer>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
  
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-cpp/taskflow/Manifest b/dev-cpp/taskflow/Manifest
index faea89a0e6f3..356b679b2e87 100644
--- a/dev-cpp/taskflow/Manifest
+++ b/dev-cpp/taskflow/Manifest
@@ -1,2 +1,3 @@
 DIST taskflow-3.3.0.tar.gz 64446007 BLAKE2B 07878a03bd90af64914f1dc80850bcf5d4140f20ecfa998237039b6f37cc668e8c2b5dffafb75f4518209b3ac01f9935f5e30a020871334f131e6fe7654748bf SHA512 08ab20bf38927d49c8332fc103cb7b4b6358efa06466cb8471f2004eb27b79b9eadc9971ec4acd110c8f369686b6f99bf3e21192285c3f28b9cb855bfd9ab0b5
 DIST taskflow-3.4.0.tar.gz 64152239 BLAKE2B cec78155bc8db3ac7fb6e61ece8c1bb4697c6655122cdcd987405ce21b1f4f30570debda8a7cccf43d089bac791cb18654e829380e244addae2875ad4fdb47c5 SHA512 e0e3589feec65677c4de6583a70c14f90826f2177636010955c597a3232f7842431c697eae711318f4a64fae52ac3e33e2d0739ef36bb7c57698110b6fa4740d
+DIST taskflow-3.6.0.tar.gz 66335249 BLAKE2B bcdc6d721e32b7c40f65ed5bd115d2c0083663e8b51c0e4460baa5f62e576382a45e8da735119b577d8a6ae7a64c72431654471a3b8335997fdf4f9191ad64af SHA512 1bf17b69cdb29b982fc74b9091f5b6c8fc4fd3004b26afe7e73e71569738e492cf8663b71d98cfbc4e240c08ceb8a99bf51cccce95254710722f89929a4bbea8
diff --git a/dev-cpp/taskflow/taskflow-3.6.0.ebuild b/dev-cpp/taskflow/taskflow-3.6.0.ebuild
new file mode 100644
index 000000000000..10460bc1e66a
--- /dev/null
+++ b/dev-cpp/taskflow/taskflow-3.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Modern C++ Parallel Task Programming"
+HOMEPAGE="https://taskflow.github.io"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/taskflow/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/taskflow-${PV}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/taskflow-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/doctest )"
+
+HTML_DOCS=( docs/. )
+
+PATCHES=(
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# TODO: enable CUDA via USE flag
+	local mycmakeargs=(
+		-DTF_BUILD_CUDA=OFF
+		-DTF_BUILD_EXAMPLES=$(usex examples)
+		-DTF_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/taskflow/taskflow-9999.ebuild b/dev-cpp/taskflow/taskflow-9999.ebuild
index 67272062e500..0a0560906b3d 100644
--- a/dev-cpp/taskflow/taskflow-9999.ebuild
+++ b/dev-cpp/taskflow/taskflow-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/taskflow-${PV}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/taskflow-${PV}"
 fi