diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-13 01:35:20 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-13 01:35:20 +0100 |
| commit | c5806fcd6b740ecbd62f4fb2e09d8c8dfa2966fc (patch) | |
| tree | 32b0c57abadad13ba25305af959e636eb410bee0 /eclass | |
| parent | ad4a5451f677f33e2de05548b45fb92a8b3d04da (diff) | |
gentoo auto-resync : 13:07:2022 - 01:35:20
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 36121 -> 36110 bytes | |||
| -rw-r--r-- | eclass/distutils-r1.eclass | 22 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 2 |
3 files changed, 17 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 94ae80efea4b..674724423d3c 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 612db00e36b7..2de70fd13ffa 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1442,12 +1442,22 @@ distutils-r1_python_compile() { fi ;; maturin) - # auditwheel may attempt to auto-bundle libraries, bug #831171 - local -x MATURIN_PEP517_ARGS=--skip-auditwheel - - # support cargo.eclass' IUSE=debug if available - in_iuse debug && use debug && - MATURIN_PEP517_ARGS+=" --cargo-extra-args=--profile=dev" + if has_version '>=dev-util/maturin-0.13'; then + # auditwheel may auto-bundle libraries (bug #831171), + # also support cargo.eclass' IUSE=debug if available + local -x MATURIN_PEP517_ARGS=" + --jobs=$(makeopts_jobs) + --skip-auditwheel + $(in_iuse debug && usex debug --profile=dev '') + " + else + # legacy support, can cleanup when depend on >=0.13 + local -x MATURIN_PEP517_ARGS=" + --skip-auditwheel + $(in_iuse debug && usex debug \ + --cargo-extra-args=--profile=dev '') + " + fi ;; no) return diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index a18ca58475f1..e54f943f94f6 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -462,7 +462,7 @@ _python_export() { python3.10) PYTHON_PKG_DEP=">=dev-lang/python-3.10.4:3.10";; python3.11) - PYTHON_PKG_DEP=">=dev-lang/python-3.11.0_beta3:3.11";; + PYTHON_PKG_DEP=">=dev-lang/python-3.11.0_beta4:3.11";; python*) PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; pypy) |