commit: 274cf2a12b575170b3d394c15009f910531ce1ad Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Wed May 4 02:37:23 2022 +0000 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> CommitDate: Wed May 4 02:37:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=274cf2a1
sci-libs/ensmallen: bump Closes: https://bugs.gentoo.org/816804 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> sci-libs/ensmallen/Manifest | 3 +-- sci-libs/ensmallen/ensmallen-2.16.2.ebuild | 28 ---------------------- ...allen-2.17.0.ebuild => ensmallen-2.19.0.ebuild} | 26 ++++++++++++++++---- 3 files changed, 22 insertions(+), 35 deletions(-) diff --git a/sci-libs/ensmallen/Manifest b/sci-libs/ensmallen/Manifest index f69c4c39a..46c0306ef 100644 --- a/sci-libs/ensmallen/Manifest +++ b/sci-libs/ensmallen/Manifest @@ -1,2 +1 @@ -DIST ensmallen-2.16.2.tar.gz 1294240 BLAKE2B b388f2c99f289dd20f6d94b5b185d872abc553637c6081ea3a80a3c82ce9ac8b1327496bf3eae6dc5cbf5f4ae12a9fd1e8ccf9c296007f9af9cbfc7560cd0301 SHA512 290932f8e423be7c57d8ba38783a29798df52a7505ded7683f969fa30391398edcca584daca1b1c42977f06180a802d4c3640a9ec24cd787a3914723e4eb6f8d -DIST ensmallen-2.17.0.tar.gz 1318322 BLAKE2B cb74a3bc0118c9e702cc7e4d17326f12df45d5fadc63c8881c5dd2b9a79b004189369e1c7fcb2fc84e0bf7331da3937bffdf75b982de52314487f25191053164 SHA512 49dff47d50beabc74c0eb045f0e995348bc1cc022596de1780cad3e8fc6e6ef6cf97fb23f22c78a0662c377c1dd53d087df799d0fa98ebcc97c03c475b67fd07 +DIST ensmallen-2.19.0.tar.gz 1328515 BLAKE2B 7e381e3e7b8ea335f681770294b57686957104e6074db431d2e3015711faf62123de5c8fc4ee80d8e2f2092fa71c508156957f291760e32bf52d98da60f320f5 SHA512 3c101385d75aa13d21406fd98d4220b5ebd88655ff42039d6d4b22e3a2f21f7dc59dc935c67b8178cbfd104c4c50e611bc787f254973c3410a349648b5ed0342 diff --git a/sci-libs/ensmallen/ensmallen-2.16.2.ebuild b/sci-libs/ensmallen/ensmallen-2.16.2.ebuild deleted file mode 100644 index bd1c0530b..000000000 --- a/sci-libs/ensmallen/ensmallen-2.16.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="header only C++ library for numerical optimization" -HOMEPAGE="https://ensmallen.org"; -SRC_URI="https://github.com/mlpack/ensmallen/archive/${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64" - -LICENSE="BSD" -SLOT="0" -IUSE="openmp test" -RESTRICT="!test? ( test )" - -RDEPEND="sci-libs/armadillo[lapack]" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - -DUSE_OPENMP=$(usex openmp) - -DBUILD_TESTS=$(usex test) - ) - cmake_src_configure -} diff --git a/sci-libs/ensmallen/ensmallen-2.17.0.ebuild b/sci-libs/ensmallen/ensmallen-2.19.0.ebuild similarity index 54% rename from sci-libs/ensmallen/ensmallen-2.17.0.ebuild rename to sci-libs/ensmallen/ensmallen-2.19.0.ebuild index 2dc0d0e83..3c3baedb6 100644 --- a/sci-libs/ensmallen/ensmallen-2.17.0.ebuild +++ b/sci-libs/ensmallen/ensmallen-2.19.0.ebuild @@ -1,12 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="header only C++ library for numerical optimization" -HOMEPAGE="https://ensmallen.org"; +HOMEPAGE=" + https://ensmallen.org + https://github.com/mlpack/ensmallen +" SRC_URI="https://github.com/mlpack/ensmallen/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" @@ -17,12 +20,25 @@ IUSE="openmp test" RESTRICT="!test? ( test )" RDEPEND="sci-libs/armadillo[lapack]" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + test? ( dev-cpp/catch:0 ) +" + +src_prepare() { + rm tests/catch.hpp || die + use test && append-cxxflags "-I/usr/include/catch2" + cmake_src_prepare +} src_configure() { local mycmakeargs=( -DUSE_OPENMP=$(usex openmp) - -DBUILD_TESTS=$(usex test) ) cmake_src_configure } + +src_compile() { + use test && cmake_src_compile ensmallen_tests + return +}
