gentoo resync : 03.03.2021

4 files changed, 63 insertions, 60 deletions

diff --git a/sci-libs/coinor-bcps/Manifest b/sci-libs/coinor-bcps/Manifest
index e9b6b95e5933..92b072e9d654 100644
--- a/sci-libs/coinor-bcps/Manifest
+++ b/sci-libs/coinor-bcps/Manifest
@@ -1,3 +1,3 @@
-DIST Bcps-0.93.10.tgz 6270009 BLAKE2B 45372ae18a3f4a7e75d4f71fa6ba411317fc282415390f6e11181543bdac254c5820e8544ffd6c43e8dcb507a8dc5329a42b9cbfc23256a395cc73bc3a8d631b SHA512 4e9348dc1bf75fd9afb74078b55ae0f9a84a99236886552256d7548013c8af4695a4fcc2787ffb0228eba2a870b1cb78c068234048c8650f7d504e1e8d17c549
-EBUILD coinor-bcps-0.93.10.ebuild 1155 BLAKE2B 57ddeff64a875581b70de517d015751a3a204b41b66c9ef4408c56cd9c760052734865f8bf30d91db2c76c124c68b58aa38c6a0cd0b0306af4597354b2db1b61 SHA512 59506eac73eca4c2cba6e3dde394b29a58d1926ab4ff541bb1346eefd5104f276150c05509967f48c702c219187bd7a10cbd0c9270d2a34bfcbad746f6f7349b
-MISC metadata.xml 671 BLAKE2B 5c13062c4b3e8ac21ee50eb9b1741b1f67f9877a570a85d1567753a8c8fac9c512db08d56be24488b8408d695a167783c9b02d1e74798c925e36bad47fca1e6b SHA512 612c469ad5d853a412574afdbe2ba78d7d4db8bbca7eaf6bbffe1ba558d9ec40d005a94f775f72947742835d1210bdba98de7a6457342e59ae40ebdec9c497d6
+DIST coinor-bcps-0.94.5.tar.gz 701818 BLAKE2B 3f01e0fac2e892a3cf59e7dba78c58a23f465f48b0a44be933acfb7d59e84012bed3e05f2f8d1b3c578ad24f4f9c23af9d5e7d54e47b45b0500d389dcfbcf47f SHA512 b53a2ad62a832d4beb0ce2b5c7fd0e81eeb01b9039c0b78ce849adb94b44ad2300aad0f6357ecbcf41f5a5bb427508bde931667dfe40eaa83de50e3d696e3211
+EBUILD coinor-bcps-0.94.5.ebuild 1331 BLAKE2B 565c9bce7cb749a97a81cb9c1162057596967b7e3d3059c9df184bd2edf7f107dcd0b6f8470f1587774baaafc210fd2078b13b5b60d7260d00acd3a4c7fc1b36 SHA512 ad3d08e930776efdc63153914b8fed2d4c4c56d12155433982bbd35a5183d74a2b03d68cb3ef6006bfda2c2ac1d401a9cc241e82bdf3692e6c0b8cf0e2a43423
+MISC metadata.xml 757 BLAKE2B b206c0d30857beffeb00e9a28d84492a3cdde77ccb08d63a9a47ea11b4174fd1be408a8f8541dc59400ad649f801c061e8501bd98c35e3b6f7e1dcd980ca1b8c SHA512 4c7f0ba678b8a704a7b45662802fbc82d4a5735faa27851ae65c3d368e2cb23a23d5ec70ad03a083f0bd98813da7becffa4cf797ea282e70bb32229591e2435b
diff --git a/sci-libs/coinor-bcps/coinor-bcps-0.93.10.ebuild b/sci-libs/coinor-bcps/coinor-bcps-0.93.10.ebuild
deleted file mode 100644
index 6e388e55c64b..000000000000
--- a/sci-libs/coinor-bcps/coinor-bcps-0.93.10.ebuild
+++ /dev/null
@@ -1,57 +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=Bcps
-
-DESCRIPTION="COIN-OR BiCEPS data handling library"
-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-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-bcps/coinor-bcps-0.94.5.ebuild b/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild
new file mode 100644
index 000000000000..7776577f7aa2
--- /dev/null
+++ b/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR BiCePS data handling library"
+HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
+SRC_URI="https://github.com/coin-or/CHiPPS-BiCePS/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CHiPPS-BiCePS-releases-${PV}/Bcps"
+
+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 )"
+
+# Note: 0.99.x branch needs to-be-released >=coinor-alps-1.5.8
+RDEPEND="
+	sci-libs/coinor-alps:=
+	sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? (
+		sci-libs/coinor-cgl
+		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-bcps/metadata.xml b/sci-libs/coinor-bcps/metadata.xml
index 48ae1fc01754..e489508d975e 100644
--- a/sci-libs/coinor-bcps/metadata.xml
+++ b/sci-libs/coinor-bcps/metadata.xml
@@ -13,4 +13,7 @@
 		management layer built on top of ALPS for implementing
 		relaxation-based branch and bound algorithms.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/CHiPPS-BiCePS</remote-id>
+	</upstream>
 </pkgmetadata>