gentoo resync : 14.05.2020

4 files changed, 98 insertions, 82 deletions

diff --git a/sci-libs/coinor-cgl/Manifest b/sci-libs/coinor-cgl/Manifest
index 8c6837ecb6a9..155a783485ed 100644
--- a/sci-libs/coinor-cgl/Manifest
+++ b/sci-libs/coinor-cgl/Manifest
@@ -1,3 +1,3 @@
-DIST Cgl-0.58.6.tgz 5331274 BLAKE2B 6bd7218b7e87a700b74be322ab0b74dbab81590b0b77361d48247fc1d113db9ab9b878af987e22885ed3c2fde2e7d8641cd4e3977d5c4787fe1dcec3e2e3ef37 SHA512 28fe2e570cb2ebfa3109ca53e5ebb7dd3a38e2ddcfda4d7a9a1d78d4784abe1b6ab79734e6cbcee48e21791fe8353658df47d11253b04366ccb66c3e566db585
-EBUILD coinor-cgl-0.58.6.ebuild 1476 BLAKE2B 23341562e3ae4b551e4f65d00930b5da8aaa72d9efc1d01d39adac5a7404bb2fa009891c66bdcc2794da74ebcf2fc8a46dd58dfb84f5b930bc4f1f91b24024fe SHA512 65b25f3bc6a14c217f25a4994582ea0e06ae54a6d960f713f81f1c6f976e8a3dc0b2702704660c62964379cab6c2e6e99ee728d914f08bddfa9d3d4e6d704c31
-MISC metadata.xml 589 BLAKE2B 160f0447667b78356ac19e9df3f1909ec2b21abec109d785d62531e37de274e15c028a90338a6484241ae7b473c90cb76243dbc85755d6a3a966ca9203b2ddee SHA512 fa8229d1969d8076bd99381a22d70a73689eef2ac0d56235f0826491a89d5d4b8964339372c11bc586e08f99bab7c8e4e31ba016ec44f6f603b446ed768ca41f
+DIST coinor-cgl-0.60.3.tar.gz 1267590 BLAKE2B 54a215c98bc05c65d46b6c7a469e28f06d04372e257825122693f0953582c8f1be2ede91efccdd21635dc365671653f0321d314ac41d1da01b561c2173a42da4 SHA512 e34080b893cfe46f99ffee093235618679ed47b6bed9798ea2d0dc0678716d9b8d947a66f6a6b283fe41807eb323dfcb512ba39d8d73fda1efafad92c408be9d
+EBUILD coinor-cgl-0.60.3.ebuild 1911 BLAKE2B fbbf4703713e68a1093849df201015bbf75cc66e3fbb88cc945b761c2cdb876eefa364c8a1acce137bf5edb68aeeb29bca194146a3f1fb3ae7418e644a573450 SHA512 ce353fdaebc1e3f58d3fd021c6c4770732cff421720162a4fcc14c521826f9bb498388982f64e2d9e16b1c703759240c6131e2fdfbcedc74466199bcdf5da158
+MISC metadata.xml 687 BLAKE2B 1d88f6e1cd2d6ad15215bf93af32aa8cb5311237428086a52b37c82cd784589f4f2ee4ec6e8ec299767bb4baecddac280aea63cc44a6c429e9099385f9d48985 SHA512 dda7ba6fdb8137d11ba5a0fdcf17f698f3ac5e3c076fd810f176c3f0af39c0417447a1c256bcf109c27fe7dd60932984055747913a37dcf6d6717d8fac99b8db
diff --git a/sci-libs/coinor-cgl/coinor-cgl-0.58.6.ebuild b/sci-libs/coinor-cgl/coinor-cgl-0.58.6.ebuild
deleted file mode 100644
index 8b038be15c73..000000000000
--- a/sci-libs/coinor-cgl/coinor-cgl-0.58.6.ebuild
+++ /dev/null
@@ -1,68 +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=Cgl
-
-DESCRIPTION="COIN-OR cutting-plane generators library"
-HOMEPAGE="https://projects.coin-or.org/Cgl/"
-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="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-dylp:=
-	sci-libs/coinor-osi:=
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-vol:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	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
-		$(use_with doc dot)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(usex doc doxydoc "")
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild b/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild
new file mode 100644
index 000000000000..eba0819dcc2a
--- /dev/null
+++ b/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Cgl
+
+DESCRIPTION="COIN-OR cut-generation library"
+HOMEPAGE="https://projects.coin-or.org/Cgl/"
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+
+# major soname component
+SLOT="0/1"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
+
+# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
+# packages contain a check for it. Gentoo bug 601648 and upstream issue,
+#
+#   https://github.com/coin-or/CoinUtils/issues/132
+#
+BDEPEND="virtual/fortran
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+
+DEPEND="sci-libs/coinor-clp:=
+	sci-libs/coinor-dylp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:=
+	sci-libs/coinor-vol:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
+
+src_prepare() {
+	# Needed to make the --with-coin-instdir in src_configure happy.
+	dodir /usr
+
+	# They don't need to guess at this, but they do, and get it wrong...
+	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+		-i configure \
+		|| die "failed to fix the pkgconfig path in ${S}/configure"
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-dependency-linking
+		--with-coin-instdir="${ED}/usr"
+		$(use_with doc dot)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc "")
+}
+
+src_test() {
+	# NOT redundant! The build system has a "make check" target that does
+	# nothing, so if you don't specify "test" here, you'll get a no-op.
+	emake test
+}
+
+src_install() {
+	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
+
+	emake DESTDIR="${D}" install
+
+	# Duplicate junk, and in the wrong location.
+	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
+
+	use examples && dodoc -r examples
+}
diff --git a/sci-libs/coinor-cgl/metadata.xml b/sci-libs/coinor-cgl/metadata.xml
index 33d5fc8331f3..d3478ff5d458 100644
--- a/sci-libs/coinor-cgl/metadata.xml
+++ b/sci-libs/coinor-cgl/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		The COIN-OR Cut Generation Library (Cgl) is an open collection of
-		cutting plane implementations ("cut generators") for use in teaching,
-		research, and applications. Cgl can be used with other COIN-OR
-		packages that make use of cuts, such as the mixed-integer linear
-		programming.
-	</longdescription>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    The COIN-OR Cut Generation Library (Cgl) is an open collection of
+    cutting plane implementations ("cut generators") for use in
+    teaching, research, and applications. Cgl can be used with other
+    COIN-OR packages that make use of cuts, such as the mixed-integer
+    linear programming.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">coin-or/Cgl</remote-id>
+  </upstream>
 </pkgmetadata>