gentoo resync : 03.03.2021

4 files changed, 50 insertions, 64 deletions

diff --git a/sci-libs/coinor-mp/Manifest b/sci-libs/coinor-mp/Manifest
index e97d4658fd4d..c5ad0bcabf94 100644
--- a/sci-libs/coinor-mp/Manifest
+++ b/sci-libs/coinor-mp/Manifest
@@ -1,3 +1,3 @@
-DIST CoinMP-1.7.6.tgz 10343849 BLAKE2B a99fe1f5413bc458b0cfde53606041ecdec45c6ba9b866f083b85dafa04ef9aa2a52aec6ce2f5d6463e2cf9d609567d3079c10490412dcc5bd9c69942982f261 SHA512 1612d43d52d0ee29b4e6ca328e1535c59722dfd5c7a7e0811a4180ad6033ef27111ced6497f9d5cea816c047a4e11c2aed6d1936feac8ded797eeec55d9539ce
-EBUILD coinor-mp-1.7.6.ebuild 1351 BLAKE2B c4e2bccedbc64404be150311a07233edfd2ec658bb93f6cada46ed2036492cebb0ed746d43ae5cd0616e4a43c45a54fc752cec436bec8b386e94de1b2359f551 SHA512 ea2ef701b4e46d53f25d0d8585c79ebef718fdc77d65ad71fa8b43131dd9d540b87e7afa913a827a1494c40bbbb299c46b6a59cd9bfad8377453c7a35b433b59
-MISC metadata.xml 548 BLAKE2B 7629540fe896c9bb67cae8cb96df766a9c2ce36bb4d0da5fa27df91b256caf8fbacdee67225eae02e54feb903fb509f1eb6af719101575e460e24b9fd07b4258 SHA512 e87020fb255c6461b1aa6fe25ad66621c8a680fac287818d13a3089ff3b858c9f5a768ebf08e620d97700f83119bf426655c2b910529ffdc8907104f522dee04
+DIST coinor-mp-1.8.4.tar.gz 4142865 BLAKE2B 4f3f37378a13236ccab60ed0d9ec0e6716d7df8c264ec26f69e3117aaccf87cbdff42415cd4d86b936ba0fea87681592a66fef610f95ade68f5ea6cd185f4999 SHA512 ecb7761407df0a8d40ac2416fdbdfe62bb5e78f3cc4859e45c0912e6d06ca9b2d4bdf5fda2204bb1813d45289db9e8dbc48cce171950e8c3881d4a3fb3402fab
+EBUILD coinor-mp-1.8.4.ebuild 1057 BLAKE2B 7ccada7d30cb707d943cf3248d1bfb719a0cecb69e9c6ef3ab597110a95b25660dc10a607eb02a7499c69ec7bee7b46b51d7869be01ae0e606774cfbe3621234 SHA512 2c314d09c633ef7aa24dec8bc39b6688b1e7785969f8010a852275a5728f57754abf217adfffed5c5e3bf5e6e5caf6b1a49780fdde40ebad6403ca6a647873e9
+MISC metadata.xml 633 BLAKE2B f0022b8860f163b0e4bd3c2a28972d5df2cc8988374675b75de70a6a47de19f450bc323d538c4f2a1d9a88ef9abb4bf508bde96165f8e7a0e4f99ecb30724789 SHA512 dbd84ea46d73b20bc36556c53f1cbfb1ce17aecb52ddf11aea61787a7dde4b3c27aa39cd3013ead610d90f582391b1873c5cbf042b9f954a5a6e03ba543c56e5
diff --git a/sci-libs/coinor-mp/coinor-mp-1.7.6.ebuild b/sci-libs/coinor-mp/coinor-mp-1.7.6.ebuild
deleted file mode 100644
index f8d827e01c64..000000000000
--- a/sci-libs/coinor-mp/coinor-mp-1.7.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=CoinMP
-
-DESCRIPTION="COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL"
-HOMEPAGE="https://projects.coin-or.org/CoinMP/"
-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="examples static-libs"
-
-RDEPEND="sci-libs/coinor-cbc:="
-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
-	sed -i \
-		-e '/^addlibsdir/s/$(DESTDIR)//' \
-		-e 's/$(addlibsdir)/$(DESTDIR)\/$(addlibsdir)/g' \
-		-e 's/$(DESTDIR)$(DESTDIR)/$(DESTDIR)/g' \
-		Makefile.in || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		--datadir=/usr/share
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	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-mp/coinor-mp-1.8.4.ebuild b/sci-libs/coinor-mp/coinor-mp-1.8.4.ebuild
new file mode 100644
index 000000000000..6abaee7ca4e8
--- /dev/null
+++ b/sci-libs/coinor-mp/coinor-mp-1.8.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL"
+HOMEPAGE="https://projects.coin-or.org/CoinMP/"
+SRC_URI="https://github.com/coin-or/CoinMP/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CoinMP-releases-${PV}/CoinMP"
+
+LICENSE="CPL-1.0"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sci-libs/coinor-cbc:=
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	# Also installation of unneeded files in a double ${D}.
+	sed -i '/--libs.*addlibs.txt/d; s/ install-addlibsDATA//' \
+		Makefile.in || die
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	default
+	dodoc -r examples
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-mp/metadata.xml b/sci-libs/coinor-mp/metadata.xml
index 5fbc1079f58b..3ca43d16de05 100644
--- a/sci-libs/coinor-mp/metadata.xml
+++ b/sci-libs/coinor-mp/metadata.xml
@@ -10,5 +10,8 @@
   MP is a C-API interface library that supports most of the
   functionality of the CLP (Coin LP), CBC (Coin Branch-and-Cut), and
   CGL (Cut Generation Library) projects.
-</longdescription>
+  </longdescription>
+  <upstream>
+    <remote-id type="github">coin-or/CoinMP</remote-id>
+  </upstream>
 </pkgmetadata>