From 47aa9713c8608c4255d0fff35143f1a421931db1 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 19 Apr 2020 17:01:57 -0400 Subject: dev-python/cvxopt: new version supporting newer pythons. This new version 1.2.5 comes with an updated EAPI=7. This is a prerequisite for adding python-3.7 and python-3.8 support to sci-mathematics/dunshire. Bug: https://bugs.gentoo.org/718502 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Michael Orlitzky --- dev-python/cvxopt/Manifest | 2 +- dev-python/cvxopt/cvxopt-1.1.9.ebuild | 103 --------------------------------- dev-python/cvxopt/cvxopt-1.2.5.ebuild | 105 ++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 104 deletions(-) delete mode 100644 dev-python/cvxopt/cvxopt-1.1.9.ebuild create mode 100644 dev-python/cvxopt/cvxopt-1.2.5.ebuild diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest index 1da99b07011..068f2df5310 100644 --- a/dev-python/cvxopt/Manifest +++ b/dev-python/cvxopt/Manifest @@ -1 +1 @@ -DIST cvxopt-1.1.9.tar.gz 1872932 BLAKE2B 50990b8432d32db68580243a5f547a4be2fd36f23196b1505e90eccef9fab5526ea485bf9f81539842229eb276345edce12b064065a1e13125d5adca0de07e8c SHA512 bb0982cd1489157df4c7cd0dd92bf83b1692dc3a27d6b9a7a465dda9f9daea4ea5ef69e48642a879d036679bd0b0fe0dfd782433ce4cc570e90e11823733e58b +DIST cvxopt-1.2.5.tar.gz 6742389 BLAKE2B 32e872d13624250610e7eecf2a5755b7b2adbf98dd9b7d1b0d6e236d62677fcdef7c08a2365d7b511f755a38b34a29ff78b280fb7e92ec6256a71c63e022e003 SHA512 d21d9977941140e76d1619a1239fab5d93a3467c4cbeacca2003168c96e1bbec9698563dba07107f6e0a84a0af92124d5c868af599bd049b64f47a3cd3753afc diff --git a/dev-python/cvxopt/cvxopt-1.1.9.ebuild b/dev-python/cvxopt/cvxopt-1.1.9.ebuild deleted file mode 100644 index 992320c342b..00000000000 --- a/dev-python/cvxopt/cvxopt-1.1.9.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 toolchain-funcs - -DESCRIPTION="Python package for convex optimization" -HOMEPAGE="http://cvxopt.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc +dsdp examples fftw +glpk gsl" - -RDEPEND=" - virtual/blas - virtual/lapack - sci-libs/amd:0= - sci-libs/cholmod:0= - sci-libs/colamd:0= - sci-libs/suitesparseconfig:0= - sci-libs/umfpack:0= - dsdp? ( sci-libs/dsdp:0= ) - fftw? ( sci-libs/fftw:3.0= ) - glpk? ( >=sci-mathematics/glpk-4.49:0= ) - gsl? ( sci-libs/gsl:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( dev-python/sphinx )" - -python_prepare_all() { - pkg_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $* | \ - sed -e 's:[ ]-l*\(pthread\|m\)\([ ]\|$\)::g' -e 's:[ ]*$::' | \ - tr ' ' '\n' | sort -u | sed -e "s:^-l\(.*\):\1:g" | \ - tr '\n' ';' | sed -e 's:;$::' - } - pkg_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $* | \ - sed -e 's:[ ]*$::' | \ - tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):\1:g" | \ - tr '\n' ';' | sed -e 's:;$::' - } - pkg_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $* | \ - sed -e 's:[ ]*$::' | \ - tr ' ' '\n' | sort -u | sed -e "s:^-I\(.*\):\1:g" | \ - tr '\n' ';' | sed -e 's:,$::' - } - - # mandatory dependencies - export CVXOPT_BLAS_LIB="$(pkg_libs blas)" - export CVXOPT_BLAS_LIB_DIR="$(pkg_libdir blas)" - export CVXOPT_LAPACK_LIB="$(pkg_libs lapack)" - export CVXOPT_SUITESPARSE_LIB_DIR="$(pkg_libdir umfpack cholmod amd colamd suitesparseconfig)" - export CVXOPT_SUITESPARSE_INC_DIR="$(pkg_incdir umfpack cholmod amd colamd suitesparseconfig)" - - # optional dependencies - use dsdp && \ - export CVXOPT_BUILD_DSDP=1 && \ - export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" && \ - export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include" - - use fftw && \ - export CVXOPT_BUILD_FFTW=1 && \ - export CVXOPT_FFTW_LIB_DIR="$(pkg_libdir fftw3)" && \ - export CVXOPT_FFTW_INC_DIR="$(pkg_incdir fftw3)" - - use glpk && \ - export CVXOPT_BUILD_GLPK=1 && \ - export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" && \ - export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include" - - use gsl && \ - export CVXOPT_BUILD_GSL=1 && \ - export CVXOPT_GSL_LIB_DIR="$(pkg_libdir gsl)" && \ - export CVXOPT_GSL_INC_DIR="$(pkg_incdir gsl)" - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && VARTEXFONTS="${T}/fonts" emake -C doc -B html -} - -python_test() { - PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die -} - -python_install_all() { - use doc && HTML_DOCS=( doc/build/html/. ) - insinto /usr/share/doc/${PF} - distutils-r1_python_install_all - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-python/cvxopt/cvxopt-1.2.5.ebuild b/dev-python/cvxopt/cvxopt-1.2.5.ebuild new file mode 100644 index 00000000000..4f197405a30 --- /dev/null +++ b/dev-python/cvxopt/cvxopt-1.2.5.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) + +inherit distutils-r1 toolchain-funcs + +DESCRIPTION="Python package for convex optimization" +HOMEPAGE="http://cvxopt.org/ https://github.com/cvxopt/cvxopt" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc +dsdp examples fftw +glpk gsl test" +RESTRICT="!test? ( test )" + +DEPEND=" + virtual/blas + virtual/lapack + sci-libs/amd:0= + sci-libs/cholmod:0= + sci-libs/colamd:0= + sci-libs/suitesparseconfig:0= + sci-libs/umfpack:0= + dsdp? ( sci-libs/dsdp:0= ) + fftw? ( sci-libs/fftw:3.0= ) + glpk? ( >=sci-mathematics/glpk-4.49:0= ) + gsl? ( sci-libs/gsl:0= )" + +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig + doc? ( dev-python/sphinx ) + test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )" + +python_prepare_all() { + pkg_libs() { + $(tc-getPKG_CONFIG) --libs-only-l $* | \ + sed -e 's:[ ]-l*\(pthread\|m\)\([ ]\|$\)::g' -e 's:[ ]*$::' | \ + tr ' ' '\n' | sort -u | sed -e "s:^-l\(.*\):\1:g" | \ + tr '\n' ';' | sed -e 's:;$::' + } + pkg_libdir() { + $(tc-getPKG_CONFIG) --libs-only-L $* | \ + sed -e 's:[ ]*$::' | \ + tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):\1:g" | \ + tr '\n' ';' | sed -e 's:;$::' + } + pkg_incdir() { + $(tc-getPKG_CONFIG) --cflags-only-I $* | \ + sed -e 's:[ ]*$::' | \ + tr ' ' '\n' | sort -u | sed -e "s:^-I\(.*\):\1:g" | \ + tr '\n' ';' | sed -e 's:,$::' + } + + # mandatory dependencies + export CVXOPT_BLAS_LIB="$(pkg_libs blas)" + export CVXOPT_BLAS_LIB_DIR="$(pkg_libdir blas)" + export CVXOPT_LAPACK_LIB="$(pkg_libs lapack)" + export CVXOPT_SUITESPARSE_LIB_DIR="$(pkg_libdir umfpack cholmod amd colamd suitesparseconfig)" + export CVXOPT_SUITESPARSE_INC_DIR="$(pkg_incdir umfpack cholmod amd colamd suitesparseconfig)" + + # optional dependencies + use dsdp && \ + export CVXOPT_BUILD_DSDP=1 && \ + export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" && \ + export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include" + + use fftw && \ + export CVXOPT_BUILD_FFTW=1 && \ + export CVXOPT_FFTW_LIB_DIR="$(pkg_libdir fftw3)" && \ + export CVXOPT_FFTW_INC_DIR="$(pkg_incdir fftw3)" + + use glpk && \ + export CVXOPT_BUILD_GLPK=1 && \ + export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" && \ + export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include" + + use gsl && \ + export CVXOPT_BUILD_GSL=1 && \ + export CVXOPT_GSL_LIB_DIR="$(pkg_libdir gsl)" && \ + export CVXOPT_GSL_INC_DIR="$(pkg_incdir gsl)" + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && VARTEXFONTS="${T}/fonts" emake -C doc -B html +} + +python_test() { + PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die +} + +python_install_all() { + use doc && HTML_DOCS=( doc/build/html/. ) + distutils-r1_python_install_all + if use examples; then + dodoc -r examples + docompress -x "/usr/share/doc/${PF}/examples" + fi +} -- cgit v1.2.3-18-g5258