gentoo resync : 28.04.2021

3 files changed, 6 insertions, 55 deletions

diff --git a/dev-cpp/kokkos/Manifest b/dev-cpp/kokkos/Manifest
index a582ebbda9a0..6947bcddd90d 100644
--- a/dev-cpp/kokkos/Manifest
+++ b/dev-cpp/kokkos/Manifest
@@ -1,7 +1,5 @@
 DIST kokkos-3.0.00.tar.gz 1923287 BLAKE2B 4a2935e9388b3d577d6ce8678cad37830970222e6ce8a9c3db67633cb521440f14fdb380f03d3c77cd5ade85abe94aef97e9cc4949cc3a140fae958e0c15fff8 SHA512 c9daf62a2c92462c815aa241934aca5720bac8f88195635ae5a3ff4111d289a48898d32358b91e120756d3412820050297a76f44828f4cbc0b2b837a736e84aa
-DIST kokkos-3.1.00.tar.gz 1972408 BLAKE2B 47c3eb83526dd13430a3b7049a98169d15ef73c6d2b3943c5600a153d28a9c6a0d6ee0b8eda1aac5f1b53556c5cee1680ce92a90f97b1b2741e1e7f0c9222486 SHA512 7933542c24e137052d630a503d707912295022863f2d47c89c4a35a9c8a70514763d89e321c66a3878575e661461ede45ac44d74cf45eca2470e7f57840d5c0c
 DIST kokkos-3.1.01.tar.gz 1972707 BLAKE2B fe31556ecba6b01ed6e480f0cb4ca4d7dc487d6b2a7e52df94d0e93b864ed5269a752f4fcdbacb55383e9dee3b72236f121b67d2f5eed10f3351219b063e7099 SHA512 4fa428ec33ec207147b3fcc5e0d297bcff4ed772ba6baa24ccaf56b691b72b70c69bd48fdf134f4e78234bf755377fe01a31611a41539c2d211ba9caed24b1f2
 EBUILD kokkos-3.0.00.ebuild 1023 BLAKE2B a1d9bca6bea7652c08ee22255df77af679984dc8373fef66ad3ee26043db976919a89b90305fcf2b2150fb50d5c449d5b42fa75489cac8c860a9f6c51722f43e SHA512 8964a283ea1e760085c0b9d5f9fd1427e9ba059f4fd1587685bafa96f06a2c98404104504a92fb224404336a0c92375a1ad4e55de9311044ebfd6725d7ba169c
-EBUILD kokkos-3.1.00.ebuild 1024 BLAKE2B 957eafe9df459038c3795781e6405c27a09b63e7d19f01f34bb5c424fb675b91dab1beb8a092f468b10601f77103170f510744b6517a8318fc6f8aad7504ca75 SHA512 8df43769f7bd8cb238340095ada12834af14197f89f968a827ddc0f1cc60942311a1c4a50301ec390b82cf9a287a7813ea28e2abbeaaa42d0a239acafac185b5
-EBUILD kokkos-3.1.01.ebuild 1024 BLAKE2B 957eafe9df459038c3795781e6405c27a09b63e7d19f01f34bb5c424fb675b91dab1beb8a092f468b10601f77103170f510744b6517a8318fc6f8aad7504ca75 SHA512 8df43769f7bd8cb238340095ada12834af14197f89f968a827ddc0f1cc60942311a1c4a50301ec390b82cf9a287a7813ea28e2abbeaaa42d0a239acafac185b5
+EBUILD kokkos-3.1.01.ebuild 1001 BLAKE2B 953a51a0b3397e8e5d7560e9e9dff920bddb669b47e2f0832f78cb47cc721268682d5d04dbf186919f9c76f0994f6c041b8349753dc7a353ee94f8e0bcbb7a5a SHA512 67d6224e2e2ee9437d80650c00707cd0d77c21c6b8fdf868c16f39af065d711bdd29da862249ecc9aee29793c615f12a5e0de1e7cf5078faa748e80545db112c
 MISC metadata.xml 253 BLAKE2B 58dd329781b98af52e191fbc6b1de24c80612678e467d126dc77ff0559c12eb8fb48546ef7a240f64fadbe289039adfb87dd2b0c8ae01bd9210bac81b2b385bf SHA512 a931cf8d295191e246377a75882955524e9e3a86aeacf4a5067c0025b6a03d608cdfa6763cfc53ba4a00cd6ee4b7db42d1a042dda5e74e578047ad42ad92be50
diff --git a/dev-cpp/kokkos/kokkos-3.1.00.ebuild b/dev-cpp/kokkos/kokkos-3.1.00.ebuild
deleted file mode 100644
index b8bceaa6fda8..000000000000
--- a/dev-cpp/kokkos/kokkos-3.1.00.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Kokkos C++ Performance Portability Programming EcoSystem"
-HOMEPAGE="https://github.com/kokkos"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${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}"
-BDEPEND=""
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && \
-		use openmp && ! tc-has-openmp ; then
-			die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_INCLUDEDIR=include/kokkos
-		-DKokkos_ENABLE_TESTS=$(usex test)
-		-DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
-		-DKokkos_ENABLE_DEPRECATED_CODE=ON
-		-DKokkos_ENABLE_SERIAL=ON
-		-DKokkos_ENABLE_HWLOC=ON
-		-DKokkos_HWLOC_DIR="${EPREFIX}/usr"
-		-DKokkos_ENABLE_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/kokkos/kokkos-3.1.01.ebuild b/dev-cpp/kokkos/kokkos-3.1.01.ebuild
index b8bceaa6fda8..2456f83dc2df 100644
--- a/dev-cpp/kokkos/kokkos-3.1.01.ebuild
+++ b/dev-cpp/kokkos/kokkos-3.1.01.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs
+inherit cmake toolchain-funcs
 
-DESCRIPTION="Kokkos C++ Performance Portability Programming EcoSystem"
+DESCRIPTION="C++ Performance Portability Programming EcoSystem"
 HOMEPAGE="https://github.com/kokkos"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -15,9 +15,7 @@ KEYWORDS="~amd64 -x86"
 IUSE="+openmp test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	sys-apps/hwloc
-	"
+DEPEND="sys-apps/hwloc"
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
@@ -41,5 +39,5 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }