| 1 |
commit: bc1cab476261e0ffaea7a04cb7347266af8a0cfc |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Sat Jan 30 11:55:41 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Sat Jan 30 11:55:41 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bc1cab47 |
| 7 |
|
| 8 |
sci-libs/optpp: EAPI bump, fix file collision |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 11 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
| 12 |
|
| 13 |
sci-libs/optpp/optpp-2.4.ebuild | 28 +++++++++++++++------------- |
| 14 |
1 file changed, 15 insertions(+), 13 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-libs/optpp/optpp-2.4.ebuild b/sci-libs/optpp/optpp-2.4.ebuild |
| 17 |
index c384880ef..054be4c11 100644 |
| 18 |
--- a/sci-libs/optpp/optpp-2.4.ebuild |
| 19 |
+++ b/sci-libs/optpp/optpp-2.4.ebuild |
| 20 |
@@ -1,13 +1,13 @@ |
| 21 |
-# Copyright 1999-2014 Gentoo Foundation |
| 22 |
+# Copyright 1999-2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=5 |
| 26 |
+EAPI=7 |
| 27 |
|
| 28 |
-inherit autotools-utils toolchain-funcs |
| 29 |
+inherit toolchain-funcs |
| 30 |
|
| 31 |
DESCRIPTION="C++ library for non-linear optimization" |
| 32 |
HOMEPAGE="https://software.sandia.gov/opt++/" |
| 33 |
-SRC_URI="${HOMEPAGE}/downloads/${P}.tar.gz" |
| 34 |
+SRC_URI="https://software.sandia.gov/opt++/downloads/${P}.tar.gz" |
| 35 |
|
| 36 |
LICENSE="LGPL-2" |
| 37 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 38 |
@@ -16,19 +16,21 @@ IUSE="doc mpi static-libs" |
| 39 |
|
| 40 |
RDEPEND=" |
| 41 |
virtual/blas |
| 42 |
- mpi? ( virtual/mpi )" |
| 43 |
-DEPEND="${RDEPEND} |
| 44 |
- virtual/pkgconfig" |
| 45 |
+ virtual/lapack |
| 46 |
+ mpi? ( virtual/mpi ) |
| 47 |
+" |
| 48 |
+DEPEND="${RDEPEND}" |
| 49 |
+BDEPEND="virtual/pkgconfig" |
| 50 |
|
| 51 |
src_configure() { |
| 52 |
- local myeconfargs=( |
| 53 |
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" |
| 54 |
+ econf \ |
| 55 |
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ |
| 56 |
$(use_enable mpi) |
| 57 |
- ) |
| 58 |
- autotools-utils_src_configure |
| 59 |
} |
| 60 |
|
| 61 |
src_install() { |
| 62 |
- autotools-utils_src_install |
| 63 |
- use doc && dohtml -r docs/* |
| 64 |
+ default |
| 65 |
+ # avoid file collision with sci-libs/lapack |
| 66 |
+ rm "${ED}/usr/include/cblas.h" |
| 67 |
+ use doc && dodoc -r docs/* |
| 68 |
} |
Archives