1 |
commit: f0cb3ef221dff35b8b208d8c3a64cdb9bc558d25 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 2 12:52:55 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 2 12:57:22 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0cb3ef2 |
7 |
|
8 |
dev-lang/python: Use external ensurepip wheels 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 | 7 +++---- |
13 |
1 file changed, 3 insertions(+), 4 deletions(-) |
14 |
|
15 |
diff --git a/dev-lang/python/python-3.10.6.ebuild b/dev-lang/python/python-3.10.6.ebuild |
16 |
index 3abc36d17c04..92ac47a6d7ec 100644 |
17 |
--- a/dev-lang/python/python-3.10.6.ebuild |
18 |
+++ b/dev-lang/python/python-3.10.6.ebuild |
19 |
@@ -24,10 +24,6 @@ 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=" |
30 |
@@ -50,6 +46,7 @@ RDEPEND=" |
31 |
>=sys-libs/zlib-1.1.3:= |
32 |
virtual/libcrypt:= |
33 |
virtual/libintl |
34 |
+ ensurepip? ( dev-python/ensurepip-wheels ) |
35 |
gdbm? ( sys-libs/gdbm:=[berkdb] ) |
36 |
ncurses? ( >=sys-libs/ncurses-5.2:= ) |
37 |
readline? ( |
38 |
@@ -196,6 +193,7 @@ src_configure() { |
39 |
ac_cv_header_stropts_h=no |
40 |
|
41 |
--enable-shared |
42 |
+ --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip |
43 |
--without-static-libpython |
44 |
--enable-ipv6 |
45 |
--infodir='${prefix}/share/info' |
46 |
@@ -344,6 +342,7 @@ src_install() { |
47 |
pax-mark m "${ED}/usr/bin/${abiver}" |
48 |
fi |
49 |
|
50 |
+ rm -r "${libdir}"/ensurepip/_bundled || die |
51 |
if ! use ensurepip; then |
52 |
rm -r "${libdir}"/ensurepip || die |
53 |
fi |