gentoo resync : 03.03.2021

4 files changed, 65 insertions, 61 deletions

diff --git a/sci-libs/coinor-blis/Manifest b/sci-libs/coinor-blis/Manifest
index 88e1185b600b..747516997f33 100644
--- a/sci-libs/coinor-blis/Manifest
+++ b/sci-libs/coinor-blis/Manifest
@@ -1,3 +1,3 @@
-DIST Blis-0.93.10.tgz 10612207 BLAKE2B aaef129ca4de7aba8131c46d7619accd8087abb13e183e9caafdada20636b2d5769b88c0195db0194bbd2d60ada4209609716e8b08436f8c43e62807b325ff68 SHA512 ef4c1b7704353e9d2628401d9a47e72d0b26d485ac3951b03fe84fdc98cfbee8e3b9f3412411eca693c8e00bdf97798e08c4dabcf5b8646bbe3d8481c237820e
-EBUILD coinor-blis-0.93.10.ebuild 1179 BLAKE2B fd0bec6dd7b45a6c0417fcbfb39e798addbd01cf9c22c5458e9c0f9422dccec3586481849f2a6b8942f38b4934a092530ecb4f627bd63b5ba9fbdfd538ac7aae SHA512 55ef45de4333bed8cef1dd89cd7ab4ad2b22c889fa2ad8bb56c7ee063c4ba65dd504afc78b28ec7002e3c9cae642e953fe1bddec008bee40f4c86eb7001f0833
-MISC metadata.xml 630 BLAKE2B 2f5b67704950cbc977352b076cf2f558287846bcb67f7994d5bf2ef1e57143e2b4018a5b9de75ef50f40b1d6a2221b4f99a9900e2db31ae37025a77228601017 SHA512 48ea2c95c268345c59ea61a97ccaf0cf93b1ba1e383e64434c5189ae7a81382810df85397e33a2fb3e354c8e44187dca835de82d14e11fcbbc2a74740889e775
+DIST coinor-blis-0.94.8.tar.gz 4186086 BLAKE2B 6be1ea6f27913cf128947225b2d03b071ee20bc35f49ea319f5ed8ed77d2d89fac0a66bf2b5204ec4194c1a8444033c7ee797ac5c0adbc0572f9195d9a357735 SHA512 5b401eaf7b80af6cb724606655c38811918e92ae89d2f4a1fd5f318bdc8fa1463175a106c2f3ab43bf5eda677a6d7bbdb8a0f8bc0155135108a10bbcbb93070b
+EBUILD coinor-blis-0.94.8.ebuild 1376 BLAKE2B c28410fabc54e620a84081153cd6fc8163248ff12ac2a7047092bc4962bbb4b26321a149210f8ccc256c9a76e62383c7253ae75ad26eff5d148044ab8c613985 SHA512 6ecaa682ad457e3581a0791adb6a32153c4f1c7f097b7b11e458e6388f48076354c2b3bf95ba2e6dbdcdc831ffd563277bc4e251d8fe91094790b3f6951c91a9
+MISC metadata.xml 714 BLAKE2B a37253b4638242f83a37fcc1774c3c6790b4cf1548bb96576f716749de62ac0539dba05c13f81048db92551c059831d5f08b39357f370fa51d33decc33e8096d SHA512 26e7495770b7f416c96a10b9640c61d827a5f196604cf9e45f639abf97a23f326097dc4458e3a4a191b38b986c4ac8ed6e6349c6caed0ab9499ab116963f0522
diff --git a/sci-libs/coinor-blis/coinor-blis-0.93.10.ebuild b/sci-libs/coinor-blis/coinor-blis-0.93.10.ebuild
deleted file mode 100644
index 3757864db1e7..000000000000
--- a/sci-libs/coinor-blis/coinor-blis-0.93.10.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=Blis
-
-DESCRIPTION="COIN-OR BiCePS Linear Integer Solver"
-HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="CPL-1.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-bcps:=
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-alps:="
-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-blis/coinor-blis-0.94.8.ebuild b/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild
new file mode 100644
index 000000000000..dcc2f33bd47e
--- /dev/null
+++ b/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR BiCePS Linear Integer Solver"
+HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
+SRC_URI="https://github.com/coin-or/CHiPPS-BLIS/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CHiPPS-BLIS-releases-${PV}/Blis"
+
+LICENSE="EPL-1.0"
+SLOT="0" # formerly 0/1, upstream went from so.1 to so.0
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-libs/coinor-alps:=
+	sci-libs/coinor-bcps:=
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-osi:=
+	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
+
+	gzip -d examples/data/{,hard/}*.gz || 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-blis/metadata.xml b/sci-libs/coinor-blis/metadata.xml
index 4e7c3e8303e2..545a08d9a3c7 100644
--- a/sci-libs/coinor-blis/metadata.xml
+++ b/sci-libs/coinor-blis/metadata.xml
@@ -12,4 +12,7 @@
 		layers. The BiCePS Linear Integer Solver (BLIS) is a concretization
 		of the BiCePS layer for solving mixed-integer linear programs.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/CHiPPS-BLIS</remote-id>
+	</upstream>
 </pkgmetadata>