gentoo resync : 03.03.2021

4 files changed, 62 insertions, 69 deletions

diff --git a/sci-libs/coinor-bonmin/Manifest b/sci-libs/coinor-bonmin/Manifest
index 8a78418c1ea3..c4ee4df34f0d 100644
--- a/sci-libs/coinor-bonmin/Manifest
+++ b/sci-libs/coinor-bonmin/Manifest
@@ -1,3 +1,3 @@
-DIST Bonmin-1.7.4.tgz 12320747 BLAKE2B 779881abf98dcf1c0b6a22e2d7fe11c2075ac50a64afcfae735bbb221614ce247c9f918c5cac7d0772784512ff2135fedeb26295c5e5d3979ebb8e435cfdac21 SHA512 290b1b49e467ab8ce7fc6908d8aa76a3b1ba61f63f44427d3bdd8ff2bed4aa6ef28396f0be59e108038173ea670405b50d3c32636aacdee2c5787765bce763a4
-EBUILD coinor-bonmin-1.7.4.ebuild 1457 BLAKE2B cf9cecfb6cf4b937bc59cf350231df15b5cc8b2883a7b02e34ba243cb24648c63a3811aab22fedafceef6fcd24d24edd18a2b7aba5322f86fa2756140f7771dc SHA512 c1f9c49ed3ed777b7611906dd6acd0becc7fca3118cc8e8275929dfc512fd803f4be1cc662f3f4cde3d58b9595c93949e84e39e095b29d3d176bc10483a10578
-MISC metadata.xml 537 BLAKE2B e099b92290e42b63acc75aab2354cb3295e83f39396f960d338f46e72be7bd0ad3aec8bd6492b595d1b5133d0ea2e7b10aa110553346814e1584eb48153ffa28 SHA512 813db781e346f940d3110f0340208d1400cef20b2dc55b4faafc75c4d71ec0ad3d6cab7638d5afd4e8db7cca1e146bd72f15d45d6e25305961b75e86152377d3
+DIST coinor-bonmin-1.8.8.tar.gz 1336718 BLAKE2B 3b72852d54b62274dc347758ae6c3fe0a2b1c04c39c3b01d87aa28fcc8593a3d80945b2e88aabd4db03da31c426396302a2def44aac8a07e6101cd5331321ed1 SHA512 66c3b07e743b6f352b4760e32c774268606deda4143e597c3be81068237dd5021210dec46e53ae0930f480db18bfbaaf284cbdb3d20f07e6d8543968509f8999
+EBUILD coinor-bonmin-1.8.8.ebuild 1214 BLAKE2B d5f9d73a7e339c62626c0cfb3c0f027238460ce52d8caa5c595f993bb64d10fa155650d52662675f67d30ffe854b141ef2a686510191b055f72c11d5b582f7b2 SHA512 a0cf3764bcc28fd12fa5cddc25f3218e64db979f4cb55898ee16a59d9af92d708b42bad272c4033cb735422cfbf6bb70b7dbf235ee03e4efa005b1b14e435125
+MISC metadata.xml 559 BLAKE2B 57535814ad85e572b2c5f3fcb5820b662c04205d3977495e1a710049e2dc9cecc84d1b197663f1695692a31ec90a3e9382c876d6bc92c12fd37d2a5922b94b0c SHA512 937e95bbd109b346c74c066f18958a36588f272a21228dc2292dbf5c46dab30d95f6e093101299d3e58de33832116123b95fc96b444e89315f6e39be93992182
diff --git a/sci-libs/coinor-bonmin/coinor-bonmin-1.7.4.ebuild b/sci-libs/coinor-bonmin/coinor-bonmin-1.7.4.ebuild
deleted file mode 100644
index fb052c19bcd7..000000000000
--- a/sci-libs/coinor-bonmin/coinor-bonmin-1.7.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=Bonmin
-
-DESCRIPTION="COIN-OR Basic Open-source Nonlinear Mixed INteger programming"
-HOMEPAGE="https://projects.coin-or.org/Bonmin/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="CPL-1.0"
-SLOT="0/4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples glpk static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-cbc:=
-	sci-libs/coinor-clp:=
-	sci-libs/ipopt:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(usex doc doc "")
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	autotools-utils_src_install
-	# add missing include files needed from coinor-couenne and others
-	insinto /usr/include/coin
-	doins \
-		src/Interfaces/BonCurvatureEstimator.hpp \
-		src/Interfaces/BonExitCodes.hpp \
-		src/Algorithms/QuadCuts/BonLinearCutsGenerator.hpp
-
-	use doc && dodoc doc/BONMIN_UsersManual.pdf
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild b/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild
new file mode 100644
index 000000000000..7ec47de50280
--- /dev/null
+++ b/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR Basic Open-source Nonlinear Mixed INteger programming"
+HOMEPAGE="https://projects.coin-or.org/Bonmin/"
+SRC_URI="https://github.com/coin-or/Bonmin/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Bonmin-releases-${PV}/Bonmin"
+
+LICENSE="EPL-1.0"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-libs/coinor-cbc:=
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:=
+	sci-libs/ipopt:=
+	virtual/blas"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		virtual/latex-base
+	)
+	test? ( sci-libs/coinor-sample )"
+
+src_configure() {
+	econf $(use_with doc dot)
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc '')
+}
+
+src_test() {
+	# Needed given "make check" is a noop and it skips the working one.
+	emake test
+}
+
+src_install() {
+	default
+	dodoc -r examples doc/BONMIN_UsersManual.pdf
+	use doc && dodoc -r doxydoc/html
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-bonmin/metadata.xml b/sci-libs/coinor-bonmin/metadata.xml
index fde4b95c383c..8f8219cb4317 100644
--- a/sci-libs/coinor-bonmin/metadata.xml
+++ b/sci-libs/coinor-bonmin/metadata.xml
@@ -9,8 +9,8 @@
   BONMIN (Basic Open-source Nonlinear Mixed INteger programming) is an
   open-source code for solving general MINLP (Mixed Integer NonLinear
   Programming) problems.
-</longdescription>
-  <use>
-    <flag name="glpk">Undocumented USE</flag>
-  </use>
+  </longdescription>
+  <upstream>
+    <remote-id type="github">coin-or/Bonmin</remote-id>
+  </upstream>
 </pkgmetadata>