gentoo resync : 03.03.2021

4 files changed, 57 insertions, 65 deletions

diff --git a/sci-libs/coinor-alps/Manifest b/sci-libs/coinor-alps/Manifest
index a9e1a410a711..ccf97e781142 100644
--- a/sci-libs/coinor-alps/Manifest
+++ b/sci-libs/coinor-alps/Manifest
@@ -1,3 +1,3 @@
-DIST Alps-1.5.4.tgz 5691940 BLAKE2B 9a1d78d8957a4fd2156d35ba348f7db442bf6f6128031b9dd0d2b0c1176e5eb408208d3c90fb8563c39efbf0f4aaa9daea705f25ed711a922ab32f1e1d0b8027 SHA512 eace2f0e3dde682ee92b8e185ba6ea226a681dbcecb5fcf5258334e6deed89705b2c61821896b07323459fbd8575a31fa91c3342becbc9f6173efdf094d39555
-EBUILD coinor-alps-1.5.4.ebuild 1448 BLAKE2B 3e078b99faf76bfd2dcacbc71b402f23e31077b4b0a9baf59efc5b5bcc59a1291b2a4c2199bb97d452478f0968a5c09392ecbe503060624c65856a565b04753d SHA512 ab8e3c40a679cdbd5ba0e1dcfd74f2ca6ab67a37d4c9f9f85af7aacd083a2013a85075b61ca8b1fc74b9bdfc1a7a76b99ea39221eee7c03db095b9a882418bd4
-MISC metadata.xml 682 BLAKE2B 4333709b145e1a154188403881f2ac6f32562460edd086ad8f5f805a8cc26f4ec4aa3bf996140a2f221ed01cfb27f4545c2de3a2de1180eb8c4b95fbac7035d4 SHA512 c25cfee7ccc30ca49382c3f142cdf7aa26ab0b6bd4e9fae86e618b45ec03c13b81ebd4cb7567fae51ea64113aec47b7d8ba341722c5f41af595437a2193e1fb7
+DIST coinor-alps-1.5.7.tar.gz 893834 BLAKE2B af881b9bd7db8b323ba7c7bd82f9180d3685a1b3d3b30b7b20c0d9c5d539caa8fb13e11b866f4f61e9baaf98d32e17953b3bdb408c32fc6aea20e3d83be57078 SHA512 7c3d838bfa8366f0a440dfe1cc9fbff1ca23e6528c3d89348fb4df8bab50b1a7c666523cde20ecd9f09ad54e599ffed1e6ed48631078dbd4d6885e2b10e9e495
+EBUILD coinor-alps-1.5.7.ebuild 1241 BLAKE2B 8a499ada926dd90156c76b101316a9ca5c1589a4e3f0c832ec01d7b0ba912a3f8772f0b6319cdd01f2e0391f5613d1279d18e1aed87adbdeeb79306dac5a3325 SHA512 0c50faa75cf3228b9fe7edaf21048c7f4e98c6751d66e1cbaf55c49ab9d2d6d1bd0ce4a9565001fa28accbaee2763bda80c6f6b661e027756f55674c691e11e7
+MISC metadata.xml 766 BLAKE2B ff46d416d89804d29fc2479d7a0e11e818a13f29182d42a688ce8a29242db830872d8a9b3e903dcabc6155e38a9eb83283392d5e36800872b7fbcf40e43e2493 SHA512 f2eaa0678859a3a7bf8b353c4da7870b7e850926c6dc28c5108161dc2d5adf1a0a753ab08367967afea9f065932ddd2ac73103abeb7cd42d394f9d91b5ec40db
diff --git a/sci-libs/coinor-alps/coinor-alps-1.5.4.ebuild b/sci-libs/coinor-alps/coinor-alps-1.5.4.ebuild
deleted file mode 100644
index fec354dd49a5..000000000000
--- a/sci-libs/coinor-alps/coinor-alps-1.5.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-MYPN=Alps
-
-DESCRIPTION="COIN-OR Framework for implementing parallel graph search algorithms"
-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/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-clp:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample sci-libs/coinor-cgl )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	default
-	# as-needed fix
-	# hack to avoid eautoreconf (coinor has its own weird autotools)
-	sed -i \
-		-e 's:\(libAlps_la_LIBADD.*=\).*:\1 @ALPSLIB_LIBS@:g' \
-		src/Makefile.in || die
-	# bug for later versions of subversions
-	sed -i \
-		-e 's/xexported/xexported -a "x$svn_rev_tmp" != "xUnversioned directory"/' \
-		configure || die
-}
-
-src_configure() {
-	PKG_CONFIG_PATH+="${ED}"/usr/$(get_libdir)/pkgconfig
-	export PKG_CONFIG_PATH
-	econf \
-		--enable-dependency-linking \
-		$(use_with doc dot) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake all $(usex doc doxydoc "")
-}
-
-src_install() {
-	default
-	use examples && dodoc -r examples/
-	use doc && dodoc -r doxydoc/html/
-
-	prune_libtool_files --all
-}
diff --git a/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild b/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild
new file mode 100644
index 000000000000..d4c00fae9301
--- /dev/null
+++ b/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR Framework for implementing parallel graph search algorithms"
+HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
+SRC_URI="https://github.com/coin-or/CHiPPS-ALPS/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CHiPPS-ALPS-releases-${PV}/Alps"
+
+LICENSE="EPL-1.0"
+SLOT="0" # formerly 0/3, upstream went from so.3 to so.0
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-cgl )"
+
+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-alps/metadata.xml b/sci-libs/coinor-alps/metadata.xml
index a41a7280a461..6034b7e66d97 100644
--- a/sci-libs/coinor-alps/metadata.xml
+++ b/sci-libs/coinor-alps/metadata.xml
@@ -13,4 +13,7 @@
 		layer of a hierarchy consisting of implementations of various tree
 		search algorithms for specific problem types.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/CHiPPS-ALPS</remote-id>
+	</upstream>
 </pkgmetadata>