gentoo resync : 17.02.2020

5 files changed, 94 insertions, 66 deletions

diff --git a/dev-libs/libflatarray/Manifest b/dev-libs/libflatarray/Manifest
index d89f470a1f2c..89ae943db55a 100644
--- a/dev-libs/libflatarray/Manifest
+++ b/dev-libs/libflatarray/Manifest
@@ -1,5 +1,5 @@
 DIST libflatarray-0.2.0.tar.bz2 34193 BLAKE2B 8f409b097a0dfe037e9fdd1f8ed3b0ba86ef9ab816219b9357d119afa1c7236c0a467d9705fd5050ccbdc54ee40b811d2daee0a697f8ba720f037294d0305d52 SHA512 96050c08479429baf22a9694ca7354e1ab4fa892976d4098419e2863cac8e21aec586116a1702a5050753febd9b9321a14fc4da5d6487cf75a574562ec4d4647
 DIST libflatarray-0.3.0.tar.bz2 104544 BLAKE2B 9ac490a526fbd71478ac569538bad28e01a1a91bd71d37e85bf89181e856e79b2dec6af5415f238e5f72fbbe57cda59ee87ebd79cd273887061e2bbb93a7ce31 SHA512 c58339cdadf98f552d2f1b440a293c48923f32fc43a5a06ee8b8a40835a5f6c21514f7a9efa0ff23930ab9fdda8d4389641ec83c589e1982dbf5a3f75d2ffd37
-EBUILD libflatarray-0.2.0.ebuild 658 BLAKE2B c8de67ef09735bd3770d7b0e2da4f0fd57792cd84d9695385e25c9b524e84b3c18ae4e445f20d2e22532692da261606512e170a8912b4c6caf23606a10eb7ceb SHA512 2b6a365e688efde4fe01c474392390c6c58941c69041f4909f23c454bb5614a0e992fb01350695c4e29b98d8efe32fa94e4138b45b7ebab42f39fe4b682fb460
-EBUILD libflatarray-0.3.0.ebuild 658 BLAKE2B c8de67ef09735bd3770d7b0e2da4f0fd57792cd84d9695385e25c9b524e84b3c18ae4e445f20d2e22532692da261606512e170a8912b4c6caf23606a10eb7ceb SHA512 2b6a365e688efde4fe01c474392390c6c58941c69041f4909f23c454bb5614a0e992fb01350695c4e29b98d8efe32fa94e4138b45b7ebab42f39fe4b682fb460
+EBUILD libflatarray-0.2.0-r1.ebuild 949 BLAKE2B 86ece267ca65c8d18f942c121111d1958b3e35689c0cad86d0cdded924bb5ca8c32a669d383c461e1a02d3b9232a52e59e53731ce965e660ef207a98053cbfe0 SHA512 77dbb17cb4fd34fea2ab6741d1eababdbf22187b15180414c7d7540ac050013f006417068870a62a65a67004f3b554ea3c99bbca8983576a7ba711182f22f38d
+EBUILD libflatarray-0.3.0-r1.ebuild 979 BLAKE2B 987158e0f8ae9b7292c8e9138cf1525d681c290db424031aa84ccdc6e82f06148e74067b0d478def1fa68936edeb6f9f9aa82be54a982218c3dacf5dec32bd60 SHA512 8096e2881688ec361f25edda46d47bdf5044d015aba1d025fc7ca0650abd346d116a1cb5bd832a22f71e083175b876811555bafbd02b38c7aeeea64f6c368da1
 MISC metadata.xml 583 BLAKE2B 4ec277b4e2e93a1cfb155546d4be3b9effdbf2dc6ff1ebb5c6adee9287d2d344537c91f629a0e7b79a12870759cf0c4a959268397db3e3684b5562021d38543f SHA512 0aba9d676149fe1879985c28dcafe1222db2c3d14007bf7add67cbbaaff2462f983f857bd088557aaa7e5edd977a435d8669b1d313924f98e5b528b1fa9a31ad
diff --git a/dev-libs/libflatarray/libflatarray-0.2.0-r1.ebuild b/dev-libs/libflatarray/libflatarray-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..726b836fc767
--- /dev/null
+++ b/dev-libs/libflatarray/libflatarray-0.2.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake cuda
+
+DESCRIPTION="Struct of arrays library with object oriented interface for C++"
+HOMEPAGE="
+	http://www.libgeodecomp.org/libflatarray.html
+	https://github.com/STEllAR-GROUP/libflatarray"
+SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cuda examples"
+RESTRICT="test"
+
+DEPEND=">=dev-libs/boost-1.48
+	cuda? ( dev-util/nvidia-cuda-toolkit )"
+
+src_prepare() {
+	cmake_src_prepare
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CUDA=$(usex cuda)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}
+		dodoc -r examples/
+		dodoc -r "${WORKDIR}"/${P}_build/examples/
+		find "${ED}"/usr/share/doc/${PF} -iname "*cmake*" -exec rm -r {} + || die
+	fi
+}
diff --git a/dev-libs/libflatarray/libflatarray-0.2.0.ebuild b/dev-libs/libflatarray/libflatarray-0.2.0.ebuild
deleted file mode 100644
index 0f58f1ff81ac..000000000000
--- a/dev-libs/libflatarray/libflatarray-0.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda
-
-SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DESCRIPTION="Struct of arrays library with object oriented interface for C++"
-HOMEPAGE="http://www.libgeodecomp.org/libflatarray.html"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="cuda doc"
-
-DEPEND="
-	doc? ( app-doc/doxygen )
-	cuda? ( dev-util/nvidia-cuda-toolkit )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CUDA=$(usex cuda)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libflatarray/libflatarray-0.3.0-r1.ebuild b/dev-libs/libflatarray/libflatarray-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..91d438f3f275
--- /dev/null
+++ b/dev-libs/libflatarray/libflatarray-0.3.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake cuda
+
+DESCRIPTION="Struct of arrays library with object oriented interface for C++"
+HOMEPAGE="
+	http://www.libgeodecomp.org/libflatarray.html
+	https://github.com/STEllAR-GROUP/libflatarray"
+SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cuda examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	cuda? ( dev-util/nvidia-cuda-toolkit )"
+
+src_prepare() {
+	cmake_src_prepare
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CUDA=$(usex cuda)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}
+		dodoc -r examples/
+		dodoc -r "${WORKDIR}"/${P}_build/examples/
+		find "${ED}"/usr/share/doc/${PF} -iname "*cmake*" -exec rm -r {} + || die
+	fi
+}
+
+src_test() {
+	cmake_build check
+}
diff --git a/dev-libs/libflatarray/libflatarray-0.3.0.ebuild b/dev-libs/libflatarray/libflatarray-0.3.0.ebuild
deleted file mode 100644
index 0f58f1ff81ac..000000000000
--- a/dev-libs/libflatarray/libflatarray-0.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda
-
-SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DESCRIPTION="Struct of arrays library with object oriented interface for C++"
-HOMEPAGE="http://www.libgeodecomp.org/libflatarray.html"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="cuda doc"
-
-DEPEND="
-	doc? ( app-doc/doxygen )
-	cuda? ( dev-util/nvidia-cuda-toolkit )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CUDA=$(usex cuda)
-	)
-	cmake-utils_src_configure
-}