[gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-dip/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-dip/

[Sam James]

commit:     bfcf9cf955328cf280b7ca06e04e0ae47675be8e
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Fri Feb 26 08:41:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 03:06:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfcf9cf9

sci-libs/coinor-dip: add github remote-id

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/coinor-dip/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/coinor-dip/metadata.xml b/sci-libs/coinor-dip/metadata.xml
index a2333b002b3..3e01e7eaf8d 100644
--- a/sci-libs/coinor-dip/metadata.xml
+++ b/sci-libs/coinor-dip/metadata.xml
@@ -14,4 +14,7 @@
 		Dantzig-Wolfe decomposition, Lagrangian relaxation, and various
 		cutting plane methods.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/Dip</remote-id>
+	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-dip/

[Sam James]

commit:     61d7b70da4ad9abdcbcb545807fba769a122f491
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Fri Feb 26 09:35:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 03:06:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d7b70d

sci-libs/coinor-dip: remove old

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/coinor-dip/Manifest                |  1 -
 sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild | 58 -----------------------------
 2 files changed, 59 deletions(-)

diff --git a/sci-libs/coinor-dip/Manifest b/sci-libs/coinor-dip/Manifest
index 311cd87df33..e6972011d45 100644
--- a/sci-libs/coinor-dip/Manifest
+++ b/sci-libs/coinor-dip/Manifest
@@ -1,2 +1 @@
-DIST Dip-0.9.8.tgz 10557241 BLAKE2B 1fcddbe4b7e8ae0450fcf97473428c0a36b751bbf5b91ab45c362ca0590d390d8c0b5b4b273ed41f7e9432423c59b9a4f8536ff34b0c9c0f1c11ced779ddb38c SHA512 7dfb51f63aab36fe7e894be5f17f8b614bfdf9be1a14b8f8b2ee555dcb8392f82b13d20481d60423d3d375a2e52eebe0439e696e3b3a7dfdd18223829835d361
 DIST coinor-dip-0.95.0.tar.gz 5213061 BLAKE2B 6f40e5d20832b0463e302519da168a30bdeea011a45047acb9dbe904763fc94ccaffbee3599b6f959e0eea5e40a0456771012707b9daafc50875194a1ff9967e SHA512 a9ea2bc23d625fa19e11943f46b3bf2db49aa894fe336c8de4a9a0c735e1569bd8bef015fd671eb856ee39a334adf06c95e2708bd69c4735d5f6bf994c9e41a2

diff --git a/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild b/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild
deleted file mode 100644
index c67282ce4ec..00000000000
--- a/sci-libs/coinor-dip/coinor-dip-0.9.8.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=Dip
-
-DESCRIPTION="COIN-OR Decomposition in Integer Programming library"
-HOMEPAGE="https://projects.coin-or.org/Dip/"
-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="examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-alps:=
-	sci-libs/coinor-cbc:=
-	sci-libs/coinor-cgl:=
-	sci-libs/coinor-clp:="
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-dip/

[Sam James]

commit:     8d5eb6f356da4df3b7b4b7f0fd13a40874fffa12
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Fri Feb 26 09:28:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 03:06:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5eb6f3

sci-libs/coinor-dip: bump to 0.95.0, ported to EAPI 7

Has reworked old workarounds and reviewed deps.

USE=examples removed, now installed unconditionally (small files).
USE=doc now installs html docs.
USE=static-libs removed.

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/coinor-dip/Manifest                 |  1 +
 sci-libs/coinor-dip/coinor-dip-0.95.0.ebuild | 57 ++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/sci-libs/coinor-dip/Manifest b/sci-libs/coinor-dip/Manifest
index 6f56dedea8c..311cd87df33 100644
--- a/sci-libs/coinor-dip/Manifest
+++ b/sci-libs/coinor-dip/Manifest
@@ -1 +1,2 @@
 DIST Dip-0.9.8.tgz 10557241 BLAKE2B 1fcddbe4b7e8ae0450fcf97473428c0a36b751bbf5b91ab45c362ca0590d390d8c0b5b4b273ed41f7e9432423c59b9a4f8536ff34b0c9c0f1c11ced779ddb38c SHA512 7dfb51f63aab36fe7e894be5f17f8b614bfdf9be1a14b8f8b2ee555dcb8392f82b13d20481d60423d3d375a2e52eebe0439e696e3b3a7dfdd18223829835d361
+DIST coinor-dip-0.95.0.tar.gz 5213061 BLAKE2B 6f40e5d20832b0463e302519da168a30bdeea011a45047acb9dbe904763fc94ccaffbee3599b6f959e0eea5e40a0456771012707b9daafc50875194a1ff9967e SHA512 a9ea2bc23d625fa19e11943f46b3bf2db49aa894fe336c8de4a9a0c735e1569bd8bef015fd671eb856ee39a334adf06c95e2708bd69c4735d5f6bf994c9e41a2

diff --git a/sci-libs/coinor-dip/coinor-dip-0.95.0.ebuild b/sci-libs/coinor-dip/coinor-dip-0.95.0.ebuild
new file mode 100644
index 00000000000..d13707458c4
--- /dev/null
+++ b/sci-libs/coinor-dip/coinor-dip-0.95.0.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 Decomposition in Integer Programming library"
+HOMEPAGE="https://projects.coin-or.org/Dip/"
+SRC_URI="https://github.com/coin-or/Dip/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Dip-releases-${PV}/Dip"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-libs/coinor-alps:=
+	sci-libs/coinor-cbc:=
+	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
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-dip/

[David Seifert]

commit:     a83b2d09b14dd88b57cac0cbe5f2845cba56744e
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Sun Feb 28 15:43:58 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 15:43:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83b2d09

sci-libs/coinor-dip: add missing >=symphony-5.6 dep

Revbumped because it's possible to build without it (automagic with
no option). Unlikely to be a wanted configuration so simply depend
on it.

Fails if <5.6 is present (bug #773265)

Closes: https://bugs.gentoo.org/773265
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../coinor-dip/{coinor-dip-0.95.0.ebuild => coinor-dip-0.95.0-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/coinor-dip/coinor-dip-0.95.0.ebuild b/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild
similarity index 97%
rename from sci-libs/coinor-dip/coinor-dip-0.95.0.ebuild
rename to sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild
index d13707458c4..d19f69dd1fb 100644
--- a/sci-libs/coinor-dip/coinor-dip-0.95.0.ebuild
+++ b/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	sci-libs/coinor-cgl:=
 	sci-libs/coinor-clp:=
 	sci-libs/coinor-osi:=
+	>=sci-libs/coinor-symphony-5.6:=
 	sci-libs/coinor-utils:="
 DEPEND="${RDEPEND}"
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: sci-libs/coinor-dip/

[Sam James]

commit:     6606838b0dedc4fe7916e0341671884ab9478085
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Sun Mar 28 22:36:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 31 08:15:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6606838b

sci-libs/coinor-dip: prevent python-2.7 automagic

When python-2.7 is installed it attempts to build dippy which fails
with slibtool due a typo that GNU libtool ignored.

Rather than fix, since it installs some unsupported 2.7 site-packages,
block it and revbump to clear these.

Closes: https://bugs.gentoo.org/778965
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20171
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{coinor-dip-0.95.0-r1.ebuild => coinor-dip-0.95.0-r2.ebuild}       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild b/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild
similarity index 92%
rename from sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild
rename to sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild
index d19f69dd1fb..9ea837d3607 100644
--- a/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild
+++ b/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild
@@ -32,6 +32,9 @@ src_prepare() {
 	default
 	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
 	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+
+	# Prevent python:2.7 automagic for dippy (bug #778965)
+	sed -i 's/@HAVE_PYTHON_TRUE@/#/' src/Makefile.in || die
 }
 
 src_configure() {