From 6606838b0dedc4fe7916e0341671884ab9478085 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Sun, 28 Mar 2021 18:36:44 -0400 Subject: 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 Closes: https://github.com/gentoo/gentoo/pull/20171 Signed-off-by: Sam James --- sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild | 58 ----------------------- sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild | 61 +++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 58 deletions(-) delete mode 100644 sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild create mode 100644 sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild (limited to 'sci-libs') diff --git a/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild b/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild deleted file mode 100644 index d19f69dd1fb7..000000000000 --- a/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# 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-symphony-5.6:= - 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 -} diff --git a/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild b/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild new file mode 100644 index 000000000000..9ea837d36076 --- /dev/null +++ b/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild @@ -0,0 +1,61 @@ +# 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-symphony-5.6:= + 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 + + # Prevent python:2.7 automagic for dippy (bug #778965) + sed -i 's/@HAVE_PYTHON_TRUE@/#/' src/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 +} -- cgit v1.2.3-65-gdbad