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-lang/python/
Date: Tue, 02 Aug 2022 13:03:04
Message-Id: 1659445040.936ce4d6099309c5ae7893394ebd08aff37d35ca.mgorny@gentoo
1 commit: 936ce4d6099309c5ae7893394ebd08aff37d35ca
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 2 11:55:56 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 2 12:57:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936ce4d6
7
8 dev-lang/python: Support disabling ensurepip in 3.10.6
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-lang/python/python-3.10.6.ebuild | 12 +++++++++++-
13 1 file changed, 11 insertions(+), 1 deletion(-)
14
15 diff --git a/dev-lang/python/python-3.10.6.ebuild b/dev-lang/python/python-3.10.6.ebuild
16 index 18d079692b96..3abc36d17c04 100644
17 --- a/dev-lang/python/python-3.10.6.ebuild
18 +++ b/dev-lang/python/python-3.10.6.ebuild
19 @@ -24,9 +24,16 @@ SRC_URI="
20 S="${WORKDIR}/${MY_P}"
21
22 LICENSE="PSF-2"
23 +# ensurepip bundles pip and setuptools, and pip bundles a lot
24 +LICENSE+="
25 + ensurepip? ( Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2 )
26 +"
27 SLOT="${PYVER}"
28 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
29 -IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
30 +IUSE="
31 + bluetooth build +ensurepip examples gdbm hardened libedit lto
32 + +ncurses pgo +readline +sqlite +ssl test tk wininst +xml
33 +"
34 RESTRICT="!test? ( test )"
35
36 # Do not add a dependency on dev-lang/python to this ebuild.
37 @@ -337,6 +344,9 @@ src_install() {
38 pax-mark m "${ED}/usr/bin/${abiver}"
39 fi
40
41 + if ! use ensurepip; then
42 + rm -r "${libdir}"/ensurepip || die
43 + fi
44 use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
45 use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die