gentoo resync : 03.03.2021

4 files changed, 84 insertions, 90 deletions

diff --git a/sci-libs/coinor-symphony/Manifest b/sci-libs/coinor-symphony/Manifest
index 7a49eaae19fe..c3f662bf6fd5 100644
--- a/sci-libs/coinor-symphony/Manifest
+++ b/sci-libs/coinor-symphony/Manifest
@@ -1,3 +1,3 @@
-DIST SYMPHONY-5.5.7.tgz 7628863 BLAKE2B 8578cc341a2114642911bff68cf260dd6c5974b70ef3deebf9f7ea51f580be809dd1224a18dbd0744e9acf3b1ce9d5bdf90a1e97b53bcd01529978a816e26c6c SHA512 a3ce66b0b1373c58024ce6840277423a1a3684af8e3179a777fbb33a8d266849ae1cde694a527c3776ff67ce0a5ae3c2bfe0dc29f4e0b3ca51ddc2b299eefb24
-EBUILD coinor-symphony-5.5.7.ebuild 2076 BLAKE2B 0b6b9a1188ca24c7e6bfa2a1531a6e5a84b5eacacfb42a382f094681c2232e5a8d38e816b844064f2d7d81936708911a19baba4427959d50ffbfdb4e0f65f9cc SHA512 9f04d98147000697dbcd21cc1bd7a1d95dd0ba36998d4f42f8099788817b86f0ee6df2758b9632c5bd6bd0c047b82f052dfd4f7bed9c39e3e1aa3aecf09d2848
-MISC metadata.xml 830 BLAKE2B ef49e73859bb88cc97b1df0614c299e9596bdab25dfd6b10a64c230dc49d038abdd8d68fb2d9fe9a8d7161722fed4acab654720f8aac3d2c7ed05c9d7f49a9ed SHA512 292f30da8c4b2a847665c848a10b33259c4bb7d89cc9363e75fb167bdbc73e0465697dc9c9979337af438f6f2a9ebba2e51dc32bcd2272ceae741c010e17041d
+DIST coinor-symphony-5.6.17.tar.gz 1848015 BLAKE2B 0e1222f51809fb836530000348351d0e2a0928ec898a11ec21d2b0cad88a2ee4a635bc91a6d92607af67cf7d44a7187683528dd2a37b288fee1b2d947058d7b1 SHA512 eb0022184b1d0325729bb8f5390093ff1cfdfc87edf1dfdf20e62f07830c69604ec373b69c6de13755611a8e96f79ee8d1009efde0a35c9e7c0fab6652375ff7
+EBUILD coinor-symphony-5.6.17.ebuild 1719 BLAKE2B e2651d17cea9d6301adcc9f8db54bfa0599630f0e13dca8fc35a8a0f94695cd8a586c51cffef50d0236290bc82c5e60b0c85af0fc06162e198f2c7f7dd77f559 SHA512 e8a254986c175c8cde751c55f8170ff931e433303614b0bdc39b60bd3e1e6db76226ae1b64cc7a6f8e6525033ac197a3185620583191651d0ff91fd6db920d46
+MISC metadata.xml 909 BLAKE2B 0e3de2ce45799ab39397f233b7c3f39642f9e011b6d8fea52fdc5ed9bf9a080ccf9ea53869eb83ac242d23092742432be4473ca436e1bd75dcaec98b6f369dfd SHA512 6406a6d362d4ebac06db82c53167d57c6fa45a3eddd77915ed55299778940e8a7e8445f099f8c2ff4b3ba6eed1410c600ce8d7fb5672703136644adfd5f31763
diff --git a/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild b/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild
deleted file mode 100644
index 02a341b4b79d..000000000000
--- a/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild
+++ /dev/null
@@ -1,87 +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=SYMPHONY
-
-DESCRIPTION="COIN-OR solver for mixed-integer linear programs"
-HOMEPAGE="https://projects.coin-or.org/SYMPHONY/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples glpk static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-cgl:=
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-dylp:=
-	sci-libs/coinor-osi:=
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-vol:=
-	glpk? ( sci-mathematics/glpk:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )
-	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
-	)
-	if use glpk; then
-		myeconfargs+=(
-			--with-glpk-incdir="${EPREFIX}"/usr/include
-			--with-glpk-lib=-lglpk )
-	else
-		myeconfargs+=( --without-glpk )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	# hack for parallel build, to overcome not patching Makefile.am above
-	autotools-utils_src_compile -C src libSym.la
-	autotools-utils_src_compile
-	if use doc; then
-		pushd Doc /dev/null
-		pdflatex Walkthrough && pdflatex Walkthrough
-		# does not compile and doc is online
-		#pdflatex man && pdflatex man
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	# hack for parallel install, to overcome not patching Makefile.am above
-	autotools-utils_src_install -C src install-am
-	autotools-utils_src_install
-	use doc && dodoc Doc/Walkthrough.pdf
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r Examples/*
-	fi
-}
diff --git a/sci-libs/coinor-symphony/coinor-symphony-5.6.17.ebuild b/sci-libs/coinor-symphony/coinor-symphony-5.6.17.ebuild
new file mode 100644
index 000000000000..2d7ceecd23b2
--- /dev/null
+++ b/sci-libs/coinor-symphony/coinor-symphony-5.6.17.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR solver for mixed-integer linear programs"
+HOMEPAGE="https://projects.coin-or.org/SYMPHONY/"
+SRC_URI="https://github.com/coin-or/SYMPHONY/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/SYMPHONY-releases-${PV}/SYMPHONY"
+
+LICENSE="EPL-1.0"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc glpk test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-dylp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:=
+	sci-libs/coinor-vol:=
+	glpk? ( sci-mathematics/glpk:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		dev-tex/latex2html
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		sci-libs/coinor-netlib
+		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
+
+	# Fix manual color errors.
+	sed -i 's/usenames/usenames,dvipsnames/' Doc/man.tex || die
+}
+
+src_configure() {
+	econf $(usex glpk --with-glpk-lib=-lglpk --without-glpk)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		pushd Doc >/dev/null || die
+		pdflatex Walkthrough || die
+		pdflatex man || die
+		popd >/dev/null || die
+	fi
+}
+
+src_test() {
+	# Needed given "make check" is a noop and it skips the working one.
+	emake test
+}
+
+src_install() {
+	default
+	use doc && dodoc Doc/*.pdf
+
+	# Other coinor-* use lowercase e, stay in-line with them.
+	docinto examples
+	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-symphony/metadata.xml b/sci-libs/coinor-symphony/metadata.xml
index 6933ca7ddab6..cecafbcc0904 100644
--- a/sci-libs/coinor-symphony/metadata.xml
+++ b/sci-libs/coinor-symphony/metadata.xml
@@ -18,4 +18,7 @@
   <flag name="glpk">Enable GNU Linear Programming Kit
   <pkg>sci-mathematics/glpk</pkg> support</flag>
 </use>
+<upstream>
+  <remote-id type="github">coin-or/SYMPHONY</remote-id>
+</upstream>
 </pkgmetadata>