gentoo resync : 14.05.2020

6 files changed, 160 insertions, 163 deletions

diff --git a/sci-libs/coinor-clp/Manifest b/sci-libs/coinor-clp/Manifest
index ad86adc04e73..26c6493171d2 100644
--- a/sci-libs/coinor-clp/Manifest
+++ b/sci-libs/coinor-clp/Manifest
@@ -1,5 +1,3 @@
-AUX coinor-clp-1.15.6-mpi-header.patch 323 BLAKE2B d187af841b0a328de78eac065dcd61f16b3f72534bd7defc55a4552d21b91669a485c3f4a159c0201b9ea6ad54c6a1930fc3b6dcebc1abd336f2d6661d7c5231 SHA512 1f18e00c1a303cffa0ec6244bf1f5dbac83f0a73d1c82f4bf7a4f4df3ce581012a47b044f1d61c140a282e2d262403e76be49892cccec41b191f02edc6fa63a3
-AUX coinor-clp-1.15.6-overflow.patch 349 BLAKE2B 97f501262285a9bcf6165fc13e13722a96c18a7709004b1331ec41397f11744f9ac54182e49cd746700e401de4b2e8e348aad8230e177211ab2413c286142085 SHA512 bc467ff47e0c963aa95c84c3321038327ce4bd99119ea7d66337a60aa329ad7ee8c774aa0405c6e089b081aba0c1e3be577661a7425519e8d56a9e7b05cbb01f
-DIST Clp-1.15.6.tgz 5644504 BLAKE2B 5d11d83f96d77a9a5ec7a65276699527757d7eb77f7e54d5199c26b27007ff49aca6bfc34c777aff62a4a82b876d318d9f49f14d8860fcc784b2733ab74465f9 SHA512 a0da0cc5dcdd409c67cb67dd0f126a3d96bf59851543e7e08adbdbf01012a25905b58ded66aac50b06462ee3a147bed912740c00681417f8c228992a917748db
-EBUILD coinor-clp-1.15.6-r1.ebuild 3029 BLAKE2B 4605453742b707a1e8b94ec16cf4eccd21aca0f7fe33c8e27194f075c556bd8da50a19e619cfc9b045c51c331afdd790bb61dd4790062dca98a8f06bf4e255e1 SHA512 580a1c3e60097e764e7b43ab7b247d61745047e23ba10dd8285cad2707642183d673563c990a9ba60e85f66bc5c8c3e763d3dc7f7d39a477cf4ee984cbca7f5c
-MISC metadata.xml 972 BLAKE2B e3116e8ba1a939f7b7b80e278d7e6d9a307b30a7684707a4f1364924e7c612ce87d0655029f0acc38f59ff40286ea48088355d78af3101e8b86ec03827a83d8e SHA512 45e693abd4af3cf838fb519b5fe9be04c1ebeca4b5494ba0f15b93768273b186d759e73670fef9adbeb3febe2773b33260b2d9e78cecd84a81c03ffe6d2028f3
+DIST coinor-clp-1.17.6.tar.gz 2158530 BLAKE2B b1bf6ecfdf3669ff4393e31c23d24f9160124dcd69df611c96feaa73acf796bc3a13a54542a5d0495e9a68789e762f5392bd7f23c0fee20c0699df2d0b084891 SHA512 8a799d87ba988a27e3ba526ded65425979b4364e374db4e943f41a523f3743efb88a9964eb575c058151e47f58be6ba0ac1b368177f0322850be3704be6f24d1
+EBUILD coinor-clp-1.17.6.ebuild 3799 BLAKE2B 56ce86a7c360da03022760aa1966fefcfce74b0e293f7fca912f91e1a9608c4d16b3596b60a6bf382ac53154389ca48edbb40a6d47744d0acd5bacf5da258885 SHA512 677c64320b62e1e11fb371faad35319073a750dbeb20d786620452f44a9ca14717ff7c8de0d123711de3fcc9ef52e0c7a0f89e728bdc78949fa744287300f677
+MISC metadata.xml 1118 BLAKE2B 04fd6128b056520e45ed7bfa076c756fe667a1251f3aad4568bdf587cf6209e845a3c5f1114e09e29729e7de238974452f13a2acf82692792e1ec2cee200c50d SHA512 1d15db43e8a887fb1c2130bd85cbcb8886f4153f0d157dca468b6d77cf1eed907473232a06fd41ca811743c6ee514ae61c356a8c7ac2795e43a40b2760fd6940
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 77b81b3997d9..000000000000
--- 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 000000000000..7449be2ae9f2
--- /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 7ad03e8c76c4..000000000000
--- 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 cded22bf384c..000000000000
--- 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");
- 
- 
diff --git a/sci-libs/coinor-clp/metadata.xml b/sci-libs/coinor-clp/metadata.xml
index 49d8540dde00..00d23848636c 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>