Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/cvxopt/
Date: Sun, 17 Oct 2021 07:41:57
Message-Id: 1634456488.26c8ca35cbf8db7af689bc5ed5938315973ba93c.mgorny@gentoo
1 commit: 26c8ca35cbf8db7af689bc5ed5938315973ba93c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 17 07:35:12 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 17 07:41:28 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c8ca35
7
8 dev-python/cvxopt: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/cvxopt/Manifest | 2 -
13 dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild | 174 -------------------------------
14 dev-python/cvxopt/cvxopt-1.2.6.ebuild | 164 -----------------------------
15 3 files changed, 340 deletions(-)
16
17 diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
18 index d3ca327d12f..23a735ebcce 100644
19 --- a/dev-python/cvxopt/Manifest
20 +++ b/dev-python/cvxopt/Manifest
21 @@ -1,3 +1 @@
22 -DIST cvxopt-1.2.5.tar.gz 6742389 BLAKE2B 32e872d13624250610e7eecf2a5755b7b2adbf98dd9b7d1b0d6e236d62677fcdef7c08a2365d7b511f755a38b34a29ff78b280fb7e92ec6256a71c63e022e003 SHA512 d21d9977941140e76d1619a1239fab5d93a3467c4cbeacca2003168c96e1bbec9698563dba07107f6e0a84a0af92124d5c868af599bd049b64f47a3cd3753afc
23 -DIST cvxopt-1.2.6.tar.gz 4114036 BLAKE2B d7516c06c00907a42bbcfa99611febd87fa8480ddb812b7abc0a3b6c5a642c87756fa36d6434b4933797a03d4d94bb2838341da6f00143b9f058710e8f625447 SHA512 7b1c092d970e726b262bb5b07d9c8ca6a7081902707a812a6b196e7cb76523bd67b346024b96087622d39d564f4f095485d4f875c88dcc8921ec2185734b0969
24 DIST cvxopt-1.2.7.tar.gz 4115486 BLAKE2B 6db890b271d99709f433269190461291702a95874dd13b218d1529e02da80eee43385397c5dcc31099666441b51207557bc0a91c403c75aa11f04334358eefd4 SHA512 09b92e33eb69dccd4ce1ff8f63eb81973cce15804bbdede91c1f81d146d9a643d8a29315f324774f02fa0f0fed2edfd698ba9a1a7345aeae1f5a25d24b776274
25
26 diff --git a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
27 deleted file mode 100644
28 index 0b300420950..00000000000
29 --- a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
30 +++ /dev/null
31 @@ -1,174 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -PYTHON_COMPAT=( python3_{7,8,9} )
38 -
39 -inherit distutils-r1 toolchain-funcs
40 -
41 -DESCRIPTION="Python package for convex optimization"
42 -HOMEPAGE="https://cvxopt.org/ https://github.com/cvxopt/cvxopt"
43 -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
44 -
45 -LICENSE="GPL-3"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
48 -IUSE="doc +dsdp examples fftw +glpk gsl test"
49 -RESTRICT="!test? ( test )"
50 -
51 -DEPEND="
52 - virtual/blas
53 - virtual/lapack
54 - sci-libs/amd:0=
55 - sci-libs/cholmod:0=
56 - sci-libs/colamd:0=
57 - sci-libs/suitesparseconfig:0=
58 - sci-libs/umfpack:0=
59 - dsdp? ( sci-libs/dsdp:0= )
60 - fftw? ( sci-libs/fftw:3.0= )
61 - glpk? ( >=sci-mathematics/glpk-4.49:0= )
62 - gsl? ( sci-libs/gsl:0= )"
63 -
64 -RDEPEND="${DEPEND}"
65 -
66 -BDEPEND="virtual/pkgconfig
67 - doc? ( dev-python/sphinx )
68 - test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )"
69 -
70 -# The BLAS_LIB and LAPACK_LIB variables (among others) in cvxopt's
71 -# setup.py are passed in as colon-delimited strings. So, for example,
72 -# if your blas "l" flags are "-lblas -lcblas", then cvxopt wants
73 -# "blas;cblas" for BLAS_LIB.
74 -#
75 -# The following function takes a flag type ("l", "L", or "I") as its
76 -# first argument and a list of packages as its remaining arguments. It
77 -# outputs a list of libraries, library paths, or include paths,
78 -# respectively, for the given packages, retrieved using pkg-config and
79 -# deduplicated, in the appropriate format.
80 -#
81 -cvxopt_output() {
82 - local FLAGNAME="${1}"
83 - shift
84 - local PACKAGES="${@}"
85 -
86 - local PKGCONFIG_MODE
87 - case "${FLAGNAME}" in
88 - l) PKGCONFIG_MODE="--libs-only-l";;
89 - L) PKGCONFIG_MODE="--libs-only-L";;
90 - I) PKGCONFIG_MODE="--cflags-only-I";;
91 - *) echo "invalid flag name: ${FLAGNAME}"; exit 1;;
92 - esac
93 -
94 - local CVXOPT_OUTPUT=""
95 - local PKGCONFIG_ITEM
96 - for PKGCONFIG_ITEM in $($(tc-getPKG_CONFIG) ${PKGCONFIG_MODE} ${PACKAGES})
97 - do
98 - # First strip off the leading "-l", "-L", or "-I", and replace
99 - # it with a semicolon...
100 - PKGCONFIG_ITEM=";${PKGCONFIG_ITEM#-${FLAGNAME}}"
101 -
102 - # Now check to see if this element is already present in the
103 - # list, and skip it if it is. This eliminates multiple entries
104 - # from winding up in the list when multiple package arguments are
105 - # passed to this function.
106 - if [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM}}" ]]
107 - then
108 - # It was already the last entry in the list, so skip it.
109 - continue
110 - elif [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM};*}" ]]
111 - then
112 - # It was an earlier entry in the list. These two cases are
113 - # separate to ensure that we can e.g. find ";m" at the end
114 - # of the list, but that we don't find ";metis" in the process.
115 - continue
116 - fi
117 -
118 - # It isn't in the list yet, so append it.
119 - CVXOPT_OUTPUT+="${PKGCONFIG_ITEM}"
120 - done
121 -
122 - # Strip the leading ";" from ";foo;bar" before output.
123 - echo "${CVXOPT_OUTPUT#;}"
124 -}
125 -
126 -python_prepare_all() {
127 - # Mandatory dependencies.
128 - export CVXOPT_BLAS_LIB="$(cvxopt_output l blas)"
129 - export CVXOPT_BLAS_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L blas)"
130 - export CVXOPT_LAPACK_LIB="$(cvxopt_output l lapack)"
131 - export CVXOPT_SUITESPARSE_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L umfpack cholmod amd colamd suitesparseconfig)"
132 -
133 - # Most of these CVXOPT_* variables can be blank or have "empty"
134 - # entries and the resulting command-line with e.g. "-L -L/some/path"
135 - # won't hurt anything. The INC_DIR variables, however, cause
136 - # problems, because at least gcc doesn't like a bare "-I". We
137 - # pre-populate these variable with something safe so that setup.py
138 - # doesn't look in the wrong place if pkg-config doesn't return any
139 - # extra -I directories. This is
140 - #
141 - # https://github.com/cvxopt/cvxopt/issues/167
142 - #
143 - CVXOPT_SUITESPARSE_INC_DIR="${EPREFIX}/usr/include"
144 - local SUITESPARSE_LOCAL_INCS="$(cvxopt_output I umfpack cholmod amd colamd suitesparseconfig)"
145 - if [[ -n "${SUITESPARSE_LOCAL_INCS}" ]]; then
146 - CVXOPT_SUITESPARSE_INC_DIR+=";${SUITESPARSE_LOCAL_INCS}"
147 - fi
148 - export CVXOPT_SUITESPARSE_INC_DIR
149 -
150 - # optional dependencies
151 - if use dsdp; then
152 - # no pkg-config file at the moment
153 - export CVXOPT_BUILD_DSDP=1
154 - export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
155 - export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include"
156 - fi
157 -
158 - if use fftw; then
159 - export CVXOPT_BUILD_FFTW=1
160 - export CVXOPT_FFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L fftw3)"
161 - CVXOPT_FFTW_INC_DIR="${EPREFIX}/usr/include"
162 - FFTW_LOCAL_INCS="$(cvxopt_output I fftw3)"
163 - if [[ -n "${FFTW_LOCAL_INCS}" ]]; then
164 - CVXOPT_FFTW_INC_DIR+=";${FFTW_LOCAL_INCS}"
165 - fi
166 - export CVXOPT_FFTW_INC_DIR
167 - fi
168 -
169 - if use glpk; then
170 - # no pkg-config file at the moment
171 - export CVXOPT_BUILD_GLPK=1
172 - export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
173 - export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include"
174 - fi
175 -
176 - if use gsl; then
177 - export CVXOPT_BUILD_GSL=1
178 - export CVXOPT_GSL_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L gsl)"
179 - CVXOPT_GSL_INC_DIR="${EPREFIX}/usr/include"
180 - GSL_LOCAL_INCS="$(cvxopt_output I gsl)"
181 - if [[ -n "${GSL_LOCAL_INCS}" ]]; then
182 - CVXOPT_GSL_INC_DIR+=";${GSL_LOCAL_INCS}"
183 - fi
184 - export CVXOPT_GSL_INC_DIR
185 - fi
186 -
187 - distutils-r1_python_prepare_all
188 -}
189 -
190 -python_compile_all() {
191 - use doc && VARTEXFONTS="${T}/fonts" emake -C doc -B html
192 -}
193 -
194 -python_test() {
195 - PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die
196 -}
197 -
198 -python_install_all() {
199 - use doc && HTML_DOCS=( doc/build/html/. )
200 - distutils-r1_python_install_all
201 - if use examples; then
202 - dodoc -r examples
203 - docompress -x "/usr/share/doc/${PF}/examples"
204 - fi
205 -}
206
207 diff --git a/dev-python/cvxopt/cvxopt-1.2.6.ebuild b/dev-python/cvxopt/cvxopt-1.2.6.ebuild
208 deleted file mode 100644
209 index e2442f3b8c2..00000000000
210 --- a/dev-python/cvxopt/cvxopt-1.2.6.ebuild
211 +++ /dev/null
212 @@ -1,164 +0,0 @@
213 -# Copyright 1999-2021 Gentoo Authors
214 -# Distributed under the terms of the GNU General Public License v2
215 -
216 -EAPI=7
217 -
218 -PYTHON_COMPAT=( python3_{7..9} )
219 -
220 -inherit distutils-r1 toolchain-funcs
221 -
222 -DESCRIPTION="Python package for convex optimization"
223 -HOMEPAGE="https://cvxopt.org/ https://github.com/cvxopt/cvxopt"
224 -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
225 -
226 -LICENSE="GPL-3"
227 -SLOT="0"
228 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
229 -IUSE="+dsdp examples fftw +glpk gsl"
230 -RESTRICT="!test? ( test )"
231 -
232 -DEPEND="
233 - virtual/blas
234 - virtual/lapack
235 - sci-libs/amd:0=
236 - sci-libs/cholmod:0=
237 - sci-libs/colamd:0=
238 - sci-libs/suitesparseconfig:0=
239 - sci-libs/umfpack:0=
240 - dsdp? ( sci-libs/dsdp:0= )
241 - fftw? ( sci-libs/fftw:3.0= )
242 - glpk? ( >=sci-mathematics/glpk-4.49:0= )
243 - gsl? ( sci-libs/gsl:0= )"
244 -RDEPEND="${DEPEND}"
245 -BDEPEND="virtual/pkgconfig"
246 -
247 -distutils_enable_sphinx doc/source --no-autodoc
248 -distutils_enable_tests pytest
249 -
250 -# The BLAS_LIB and LAPACK_LIB variables (among others) in cvxopt's
251 -# setup.py are passed in as colon-delimited strings. So, for example,
252 -# if your blas "l" flags are "-lblas -lcblas", then cvxopt wants
253 -# "blas;cblas" for BLAS_LIB.
254 -#
255 -# The following function takes a flag type ("l", "L", or "I") as its
256 -# first argument and a list of packages as its remaining arguments. It
257 -# outputs a list of libraries, library paths, or include paths,
258 -# respectively, for the given packages, retrieved using pkg-config and
259 -# deduplicated, in the appropriate format.
260 -#
261 -cvxopt_output() {
262 - local FLAGNAME="${1}"
263 - shift
264 - local PACKAGES="${@}"
265 -
266 - local PKGCONFIG_MODE
267 - case "${FLAGNAME}" in
268 - l) PKGCONFIG_MODE="--libs-only-l";;
269 - L) PKGCONFIG_MODE="--libs-only-L";;
270 - I) PKGCONFIG_MODE="--cflags-only-I";;
271 - *) echo "invalid flag name: ${FLAGNAME}"; exit 1;;
272 - esac
273 -
274 - local CVXOPT_OUTPUT=""
275 - local PKGCONFIG_ITEM
276 - for PKGCONFIG_ITEM in $($(tc-getPKG_CONFIG) ${PKGCONFIG_MODE} ${PACKAGES})
277 - do
278 - # First strip off the leading "-l", "-L", or "-I", and replace
279 - # it with a semicolon...
280 - PKGCONFIG_ITEM=";${PKGCONFIG_ITEM#-${FLAGNAME}}"
281 -
282 - # Now check to see if this element is already present in the
283 - # list, and skip it if it is. This eliminates multiple entries
284 - # from winding up in the list when multiple package arguments are
285 - # passed to this function.
286 - if [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM}}" ]]
287 - then
288 - # It was already the last entry in the list, so skip it.
289 - continue
290 - elif [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM};*}" ]]
291 - then
292 - # It was an earlier entry in the list. These two cases are
293 - # separate to ensure that we can e.g. find ";m" at the end
294 - # of the list, but that we don't find ";metis" in the process.
295 - continue
296 - fi
297 -
298 - # It isn't in the list yet, so append it.
299 - CVXOPT_OUTPUT+="${PKGCONFIG_ITEM}"
300 - done
301 -
302 - # Strip the leading ";" from ";foo;bar" before output.
303 - echo "${CVXOPT_OUTPUT#;}"
304 -}
305 -
306 -python_prepare_all() {
307 - # Mandatory dependencies.
308 - export CVXOPT_BLAS_LIB="$(cvxopt_output l blas)"
309 - export CVXOPT_BLAS_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L blas)"
310 - export CVXOPT_LAPACK_LIB="$(cvxopt_output l lapack)"
311 - export CVXOPT_SUITESPARSE_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L umfpack cholmod amd colamd suitesparseconfig)"
312 -
313 - # Most of these CVXOPT_* variables can be blank or have "empty"
314 - # entries and the resulting command-line with e.g. "-L -L/some/path"
315 - # won't hurt anything. The INC_DIR variables, however, cause
316 - # problems, because at least gcc doesn't like a bare "-I". We
317 - # pre-populate these variable with something safe so that setup.py
318 - # doesn't look in the wrong place if pkg-config doesn't return any
319 - # extra -I directories. This is
320 - #
321 - # https://github.com/cvxopt/cvxopt/issues/167
322 - #
323 - CVXOPT_SUITESPARSE_INC_DIR="${EPREFIX}/usr/include"
324 - local SUITESPARSE_LOCAL_INCS="$(cvxopt_output I umfpack cholmod amd colamd suitesparseconfig)"
325 - if [[ -n "${SUITESPARSE_LOCAL_INCS}" ]]; then
326 - CVXOPT_SUITESPARSE_INC_DIR+=";${SUITESPARSE_LOCAL_INCS}"
327 - fi
328 - export CVXOPT_SUITESPARSE_INC_DIR
329 -
330 - # optional dependencies
331 - if use dsdp; then
332 - # no pkg-config file at the moment
333 - export CVXOPT_BUILD_DSDP=1
334 - export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
335 - export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include"
336 - fi
337 -
338 - if use fftw; then
339 - export CVXOPT_BUILD_FFTW=1
340 - export CVXOPT_FFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L fftw3)"
341 - CVXOPT_FFTW_INC_DIR="${EPREFIX}/usr/include"
342 - FFTW_LOCAL_INCS="$(cvxopt_output I fftw3)"
343 - if [[ -n "${FFTW_LOCAL_INCS}" ]]; then
344 - CVXOPT_FFTW_INC_DIR+=";${FFTW_LOCAL_INCS}"
345 - fi
346 - export CVXOPT_FFTW_INC_DIR
347 - fi
348 -
349 - if use glpk; then
350 - # no pkg-config file at the moment
351 - export CVXOPT_BUILD_GLPK=1
352 - export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
353 - export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include"
354 - fi
355 -
356 - if use gsl; then
357 - export CVXOPT_BUILD_GSL=1
358 - export CVXOPT_GSL_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L gsl)"
359 - CVXOPT_GSL_INC_DIR="${EPREFIX}/usr/include"
360 - GSL_LOCAL_INCS="$(cvxopt_output I gsl)"
361 - if [[ -n "${GSL_LOCAL_INCS}" ]]; then
362 - CVXOPT_GSL_INC_DIR+=";${GSL_LOCAL_INCS}"
363 - fi
364 - export CVXOPT_GSL_INC_DIR
365 - fi
366 -
367 - distutils-r1_python_prepare_all
368 -}
369 -
370 -python_install_all() {
371 - distutils-r1_python_install_all
372 - if use examples; then
373 - dodoc -r examples
374 - docompress -x "/usr/share/doc/${PF}/examples"
375 - fi
376 -}