gentoo resync : 03.03.2021

4 files changed, 59 insertions, 74 deletions

diff --git a/sci-libs/coinor-smi/Manifest b/sci-libs/coinor-smi/Manifest
index f5ad2e6d7ad8..6bd684d60e00 100644
--- a/sci-libs/coinor-smi/Manifest
+++ b/sci-libs/coinor-smi/Manifest
@@ -1,3 +1,3 @@
-DIST Smi-0.93.4.tgz 4907130 BLAKE2B 329cd05ee42cf2fe0928a9fd9049c0a296632bf6c30bc6ca86f62066ee425982a853223581110b4e3e4d7a6a049e06bbb366802b1a18d175e1dc2a1a38772e9b SHA512 9439b7421475cf5d0c85f529305657e04d1ebb3eca28399b0df0352b52df315e9dceb3f1410ada0b7a6f9447b0e383116fb208d6447994ce1611f019fcace007
-EBUILD coinor-smi-0.93.4.ebuild 1518 BLAKE2B 68bdc3379e2dca73bc1a47774655084c335b58b9c3cd9b812fb8f4d1ce70cbb38d23d8f1a2227e2260a8ba330caf3a48980bb29faacf972d60167999706d1f62 SHA512 3cdb67da05994f6d03ae0322c7aad18f5af03ebbb24429127abafbcfaba52a525980269db786c11c443195cb1843dc9ed4813f21eed6b7deaa9f20a2f6e84ecf
-MISC metadata.xml 982 BLAKE2B 2f74ba28cece6fa9fe493d79148ce7614e4682c440639e70583f103b606337873fb25a6bc6a685f1e0e1477aff7bc28655ca301a4fca8535c0f7de2e23a8fbf5 SHA512 5d702c7b51072d12118cefb565d266bbe5c7f3c5f3a664a48d1d8a5685d1fa5671b939485cc243bcf4af1e75e306a5797a30a046b6199418b201be474f713db2
+DIST coinor-smi-0.96.1.tar.gz 653402 BLAKE2B 7a81d0c67168ecd7059a814af7ba8fea57c8bc0316db95ea6a8a8a1717d7584ecfafe623b7de6b66908b5f85bc02cd0b1d1781fb7145c901efe6a8ddeb92afe6 SHA512 cadb4c89c0a385b762fab985a6a8880dd659feb4496e39826f337a9a323ea5de1fbed51f4b414b1f6eb36fbd02292ed42a1d216bf54d27f2d5bb242012b571c9
+EBUILD coinor-smi-0.96.1.ebuild 1175 BLAKE2B 82c3e29480e9ad2744563c76df3844d022fdd75132e2c85cf396bfaadfe8e49a0e4f6614b5b9e092061c36fd0ee22088ed8612b2169b71a163df3341b054b1a1 SHA512 2e54895c537c415fbbb6a932ec786bb7f30fafef3564a55e158f893961ecb4227b73359213b1a317bd02d90534856fabcf6117f2d803358b8217658637c662df
+MISC metadata.xml 1058 BLAKE2B 66093d02a6f2f09b5c4266ca455cdc5de44893926dc365613e65eb3b97a337c5991e809a9c3cdc0ac3bb3daa0fb911412be904778e1457e91c72a3ba405e4aed SHA512 b3401bdccca15aab188044cf9c3853afed76188f5b3e0f46d2a6675349c8103925e842512ae38850722000e4fdb3a1258dd9cd7b2ce02c49353fb6b169e70c86
diff --git a/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild b/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild
deleted file mode 100644
index 903528f79728..000000000000
--- a/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-inherit autotools-utils multilib
-
-MYPN=Smi
-
-DESCRIPTION="COIN-OR Stochastic modelling interface"
-HOMEPAGE="https://projects.coin-or.org/Smi/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="CPL-1.0"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-cbc:=
-	sci-libs/coinor-cgl:=
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-flopcpp:=
-	sci-libs/coinor-osi:=
-	sci-libs/coinor-utils:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-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
-	if use doc; then
-		cd "${WORKDIR}/${MYPN}-${PV}/doxydoc" || die
-		doxygen doxygen.conf || die
-	fi
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${WORKDIR}/${MYPN}-${PV}/doxydoc/html/")
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples flopcpp_examples
-	fi
-}
diff --git a/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild b/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild
new file mode 100644
index 000000000000..e91f6006f743
--- /dev/null
+++ b/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR Stochastic modelling interface"
+HOMEPAGE="https://projects.coin-or.org/Smi/"
+SRC_URI="https://github.com/coin-or/Smi/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Smi-releases-${PV}/Smi"
+
+LICENSE="CPL-1.0"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-flopcpp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+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_test() {
+	# Needed given "make check" is a noop and it skips the working one.
+	emake test
+}
+
+src_install() {
+	default
+	dodoc -r examples flopcpp_examples
+	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-smi/metadata.xml b/sci-libs/coinor-smi/metadata.xml
index a09571668d51..79fdb8913b5e 100644
--- a/sci-libs/coinor-smi/metadata.xml
+++ b/sci-libs/coinor-smi/metadata.xml
@@ -18,4 +18,7 @@
 		generation, interacting with solvers to obtain solution information,
 		etc.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/Smi</remote-id>
+	</upstream>
 </pkgmetadata>