From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-python/cvxopt/Manifest | 6 +- dev-python/cvxopt/cvxopt-1.2.7.ebuild | 164 ---------------------------------- dev-python/cvxopt/cvxopt-1.3.0.ebuild | 25 ++++-- dev-python/cvxopt/metadata.xml | 4 + 4 files changed, 25 insertions(+), 174 deletions(-) delete mode 100644 dev-python/cvxopt/cvxopt-1.2.7.ebuild (limited to 'dev-python/cvxopt') diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest index 22800564cc5c..b6174ad70ac1 100644 --- a/dev-python/cvxopt/Manifest +++ b/dev-python/cvxopt/Manifest @@ -1,6 +1,4 @@ AUX cvxopt-1.3.0-versioneer-buildfix.patch 1302 BLAKE2B 40be5ad702350869162a9144504c37bae1af8375df08ca11197df2fae524876d43a37cf63566d3c3daf714034e17d5d64919e400b373b9e557907881e25d39dc SHA512 00ffcba4730e11a0860c91ae224a1c1731c2c41ebb5d3748107e17cb83fd5fef15d0568eff34901554a03666d9ecf2adc82251e455d7bf1c722be51cf28574ff -DIST cvxopt-1.2.7.tar.gz 4115486 BLAKE2B 6db890b271d99709f433269190461291702a95874dd13b218d1529e02da80eee43385397c5dcc31099666441b51207557bc0a91c403c75aa11f04334358eefd4 SHA512 09b92e33eb69dccd4ce1ff8f63eb81973cce15804bbdede91c1f81d146d9a643d8a29315f324774f02fa0f0fed2edfd698ba9a1a7345aeae1f5a25d24b776274 DIST cvxopt-1.3.0.tar.gz 4120085 BLAKE2B f4cb23146897d3f4b24e0fc4d59bd89e2c5b49c83aecdbec02297abbea8a16ecab85a02e9c187debbf3a03cc62e4c46128acefbec2af7ea20558e7fa1d1c0bd0 SHA512 b719100abb0b049765963dc4ca9f646b508a319b5f8390aa7a0578056d32a32573e195c136ffb907a57135e337887d2256c9a0883e63dad966dab43cad0bf58a -EBUILD cvxopt-1.2.7.ebuild 5308 BLAKE2B 57fdbf06dff84baeaa6b252aa03df34c9b492e0320d78197c481127d42423d990c775e5a596c82b593fc811e714c5e8bcd04d5523a7e361ff2fe617b056d9948 SHA512 86b7a57500849deb727507c0f7be457861f5d85f016bca4705bad0dba81470e680a8f816e2c50744b697ccbd078fd5e8aee1f330ab0d8fb87bbf53a726c017ce -EBUILD cvxopt-1.3.0.ebuild 5378 BLAKE2B 448a4e8ea0a53d96e10e2c94daef769ebafd939c1d57761c5ed88d6dda78f47714ae75c8bd478ad92e4d766a70e27ca97419f8dfab6ee215c004f4d09f39e0de SHA512 c77841649c095bdc8016366aa0a28604dc67e29f14d4af3dbcba1eabcb868e8264170c15c43e903e41ad5a0ab3a9de34c54d956b73c5bb135526b6059f70a4e6 -MISC metadata.xml 836 BLAKE2B fea994c2d1aefd2bef56407cb9a915820c11a118e7f876b016eb2b4e2c405030eeb7bdb20a6174e2144198f766757b321de042363931bd4216d04371431f6a66 SHA512 ce92cb1df5f4983953fd862e876970a39bbb2487d683868d3e9c9922238c53222e61e0f55376d332b33c61dd0d17ce272aa610c449155dd23263dbdffd3bf035 +EBUILD cvxopt-1.3.0.ebuild 5430 BLAKE2B dab7286f77b366f22b85903b036b7a6b51410a4d34a5294457cd2663cece5e64034919dd683269543d899f6cf9cce0db0c3d4506bfdcc4e99328158311cd7a82 SHA512 9aa6cb5929a9703d2d34f0f81d2427e6596b4d9a1a3d0b1eefcfd292bacb3d4135a63d3bab7f56eef02fd158fc8a41ca5e741799ea9dea2175b7e780a1c25281 +MISC metadata.xml 937 BLAKE2B 56df0383c4cf21f724c336398a7a78504cab6a838a5dd16a689c3c99b93645fe82bbb50def4c847b414fc16f7d2771e6c6889d4442f73e2e4b9be7769dd9676f SHA512 3ef4196f1ee00ed1831e9b4027c95b6fd2ccce0cfa7b8ec1a5e42397cb16f61992697357ace2b42835844844894207aa569250ec2992b39e27376da359de327e diff --git a/dev-python/cvxopt/cvxopt-1.2.7.ebuild b/dev-python/cvxopt/cvxopt-1.2.7.ebuild deleted file mode 100644 index 2f9c0c1b5b48..000000000000 --- a/dev-python/cvxopt/cvxopt-1.2.7.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 toolchain-funcs - -DESCRIPTION="Python package for convex optimization" -HOMEPAGE="https://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="+dsdp examples fftw +glpk gsl" -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" - -distutils_enable_sphinx doc/source --no-autodoc -distutils_enable_tests pytest - -# The BLAS_LIB and LAPACK_LIB variables (among others) in cvxopt's -# setup.py are passed in as colon-delimited strings. So, for example, -# if your blas "l" flags are "-lblas -lcblas", then cvxopt wants -# "blas;cblas" for BLAS_LIB. -# -# The following function takes a flag type ("l", "L", or "I") as its -# first argument and a list of packages as its remaining arguments. It -# outputs a list of libraries, library paths, or include paths, -# respectively, for the given packages, retrieved using pkg-config and -# deduplicated, in the appropriate format. -# -cvxopt_output() { - local FLAGNAME="${1}" - shift - local PACKAGES="${@}" - - local PKGCONFIG_MODE - case "${FLAGNAME}" in - l) PKGCONFIG_MODE="--libs-only-l";; - L) PKGCONFIG_MODE="--libs-only-L";; - I) PKGCONFIG_MODE="--cflags-only-I";; - *) echo "invalid flag name: ${FLAGNAME}"; exit 1;; - esac - - local CVXOPT_OUTPUT="" - local PKGCONFIG_ITEM - for PKGCONFIG_ITEM in $($(tc-getPKG_CONFIG) ${PKGCONFIG_MODE} ${PACKAGES}) - do - # First strip off the leading "-l", "-L", or "-I", and replace - # it with a semicolon... - PKGCONFIG_ITEM=";${PKGCONFIG_ITEM#-${FLAGNAME}}" - - # Now check to see if this element is already present in the - # list, and skip it if it is. This eliminates multiple entries - # from winding up in the list when multiple package arguments are - # passed to this function. - if [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM}}" ]] - then - # It was already the last entry in the list, so skip it. - continue - elif [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM};*}" ]] - then - # It was an earlier entry in the list. These two cases are - # separate to ensure that we can e.g. find ";m" at the end - # of the list, but that we don't find ";metis" in the process. - continue - fi - - # It isn't in the list yet, so append it. - CVXOPT_OUTPUT+="${PKGCONFIG_ITEM}" - done - - # Strip the leading ";" from ";foo;bar" before output. - echo "${CVXOPT_OUTPUT#;}" -} - -python_prepare_all() { - # Mandatory dependencies. - export CVXOPT_BLAS_LIB="$(cvxopt_output l blas)" - export CVXOPT_BLAS_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L blas)" - export CVXOPT_LAPACK_LIB="$(cvxopt_output l lapack)" - export CVXOPT_SUITESPARSE_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L umfpack cholmod amd colamd suitesparseconfig)" - - # Most of these CVXOPT_* variables can be blank or have "empty" - # entries and the resulting command-line with e.g. "-L -L/some/path" - # won't hurt anything. The INC_DIR variables, however, cause - # problems, because at least gcc doesn't like a bare "-I". We - # pre-populate these variable with something safe so that setup.py - # doesn't look in the wrong place if pkg-config doesn't return any - # extra -I directories. This is - # - # https://github.com/cvxopt/cvxopt/issues/167 - # - CVXOPT_SUITESPARSE_INC_DIR="${EPREFIX}/usr/include" - local SUITESPARSE_LOCAL_INCS="$(cvxopt_output I umfpack cholmod amd colamd suitesparseconfig)" - if [[ -n "${SUITESPARSE_LOCAL_INCS}" ]]; then - CVXOPT_SUITESPARSE_INC_DIR+=";${SUITESPARSE_LOCAL_INCS}" - fi - export CVXOPT_SUITESPARSE_INC_DIR - - # optional dependencies - if use dsdp; then - # no pkg-config file at the moment - export CVXOPT_BUILD_DSDP=1 - export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include" - fi - - if use fftw; then - export CVXOPT_BUILD_FFTW=1 - export CVXOPT_FFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L fftw3)" - CVXOPT_FFTW_INC_DIR="${EPREFIX}/usr/include" - FFTW_LOCAL_INCS="$(cvxopt_output I fftw3)" - if [[ -n "${FFTW_LOCAL_INCS}" ]]; then - CVXOPT_FFTW_INC_DIR+=";${FFTW_LOCAL_INCS}" - fi - export CVXOPT_FFTW_INC_DIR - fi - - if use glpk; then - # no pkg-config file at the moment - export CVXOPT_BUILD_GLPK=1 - export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include" - fi - - if use gsl; then - export CVXOPT_BUILD_GSL=1 - export CVXOPT_GSL_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L gsl)" - CVXOPT_GSL_INC_DIR="${EPREFIX}/usr/include" - GSL_LOCAL_INCS="$(cvxopt_output I gsl)" - if [[ -n "${GSL_LOCAL_INCS}" ]]; then - CVXOPT_GSL_INC_DIR+=";${GSL_LOCAL_INCS}" - fi - export CVXOPT_GSL_INC_DIR - fi - - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - if use examples; then - dodoc -r examples - docompress -x "/usr/share/doc/${PF}/examples" - fi -} diff --git a/dev-python/cvxopt/cvxopt-1.3.0.ebuild b/dev-python/cvxopt/cvxopt-1.3.0.ebuild index c9d48eb76775..f8f880b1f16e 100644 --- a/dev-python/cvxopt/cvxopt-1.3.0.ebuild +++ b/dev-python/cvxopt/cvxopt-1.3.0.ebuild @@ -4,12 +4,20 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) + inherit distutils-r1 toolchain-funcs DESCRIPTION="Python package for convex optimization" -HOMEPAGE="https://cvxopt.org/ https://github.com/cvxopt/cvxopt" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE=" + https://cvxopt.org/ + https://github.com/cvxopt/cvxopt/ + https://pypi.org/project/cvxopt/ +" +SRC_URI=" + https://github.com/${PN}/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz +" LICENSE="GPL-3" SLOT="0" @@ -27,9 +35,14 @@ DEPEND=" 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" + gsl? ( sci-libs/gsl:0= ) +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + virtual/pkgconfig +" PATCHES=( "${FILESDIR}/cvxopt-1.3.0-versioneer-buildfix.patch" ) diff --git a/dev-python/cvxopt/metadata.xml b/dev-python/cvxopt/metadata.xml index 767106a79904..1306175a8acd 100644 --- a/dev-python/cvxopt/metadata.xml +++ b/dev-python/cvxopt/metadata.xml @@ -5,6 +5,10 @@ sci-mathematics@gentoo.org Gentoo Mathematics Project + + python@gentoo.org + Python + CVXOPT is a software for convex optimization based on the Python programming language. Its main purpose is to make the -- cgit v1.2.3