gentoo resync : 03.03.2021

4 files changed, 63 insertions, 62 deletions

diff --git a/sci-libs/coinor-couenne/Manifest b/sci-libs/coinor-couenne/Manifest
index 0d68efa49715..58beefdf2093 100644
--- a/sci-libs/coinor-couenne/Manifest
+++ b/sci-libs/coinor-couenne/Manifest
@@ -1,3 +1,3 @@
-DIST Couenne-0.4.7.tgz 12487353 BLAKE2B 795a1d04ee6186e519d57a59ccc7dfa77ec28717b3e3f75d1ed6513438e869d69970c27dc0de758d421e7f5c5f2dfb3308270b185c05b44ef214c760b1f25e39 SHA512 ae87ebee778d6782fffe9e6f6c7c8f604140f6134e29824f89e4f87bb86ac00ac1b2d8de274b23de16078a48a1444fbe7960b15ffefdc1798dca8972a8946deb
-EBUILD coinor-couenne-0.4.7.ebuild 1421 BLAKE2B 2a14a91b62dade3a3f07721226c56d25ef77bd69a25440d090575ab7d13b5be99291e31a5da3bc04c134c62eda7014f9ea32286f90f8fed2dc6d7c13eac59bce SHA512 e22e2f68e03dbe3f28a0ee59561c5b7d78431ebcf86bc7d59a97cd39aceeaf216643bf1481f2e06cfd63bc35b84f0e7e5644c55705e25c1b9b2e8a0d4f3d5054
-MISC metadata.xml 620 BLAKE2B 82e4ce9c1f106653d4a3d8a235206950db10283e0c2a02802587a86f0845520b09cbc3731075a90607c51dacec6788bbca8d06ef181e9f4240ef166491c7159e SHA512 6b6a008f16e4bb3e20ae8cdf3c081236c9896346cc8c7dc73acea97fb0b51891764bf9747baac6719229b29e0c7086d9ed9a6c797d6717ef702d7336aee3703c
+DIST coinor-couenne-0.5.8.tar.gz 1321163 BLAKE2B 841a4af3d76fd308ef5abe481157fa1ecf307e7fae03fa0cb931483be74443febc7eb1ba7e85f47c3dca5d5447a74ae86dc0f3dbeb6c0f0032f543861462e0a1 SHA512 bf474503bd77be6536f9d00b40ff45041b3976ea2167d64e667fa580aa8ed6a383861ec67d57eec83623b6542f7779ed7d50d9b72347c3f77ef36a194a3f9e71
+EBUILD coinor-couenne-0.5.8.ebuild 1239 BLAKE2B 866b7bd28743c54d0d9c59a7079db03cf8da7601410068bef3b86f77fa65d6d6abd14251e0b4fc242d16a357597c8130f9302204bc1aa805f12a71c1a9ab6495 SHA512 e1f6aa8fbc30fa79471083dbfd533d75e49ff2b8d71cb606fdf45e305e31749186790a0c594027304b0bde60cb7dddb1615769338036206947026e9a3d5cd258
+MISC metadata.xml 700 BLAKE2B 945c3aafd3cc6b2280c64b664cc9a49ccc5be8b9d6dd33c4bb4730c7367e1ad15b25f9fefb968b69f29f2b5cf1e57d8cae3f990db8948d8436385bea67e34212 SHA512 641fa4e5a9bd4f66e42aa86960141e3de0d8f68bc9b01d8235a6be90c1b2c60a262221b0253a366491ed161b8acf114df8549affbc30acd250b89ca3d65105fc
diff --git a/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild b/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild
deleted file mode 100644
index 02c94288b5aa..000000000000
--- a/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild
+++ /dev/null
@@ -1,59 +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=Couenne
-
-DESCRIPTION="COIN-OR Convex Over and Under ENvelopes for Nonlinear Estimation"
-HOMEPAGE="https://projects.coin-or.org/Couenne/"
-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 static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sci-libs/coinor-bonmin:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	# resolve as-needed
-	# circular dependencies between libCouenne and libBonCouenne :(
-	pushd "${BUILD_DIR}"/src > /dev/null
-	rm libCouenne.la main/libBonCouenne.la || die
-	emake LIBS+=" -Lmain/.libs -lBonCouenne" libCouenne.la
-	emake -C main
-	popd > /dev/null
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc doc/couenne-user-manual.pdf
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-}
diff --git a/sci-libs/coinor-couenne/coinor-couenne-0.5.8.ebuild b/sci-libs/coinor-couenne/coinor-couenne-0.5.8.ebuild
new file mode 100644
index 000000000000..fd0fc656ee41
--- /dev/null
+++ b/sci-libs/coinor-couenne/coinor-couenne-0.5.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fortran-2
+
+DESCRIPTION="COIN-OR Convex Over and Under ENvelopes for Nonlinear Estimation"
+HOMEPAGE="https://projects.coin-or.org/Couenne/"
+SRC_URI="https://github.com/coin-or/Couenne/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Couenne-releases-${PV}/Couenne"
+
+LICENSE="EPL-1.0"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	sci-libs/coinor-bonmin:=
+	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
+	)"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+}
+
+src_configure() {
+	econf $(use_with doc dot)
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc '')
+}
+
+src_install() {
+	default
+	dodoc doc/couenne-user-manual.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-couenne/metadata.xml b/sci-libs/coinor-couenne/metadata.xml
index d2e462bb6357..521131367170 100644
--- a/sci-libs/coinor-couenne/metadata.xml
+++ b/sci-libs/coinor-couenne/metadata.xml
@@ -12,4 +12,7 @@
 		Programming (MINLP) problems. The purpose of Couenne is to find global
 		optima of nonconvex MINLPs.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/Couenne</remote-id>
+	</upstream>
 </pkgmetadata>