From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C1541382C5 for ; Sat, 30 Jan 2021 11:55:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C72EE09A7; Sat, 30 Jan 2021 11:55:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55BFEE09A7 for ; Sat, 30 Jan 2021 11:55:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 752ED33BF3C for ; Sat, 30 Jan 2021 11:55:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F314C4C for ; Sat, 30 Jan 2021 11:55:52 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1612007741.bc1cab476261e0ffaea7a04cb7347266af8a0cfc.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/optpp/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/optpp/optpp-2.4.ebuild X-VCS-Directories: sci-libs/optpp/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: bc1cab476261e0ffaea7a04cb7347266af8a0cfc X-VCS-Branch: master Date: Sat, 30 Jan 2021 11:55:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0997aaca-02f3-49b3-9197-a4112a814667 X-Archives-Hash: a4078930051a1ee4a299be7ca9bd666e commit: bc1cab476261e0ffaea7a04cb7347266af8a0cfc Author: Andrew Ammerlaan riseup net> AuthorDate: Sat Jan 30 11:55:41 2021 +0000 Commit: Andrew Ammerlaan riseup 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 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/* }