[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/

[Michał Górny]

commit:     fa0c3d99738ce124a98d105c64b68c68dbc38590
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 12:51:07 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 12:57:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0c3d99

dev-lang/python: Use external ensurepip wheels in 3.11.0_beta5

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{python-3.11.0_beta5.ebuild => python-3.11.0_beta5-r1.ebuild}  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-lang/python/python-3.11.0_beta5.ebuild b/dev-lang/python/python-3.11.0_beta5-r1.ebuild
similarity index 98%
rename from dev-lang/python/python-3.11.0_beta5.ebuild
rename to dev-lang/python/python-3.11.0_beta5-r1.ebuild
index 6cd158622a3f..cf8d179070ca 100644
--- a/dev-lang/python/python-3.11.0_beta5.ebuild
+++ b/dev-lang/python/python-3.11.0_beta5-r1.ebuild
@@ -27,10 +27,6 @@ SRC_URI="
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
-# ensurepip bundles pip and setuptools, and pip bundles a lot
-LICENSE+="
-	ensurepip? ( Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2 )
-"
 SLOT="${PYVER}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
@@ -54,6 +50,7 @@ RDEPEND="
 	>=sys-libs/zlib-1.1.3:=
 	virtual/libcrypt:=
 	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
 	gdbm? ( sys-libs/gdbm:=[berkdb] )
 	ncurses? ( >=sys-libs/ncurses-5.2:= )
 	readline? (
@@ -200,6 +197,7 @@ src_configure() {
 		--with-system-ffi
 		--with-platlibdir=lib
 		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
 
 		$(use_with lto)
 		$(use_enable pgo optimizations)
@@ -411,6 +409,7 @@ src_install() {
 		pax-mark m "${ED}/usr/bin/${abiver}"
 	fi
 
+	rm -r "${libdir}"/ensurepip/_bundled || die
 	if ! use ensurepip; then
 		rm -r "${libdir}"/ensurepip || die
 	fi