[gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-clp/, sci-libs/coinor-clp/files/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-clp/, sci-libs/coinor-clp/files/

[Michael Orlitzky]

commit:     43f4976dbc20cb4c18668db393c05c71a66d9544
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu May  7 13:43:52 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=43f4976d

sci-libs/coinor-clp: new EAPI=7 version 1.17.6.

Another "standard" version bump that is getting less standard. I've
added the usual coinor-* hacks and comments explaining them, but this
package is worse than some of the others. The mumps and libscotch
dependencies are being neglected in Gentoo, so a lot of that stuff is
broken. To work around it, we now require sci-libs/mumps (and
therefore sci-libs/scotch) to be built without USE=mpi.

I don't feel great about this ebuild, but it's a necessary step towards
a modern set of coinor-* packages that we can begin fixing in earnest.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 sci-libs/coinor-clp/Manifest                       |   2 +-
 sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild    | 116 ------------------
 sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild       | 131 +++++++++++++++++++++
 .../files/coinor-clp-1.15.6-mpi-header.patch       |  12 --
 .../files/coinor-clp-1.15.6-overflow.patch         |  11 --
 5 files changed, 132 insertions(+), 140 deletions(-)

diff --git a/sci-libs/coinor-clp/Manifest b/sci-libs/coinor-clp/Manifest
index 159faf292db..f68d30116b4 100644
--- a/sci-libs/coinor-clp/Manifest
+++ b/sci-libs/coinor-clp/Manifest
@@ -1 +1 @@
-DIST Clp-1.15.6.tgz 5644504 BLAKE2B 5d11d83f96d77a9a5ec7a65276699527757d7eb77f7e54d5199c26b27007ff49aca6bfc34c777aff62a4a82b876d318d9f49f14d8860fcc784b2733ab74465f9 SHA512 a0da0cc5dcdd409c67cb67dd0f126a3d96bf59851543e7e08adbdbf01012a25905b58ded66aac50b06462ee3a147bed912740c00681417f8c228992a917748db
+DIST coinor-clp-1.17.6.tar.gz 2158530 BLAKE2B b1bf6ecfdf3669ff4393e31c23d24f9160124dcd69df611c96feaa73acf796bc3a13a54542a5d0495e9a68789e762f5392bd7f23c0fee20c0699df2d0b084891 SHA512 8a799d87ba988a27e3ba526ded65425979b4364e374db4e943f41a523f3743efb88a9964eb575c058151e47f58be6ba0ac1b368177f0322850be3704be6f24d1

diff --git a/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild b/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild
deleted file mode 100644
index 77b81b3997d..00000000000
--- a/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils eutils multilib toolchain-funcs
-
-MYPN=Clp
-
-DESCRIPTION="COIN-OR Linear Programming solver"
-HOMEPAGE="https://projects.coin-or.org/Clp/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples glpk metis mumps sparse static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-osi:=
-	sci-libs/coinor-utils:=
-	glpk? ( sci-mathematics/glpk:= sci-libs/amd )
-	metis? ( || ( sci-libs/metis sci-libs/parmetis ) )
-	mumps? ( sci-libs/mumps )
-	sparse? ( sci-libs/cholmod )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.15.6-mpi-header.patch
-	"${FILESDIR}"/${PN}-1.15.6-overflow.patch
-)
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	if has_version sci-libs/mumps[-mpi]; then
-		ln -s "${EPREFIX}"/usr/include/mpiseq/mpi.h src/mpi.h
-	elif has_version sci-libs/mumps[mpi]; then
-		export CXX=mpicxx
-	fi
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-aboca
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-	if use glpk; then
-		myeconfargs+=(
-			--with-amd-incdir="${EPREFIX}"/usr/include
-			--with-amd-lib=-lamd
-			--with-glpk-incdir="${EPREFIX}"/usr/include
-			--with-glpk-lib=-lglpk )
-	else
-		myeconfargs+=( --without-glpk )
-	fi
-	if use sparse; then
-		myeconfargs+=(
-			--with-amd-incdir="${EPREFIX}"/usr/include
-			--with-amd-lib=-lamd
-			--with-cholmod-incdir="${EPREFIX}"/usr/include
-			--with-cholmod-lib=-lcholmod )
-	else
-		myeconfargs+=( --without-amd --without-cholmod )
-	fi
-	if use metis; then
-		myeconfargs+=(
-			--with-metis-incdir="$($(tc-getPKG_CONFIG) --cflags metis | sed s/-I//)"
-			--with-metis-lib="$($(tc-getPKG_CONFIG) --libs metis)" )
-	else
-		myeconfargs+=( --without-metis )
-	fi
-	if use mumps; then
-		myeconfargs+=(
-			--with-mumps-incdir="${EPREFIX}"/usr/include
-			--with-mumps-lib="-lmumps_common -ldmumps -lzmumps -lsmumps -lcmumps" )
-	else
-		myeconfargs+=( --without-mumps )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	# hack for parallel build, to overcome not patching Makefile.am above
-	#autotools-utils_src_compile -C src libClp.la
-	autotools-utils_src_compile all $(usex doc doxydoc "")
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
-	# hack for parallel install, to overcome not patching Makefile.am above
-	#autotools-utils_src_install -C src install-am
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}

diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
new file mode 100644
index 00000000000..7449be2ae9f
--- /dev/null
+++ b/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN=Clp
+
+DESCRIPTION="COIN-OR linear programming solver"
+HOMEPAGE="https://github.com/coin-or/Clp/"
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+
+# major soname component
+SLOT="0/1"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples glpk metis mumps sparse static-libs test"
+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,
+#
+#   https://github.com/coin-or/CoinUtils/issues/132
+#
+BDEPEND="virtual/fortran
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+
+# USE=mpi is disabled on sci-libs/mumps because mumps/scotch are in
+# total disarray, but in particular for bugs 670759 and 695962. There
+# used to be some conditional USE=mpi stuff in src_prepare() that will
+# need to be put back if you restore the ability to build against
+# mumps[mpi].
+DEPEND="sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:=
+	glpk? ( sci-mathematics/glpk:= sci-libs/amd )
+	metis? ( || ( sci-libs/metis sci-libs/parmetis ) )
+	mumps? ( sci-libs/mumps[-mpi] )
+	sparse? ( sci-libs/cholmod )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
+
+src_prepare() {
+	# Needed to make the --with-coin-instdir in src_configure happy.
+	dodir /usr
+
+	# 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 || die
+
+	# They don't need to guess at this, but they do, and get it wrong...
+	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+		-i configure \
+		|| die "failed to fix the pkgconfig path in ${S}/configure"
+
+	default
+}
+
+src_configure() {
+	# The --enable-aboca flag is temporarily disabled, because the build
+	# is broken with it (see https://github.com/coin-or/Clp/issues/139).
+	# There's a fix, but I'm not going to bother with a patch for an
+	# an experimental feature.
+	local myeconfargs=(
+		--enable-dependency-linking
+		--with-coin-instdir="${ED}"/usr
+		$(use_with doc dot)
+	)
+	if use glpk; then
+		myeconfargs+=(
+			--with-amd-incdir="${EPREFIX}"/usr/include
+			--with-amd-lib=-lamd
+			--with-glpk-incdir="${EPREFIX}"/usr/include
+			--with-glpk-lib=-lglpk )
+	else
+		myeconfargs+=( --without-glpk )
+	fi
+	if use sparse; then
+		myeconfargs+=(
+			--with-amd-incdir="${EPREFIX}"/usr/include
+			--with-amd-lib=-lamd
+			--with-cholmod-incdir="${EPREFIX}"/usr/include
+			--with-cholmod-lib=-lcholmod )
+	else
+		myeconfargs+=( --without-amd --without-cholmod )
+	fi
+	if use metis; then
+		myeconfargs+=(
+			--with-metis-incdir="$($(tc-getPKG_CONFIG) --cflags metis | sed s/-I//)"
+			--with-metis-lib="$($(tc-getPKG_CONFIG) --libs metis)" )
+	else
+		myeconfargs+=( --without-metis )
+	fi
+	if use mumps; then
+		myeconfargs+=(
+			--with-mumps-incdir="${EPREFIX}"/usr/include
+			--with-mumps-lib="-lmumps_common -ldmumps -lzmumps -lsmumps -lcmumps -lmpiseq" )
+	else
+		myeconfargs+=( --without-mumps )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc "")
+}
+
+src_test() {
+	# NOT redundant! The build system has a "make check" target that does
+	# nothing, so if you don't specify "test" here, you'll get a no-op.
+	emake test
+}
+
+src_install() {
+	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
+
+	emake DESTDIR="${D}" install
+
+	# Duplicate junk, and in the wrong location.
+	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
+
+	use examples && dodoc -r examples
+}

diff --git a/sci-libs/coinor-clp/files/coinor-clp-1.15.6-mpi-header.patch b/sci-libs/coinor-clp/files/coinor-clp-1.15.6-mpi-header.patch
deleted file mode 100644
index 7ad03e8c76c..00000000000
--- a/sci-libs/coinor-clp/files/coinor-clp-1.15.6-mpi-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ClpCholeskyMumps.cpp.orig	2013-06-19 09:58:02.834485943 -0700
-+++ src/ClpCholeskyMumps.cpp	2013-06-19 09:57:39.013355095 -0700
-@@ -14,8 +14,8 @@
- #define USE_COMM_WORLD -987654
- extern "C" {
- #include "dmumps_c.h"
--#include "mpi.h"
- }
-+#include "mpi.h"
- 
- #include "ClpCholeskyMumps.hpp"
- #include "ClpMessage.hpp"

diff --git a/sci-libs/coinor-clp/files/coinor-clp-1.15.6-overflow.patch b/sci-libs/coinor-clp/files/coinor-clp-1.15.6-overflow.patch
deleted file mode 100644
index cded22bf384..00000000000
--- a/sci-libs/coinor-clp/files/coinor-clp-1.15.6-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ClpPdco.cpp.orig	2014-01-14 11:44:22.717643715 -0800
-+++ src/ClpPdco.cpp	2014-01-14 11:43:12.543202133 -0800
-@@ -316,7 +316,7 @@
-      //bool useChol = (LSmethod == 1);
-      //bool useQR   = (LSmethod == 2);
-      bool direct  = (LSmethod <= 2 && ifexplicit);
--     char solver[6];
-+     char solver[7];
-      strcpy(solver, "  LSQR");
- 
-