gentoo resync : 03.03.2021

4 files changed, 64 insertions, 61 deletions

diff --git a/sci-libs/coinor-dip/Manifest b/sci-libs/coinor-dip/Manifest
index 1cb9dce125fa..05c95cf6f935 100644
--- a/sci-libs/coinor-dip/Manifest
+++ b/sci-libs/coinor-dip/Manifest
@@ -1,3 +1,3 @@
-DIST Dip-0.9.8.tgz 10557241 BLAKE2B 1fcddbe4b7e8ae0450fcf97473428c0a36b751bbf5b91ab45c362ca0590d390d8c0b5b4b273ed41f7e9432423c59b9a4f8536ff34b0c9c0f1c11ced779ddb38c SHA512 7dfb51f63aab36fe7e894be5f17f8b614bfdf9be1a14b8f8b2ee555dcb8392f82b13d20481d60423d3d375a2e52eebe0439e696e3b3a7dfdd18223829835d361
-EBUILD coinor-dip-0.9.8.ebuild 1186 BLAKE2B ba0f78baa1c151a10761da40ec82417108960405168aa90587fa1e72542a680bd118bdb647d8b2681e5d6e0987f86d8705f731b4e1318b5cde10af0a6626956a SHA512 3c41767e1472c682dfd3816c3072b3505f36c51d51a53c34ee07188676434259fcdc85a9d8db2d161545e4f9b786bff1f52d1ad3e066b3cac3d3d302af675afe
-MISC metadata.xml 722 BLAKE2B e4d55f25c10c60ad3da175feff1a5d2f9f3307dff701d8f98d83d0be32b21eac18432b7e104ed4570dbae3af4f8da6a10a6bbe4489727c6091ed5c3352d7e496 SHA512 b58f6dc52e8ff8793e843986b8ca71551eb8624e78e4122549306d68b4bb4c41cc6d86c40df697ed5e0bf1f9f829e01ebd57295526e3ef217cd4185cc9d443cb
+DIST coinor-dip-0.95.0.tar.gz 5213061 BLAKE2B 6f40e5d20832b0463e302519da168a30bdeea011a45047acb9dbe904763fc94ccaffbee3599b6f959e0eea5e40a0456771012707b9daafc50875194a1ff9967e SHA512 a9ea2bc23d625fa19e11943f46b3bf2db49aa894fe336c8de4a9a0c735e1569bd8bef015fd671eb856ee39a334adf06c95e2708bd69c4735d5f6bf994c9e41a2
+EBUILD coinor-dip-0.95.0-r1.ebuild 1313 BLAKE2B 905ec39fbafd8a632533826c8c06b1d8c70704b28b17575bc19431eca6517b6c04207b9ba5184bf10aa4c6c8920c9d6f52f004aaa3251a43bea7bd835dacfa08 SHA512 c1069c63cad11b9c38ba9f99198b0ad44b132d49b29e481b041cbbb82923f7eaf366e48e6fb2358b4cc3d601556ae37d43ae92e7cba8543a2ff84ce89a5e57d0
+MISC metadata.xml 798 BLAKE2B 44623c203a56df6ad4a5fedd020357ea090f71597bc503fc0dc233b5abcb9f98bfab9c90c14b45eaa2cf204d8f8aa4e3979f96140f82f973107d88f5aa1eec75 SHA512 174a513d37e350d66a8b6cd9774abc0a49952b58b8ab641292b67352cfe047be37a16bbaa621524dcf39e6e43c062a5d45fdab47da9950415367913f93168c82
diff --git a/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild b/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild
deleted file mode 100644
index c67282ce4ec6..000000000000
--- a/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild
+++ /dev/null
@@ -1,58 +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=Dip
-
-DESCRIPTION="COIN-OR Decomposition in Integer Programming library"
-HOMEPAGE="https://projects.coin-or.org/Dip/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-alps:=
-	sci-libs/coinor-cbc:=
-	sci-libs/coinor-cgl:=
-	sci-libs/coinor-clp:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	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_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild b/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild
new file mode 100644
index 000000000000..d19f69dd1fb7
--- /dev/null
+++ b/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR Decomposition in Integer Programming library"
+HOMEPAGE="https://projects.coin-or.org/Dip/"
+SRC_URI="https://github.com/coin-or/Dip/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Dip-releases-${PV}/Dip"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-libs/coinor-alps:=
+	sci-libs/coinor-cbc:=
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-osi:=
+	>=sci-libs/coinor-symphony-5.6:=
+	sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+
+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
+	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-dip/metadata.xml b/sci-libs/coinor-dip/metadata.xml
index a2333b002b3c..3e01e7eaf8d9 100644
--- a/sci-libs/coinor-dip/metadata.xml
+++ b/sci-libs/coinor-dip/metadata.xml
@@ -14,4 +14,7 @@
 		Dantzig-Wolfe decomposition, Lagrangian relaxation, and various
 		cutting plane methods.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/Dip</remote-id>
+	</upstream>
 </pkgmetadata>