gentoo auto-resync : 29:10:2023 - 21:37:46

3 files changed, 3 insertions, 183 deletions

diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index aa46cb4afd8a..41425d3646d2 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,5 +1,3 @@
-DIST cvxopt-1.3.1.gh.tar.gz 3958725 BLAKE2B 48b5477f27323da3c5ba69eb993250fe54e793ebb757c84d77ff5c63fb47a649a4a15137d32efd747627ccd629096fd4ac3c70912222fe3e367f0fc062760266 SHA512 9531b83785589c55192e1daa98e3a78288b429a67d2704c8953b9def1a2f8dd4389d17be43fd5deb6c051485e43e5e0e726a2752d126d7289163d7a5a02205dc
 DIST cvxopt-1.3.2.gh.tar.gz 4095027 BLAKE2B ad4dfba1fe9c5be700ba61268e9d245355493c0334688b7a08bd4b5c4127da7a276cc660a1c1f4fe4df2359f9d2a8e3c4907d57d23c29d8caaf0329f6834cc30 SHA512 a6f9006b8b83445d781b1ba876e5ecefe724cf8666f47744b010e9c61fa1786dbd6233459a6e6a1a333ef9ac075d280076b2aeee3a2636d27541a615c5607b34
-EBUILD cvxopt-1.3.1.ebuild 5467 BLAKE2B 36a4006a3793fb4caca6075a324a81cfd2f4ab9479f8757513b75c0c1e16616ea579d2e958ccbe5033dce00598617e2fcaf7e88d7cf9a3ce86360bd353e26b22 SHA512 c4721e286572b131730f196f0abfbfd9c70c03913797f5759dec6925bcd2dd14eb36536f45e6e0dd53a8519ee56b669221ce518e5c83f20f27f4b9901a036a77
-EBUILD cvxopt-1.3.2.ebuild 5468 BLAKE2B bb34c6683c8c4e415a9dd8b322e81632bd1d90d618342f97005269c6492529fe7e5c8e633abcb9d37547dddfaa5500c046ef4d2a80e92c3f507372e31ec43ca5 SHA512 61e8cdc78500b5fdc1c148307f86e6c631dfcca78aa592c1f75aa30892d2f707085452d82cc660fce6407a9e26429e1de930ac7ba09764e4e332046f1dd1d945
+EBUILD cvxopt-1.3.2.ebuild 5484 BLAKE2B b7c44f5762f227cf0b364ee7c348a5c93871153698deb88f38ea2aa4aae64bad328504b51779a0bd542c4ced6d1968d617e5a24b7cc6d459e40e930f99e859ba SHA512 f50ca46f9ffa7ab24f6fa6cdc4e3f520695555eb5abd5455ca08097836333d03ecdc951f905f4873c091122dd3afc05d270be843afadca9d76df0ee4b59f11a9
 MISC metadata.xml 937 BLAKE2B 56df0383c4cf21f724c336398a7a78504cab6a838a5dd16a689c3c99b93645fe82bbb50def4c847b414fc16f7d2771e6c6889d4442f73e2e4b9be7769dd9676f SHA512 3ef4196f1ee00ed1831e9b4027c95b6fd2ccce0cfa7b8ec1a5e42397cb16f61992697357ace2b42835844844894207aa569250ec2992b39e27376da359de327e
diff --git a/dev-python/cvxopt/cvxopt-1.3.1.ebuild b/dev-python/cvxopt/cvxopt-1.3.1.ebuild
deleted file mode 100644
index f986ec811a65..000000000000
--- a/dev-python/cvxopt/cvxopt-1.3.1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python package for convex optimization"
-HOMEPAGE="
-	https://cvxopt.org/
-	https://github.com/cvxopt/cvxopt/
-	https://pypi.org/project/cvxopt/
-"
-# no sdist, as of 1.3.1
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+dsdp examples fftw +glpk gsl"
-
-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="
-	>=dev-python/setuptools-scm-6.2[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-"
-
-distutils_enable_sphinx doc/source \
-	dev-python/sphinx-rtd-theme
-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#;}"
-}
-
-src_configure() {
-	# 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
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-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.2.ebuild b/dev-python/cvxopt/cvxopt-1.3.2.ebuild
index 3c10fa82ec6b..97cde1fd196c 100644
--- a/dev-python/cvxopt/cvxopt-1.3.2.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.3.2.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 toolchain-funcs