* [gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-clp/
@ 2020-05-08 12:21 Michael Orlitzky
0 siblings, 0 replies; 4+ messages in thread
From: Michael Orlitzky @ 2020-05-08 12:21 UTC (permalink / raw
To: gentoo-commits
commit: be3d420f3eb198266b7eda1129c91d5fd668a1b4
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed May 6 22:56:17 2020 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri May 8 12:20:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3d420f
sci-libs/coinor-clp: add an "<upstream>" tag to metadata.xml.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-libs/coinor-clp/metadata.xml | 45 +++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 19 deletions(-)
diff --git a/sci-libs/coinor-clp/metadata.xml b/sci-libs/coinor-clp/metadata.xml
index 49d8540dde0..00d23848636 100644
--- a/sci-libs/coinor-clp/metadata.xml
+++ b/sci-libs/coinor-clp/metadata.xml
@@ -1,23 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription lang="en">
- Clp (Coin-or linear programming) is an open-source linear
- programming solver written in C++. It is primarily meant to be used
- as a callable library, but a basic, stand-alone executable version
- is also available. It is designed to find solutions of constrained
- linear mathematical optimization problems.
-</longdescription>
-<use>
- <flag name="glpk">Enable GNU Linear Programming Kit
- <pkg>sci-mathematics/glpk</pkg> support</flag>
- <flag name="metis">Enable partitioning with
- <pkg>sci-libs/metis</pkg></flag>
- <flag name="mumps">Enable <pkg>sci-libs/mumps</pkg> support</flag>
- <flag name="sparse">Enable support for sparse matrix with <pkg>sci-libs/cholmod</pkg></flag>
-</use>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Clp (Coin-OR linear programming) is an open-source linear
+ programming solver written in C++. It is primarily meant to be
+ used as a callable library, but a basic, stand-alone executable
+ version is also available. It is designed to find solutions of
+ constrained linear mathematical optimization problems.
+ </longdescription>
+ <use>
+ <flag name="glpk">
+ Enable GNU Linear Programming Kit
+ <pkg>sci-mathematics/glpk</pkg> support
+ </flag>
+ <flag name="metis">Enable partitioning with
+ <pkg>sci-libs/metis</pkg></flag>
+ <flag name="mumps">Enable <pkg>sci-libs/mumps</pkg> support</flag>
+ <flag name="sparse">
+ Enable support for sparse matrix with <pkg>sci-libs/cholmod</pkg>
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">coin-or/Clp</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-clp/
@ 2022-03-26 10:56 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2022-03-26 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 2544bae364261bd686f8933e6ebcbc54d17bee02
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 10:54:15 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 10:55:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2544bae3
sci-libs/coinor-clp: add REQUIRED_USE
- mpi does nothing if mumps is disabled
- rewrite doc building
- add missing || die
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild | 27 ++++++++++++++-----------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
index 543e65a8f4dd..0017e5702100 100644
--- a/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
+++ b/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
@@ -1,9 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit toolchain-funcs
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
+DOCS_DIR="doxydoc"
+DOCS_CONFIG_NAME="doxygen.conf"
+inherit docs toolchain-funcs
MY_PN=Clp
@@ -15,7 +19,9 @@ S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
LICENSE="EPL-1.0"
SLOT="0/1" # major soname component
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples glpk metis mpi mumps sparse static-libs test"
+IUSE="examples glpk metis mpi mumps sparse static-libs test"
+REQUIRED_USE="mpi? ( mumps )"
+RESTRICT="!test? ( test )"
# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
# packages contain a check for it. Gentoo bug 601648 and upstream issue,
@@ -25,7 +31,6 @@ IUSE="doc examples glpk metis mpi mumps sparse static-libs test"
BDEPEND="
virtual/fortran
virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )
test? ( sci-libs/coinor-sample )
"
DEPEND="
@@ -38,8 +43,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-RESTRICT="!test? ( test )"
-
src_prepare() {
# Needed to make the --with-coin-instdir in src_configure happy.
dodir /usr
@@ -49,14 +52,14 @@ src_prepare() {
if use mumps; then
if use mpi; then
# https://github.com/coin-or/Clp/issues/199
- PATCHES+=( "${FILESDIR}/${P}-remove-extern-C-for-MPI.patch" )
+ eapply "${FILESDIR}/${P}-remove-extern-C-for-MPI.patch"
export CXX=mpicxx
else
# The file ClpCholeskyMumps.cpp does #include "mpi.h", and we
# need to point it to the right file. Our sci-libs/mumps ebuild
# is so ridiculous that I can't even tell if this is our fault
# or if it's something that should be reported upstream.
- ln -s "${EPREFIX}/usr/include/mpiseq/mpi.h" src/mpi.h
+ ln -s "${EPREFIX}/usr/include/mpiseq/mpi.h" src/mpi.h || die
mumpslibs="${mumpslibs} -lmpiseq"
fi
fi
@@ -120,7 +123,8 @@ src_configure() {
}
src_compile() {
- emake all $(usex doc doxydoc "")
+ emake all
+ docs_compile
}
src_test() {
@@ -130,9 +134,8 @@ src_test() {
}
src_install() {
- use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
-
- emake DESTDIR="${D}" install
+ emake DESTDIR="${ED}" install
+ einstalldocs
# Duplicate junk, and in the wrong location.
rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-clp/
@ 2022-11-19 4:50 WANG Xuerui
0 siblings, 0 replies; 4+ messages in thread
From: WANG Xuerui @ 2022-11-19 4:50 UTC (permalink / raw
To: gentoo-commits
commit: 9f10beb1a090def77d49326f647360941849e9c7
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 02:42:11 2022 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 04:50:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f10beb1
sci-libs/coinor-clp: keyword 1.17.6-r1 for ~loong
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
index 0017e5702100..1eb73cf6e431 100644
--- a/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
+++ b/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
LICENSE="EPL-1.0"
SLOT="0/1" # major soname component
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~x86 ~amd64-linux ~x86-linux"
IUSE="examples glpk metis mpi mumps sparse static-libs test"
REQUIRED_USE="mpi? ( mumps )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-clp/
@ 2023-03-07 0:18 Yixun Lan
0 siblings, 0 replies; 4+ messages in thread
From: Yixun Lan @ 2023-03-07 0:18 UTC (permalink / raw
To: gentoo-commits
commit: 6eff601b81ec3030341069e2e42b69f463eac6bf
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 6 11:38:21 2023 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 00:14:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eff601b
sci-libs/coinor-clp: Keyword 1.17.6-r1 riscv, #881389
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
index 1eb73cf6e431..faf13095e74b 100644
--- a/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
+++ b/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
LICENSE="EPL-1.0"
SLOT="0/1" # major soname component
-KEYWORDS="~amd64 ~loong ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="examples glpk metis mpi mumps sparse static-libs test"
REQUIRED_USE="mpi? ( mumps )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-07 0:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-19 4:50 [gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-clp/ WANG Xuerui
-- strict thread matches above, loose matches on Subject: below --
2023-03-07 0:18 Yixun Lan
2022-03-26 10:56 Andrew Ammerlaan
2020-05-08 12:21 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox