commit: bc1cab476261e0ffaea7a04cb7347266af8a0cfc Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Sat Jan 30 11:55:41 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Sat Jan 30 11:55:41 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bc1cab47
sci-libs/optpp: EAPI bump, fix file collision Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> sci-libs/optpp/optpp-2.4.ebuild | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/sci-libs/optpp/optpp-2.4.ebuild b/sci-libs/optpp/optpp-2.4.ebuild index c384880ef..054be4c11 100644 --- a/sci-libs/optpp/optpp-2.4.ebuild +++ b/sci-libs/optpp/optpp-2.4.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools-utils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="C++ library for non-linear optimization" HOMEPAGE="https://software.sandia.gov/opt++/"; -SRC_URI="${HOMEPAGE}/downloads/${P}.tar.gz" +SRC_URI="https://software.sandia.gov/opt++/downloads/${P}.tar.gz"; LICENSE="LGPL-2" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" @@ -16,19 +16,21 @@ IUSE="doc mpi static-libs" RDEPEND=" virtual/blas - mpi? ( virtual/mpi )" -DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/lapack + mpi? ( virtual/mpi ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_configure() { - local myeconfargs=( - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" + econf \ + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ $(use_enable mpi) - ) - autotools-utils_src_configure } src_install() { - autotools-utils_src_install - use doc && dohtml -r docs/* + default + # avoid file collision with sci-libs/lapack + rm "${ED}/usr/include/cblas.h" + use doc && dodoc -r docs/* }
