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

[Michał Górny]

commit:     dfe79c6113563adda84854ece2f2a5243e01a0e8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  5 09:44:05 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul  5 09:47:08 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe79c61

dev-lang/pypy: Inline dev-python/ensurepip-wheels dep

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

 .../{pypy-3.10.7.3.19_p5.ebuild => pypy-3.10.7.3.19_p5-r1.ebuild}    | 5 ++++-
 .../{pypy-3.11.7.3.19_p11.ebuild => pypy-3.11.7.3.19_p11-r1.ebuild}  | 5 ++++-
 .../pypy/{pypy-3.11.7.3.20.ebuild => pypy-3.11.7.3.20-r1.ebuild}     | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dev-lang/pypy/pypy-3.10.7.3.19_p5.ebuild 
b/dev-lang/pypy/pypy-3.10.7.3.19_p5-r1.ebuild
similarity index 98%
rename from dev-lang/pypy/pypy-3.10.7.3.19_p5.ebuild
rename to dev-lang/pypy/pypy-3.10.7.3.19_p5-r1.ebuild
index 9c152a12f7b3..de73d27be28c 100644
--- a/dev-lang/pypy/pypy-3.10.7.3.19_p5.ebuild
+++ b/dev-lang/pypy/pypy-3.10.7.3.19_p5-r1.ebuild
@@ -41,7 +41,10 @@ RDEPEND="
        )
        dev-libs/openssl:0=
        dev-python/gentoo-common
-       ensurepip? ( dev-python/ensurepip-wheels )
+       ensurepip? (
+               dev-python/ensurepip-pip
+               dev-python/ensurepip-setuptools
+       )
        gdbm? ( sys-libs/gdbm:0= )
        sqlite? ( dev-db/sqlite:3= )
        tk? (

diff --git a/dev-lang/pypy/pypy-3.11.7.3.19_p11.ebuild 
b/dev-lang/pypy/pypy-3.11.7.3.19_p11-r1.ebuild
similarity index 98%
rename from dev-lang/pypy/pypy-3.11.7.3.19_p11.ebuild
rename to dev-lang/pypy/pypy-3.11.7.3.19_p11-r1.ebuild
index ecd19ecf06a9..733050cef0cc 100644
--- a/dev-lang/pypy/pypy-3.11.7.3.19_p11.ebuild
+++ b/dev-lang/pypy/pypy-3.11.7.3.19_p11-r1.ebuild
@@ -42,7 +42,10 @@ RDEPEND="
        dev-lang/python-exec[python_targets_pypy${PYVER/./_}(-)]
        dev-libs/openssl:0=
        dev-python/gentoo-common
-       ensurepip? ( dev-python/ensurepip-wheels )
+       ensurepip? (
+               dev-python/ensurepip-pip
+               dev-python/ensurepip-setuptools
+       )
        gdbm? ( sys-libs/gdbm:0= )
        sqlite? ( dev-db/sqlite:3= )
        tk? (

diff --git a/dev-lang/pypy/pypy-3.11.7.3.20.ebuild 
b/dev-lang/pypy/pypy-3.11.7.3.20-r1.ebuild
similarity index 98%
rename from dev-lang/pypy/pypy-3.11.7.3.20.ebuild
rename to dev-lang/pypy/pypy-3.11.7.3.20-r1.ebuild
index 3601b5226f4d..dc5c71018627 100644
--- a/dev-lang/pypy/pypy-3.11.7.3.20.ebuild
+++ b/dev-lang/pypy/pypy-3.11.7.3.20-r1.ebuild
@@ -42,7 +42,10 @@ RDEPEND="
        dev-lang/python-exec[python_targets_pypy${PYVER/./_}(-)]
        dev-libs/openssl:0=
        dev-python/gentoo-common
-       ensurepip? ( dev-python/ensurepip-wheels )
+       ensurepip? (
+               dev-python/ensurepip-pip
+               dev-python/ensurepip-setuptools
+       )
        gdbm? ( sys-libs/gdbm:0= )
        sqlite? ( dev-db/sqlite:3= )
        tk? (