From 5e21254b0cebafc6755c004a87b71a9197a68a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 5 Jul 2025 11:42:20 +0200 Subject: [PATCH] dev-lang/python: Update dev-python/ensurepip-* dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Inline dev-python/ensurepip-wheels dependencies in all Python versions to pave the way for removing the metapackage. Remove unnecessary dev-python/ensurepip-wheel test dependency from slots other than 3.12; the dependency was introduced in that version and removed in 3.13, as the bundled setuptools wheel was updated. TODO: patch 3.12 to remove the dependency as well? Signed-off-by: Michał Górny --- dev-lang/python/python-0.3.13.4.ebuild | 1 - dev-lang/python/python-0.3.13.9999.ebuild | 1 - dev-lang/python/python-0.3.14.0_beta3.ebuild | 1 - dev-lang/python/python-0.3.14.9999.ebuild | 1 - ...python-3.10.18.ebuild => python-3.10.18-r1.ebuild} | 11 +++++++++-- dev-lang/python/python-3.10.9999.ebuild | 11 +++++++++-- ...python-3.11.13.ebuild => python-3.11.13-r1.ebuild} | 11 +++++++++-- dev-lang/python/python-3.11.9999.ebuild | 11 +++++++++-- dev-lang/python/python-3.13.5.ebuild | 1 - dev-lang/python/python-3.13.9999.ebuild | 1 - dev-lang/python/python-3.14.0_beta3.ebuild | 1 - dev-lang/python/python-3.14.9999.ebuild | 1 - ...on-3.8.20_p7.ebuild => python-3.8.20_p7-r1.ebuild} | 11 +++++++++-- .../{python-3.9.23.ebuild => python-3.9.23-r1.ebuild} | 11 +++++++++-- dev-lang/python/python-3.9.9999.ebuild | 11 +++++++++-- 15 files changed, 63 insertions(+), 22 deletions(-) rename dev-lang/python/{python-3.10.18.ebuild => python-3.10.18-r1.ebuild} (98%) rename dev-lang/python/{python-3.11.13.ebuild => python-3.11.13-r1.ebuild} (98%) rename dev-lang/python/{python-3.8.20_p7.ebuild => python-3.8.20_p7-r1.ebuild} (98%) rename dev-lang/python/{python-3.9.23.ebuild => python-3.9.23-r1.ebuild} (98%) diff --git a/dev-lang/python/python-0.3.13.4.ebuild b/dev-lang/python/python-0.3.13.4.ebuild index f8274cb351f1a..58645b4268a99 100644 --- a/dev-lang/python/python-0.3.13.4.ebuild +++ b/dev-lang/python/python-0.3.13.4.ebuild @@ -77,7 +77,6 @@ DEPEND=" test? ( dev-python/ensurepip-pip dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel ) valgrind? ( dev-debug/valgrind ) " diff --git a/dev-lang/python/python-0.3.13.9999.ebuild b/dev-lang/python/python-0.3.13.9999.ebuild index 6dbe301dac38b..0861f69afcf60 100644 --- a/dev-lang/python/python-0.3.13.9999.ebuild +++ b/dev-lang/python/python-0.3.13.9999.ebuild @@ -69,7 +69,6 @@ DEPEND=" test? ( dev-python/ensurepip-pip dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel ) valgrind? ( dev-debug/valgrind ) " diff --git a/dev-lang/python/python-0.3.14.0_beta3.ebuild b/dev-lang/python/python-0.3.14.0_beta3.ebuild index 3a63db6a1878f..26514fc0a6932 100644 --- a/dev-lang/python/python-0.3.14.0_beta3.ebuild +++ b/dev-lang/python/python-0.3.14.0_beta3.ebuild @@ -78,7 +78,6 @@ DEPEND=" test? ( dev-python/ensurepip-pip dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel ) valgrind? ( dev-debug/valgrind ) " diff --git a/dev-lang/python/python-0.3.14.9999.ebuild b/dev-lang/python/python-0.3.14.9999.ebuild index d3ee27dfcafb9..391c0123711d8 100644 --- a/dev-lang/python/python-0.3.14.9999.ebuild +++ b/dev-lang/python/python-0.3.14.9999.ebuild @@ -69,7 +69,6 @@ DEPEND=" test? ( dev-python/ensurepip-pip dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel ) valgrind? ( dev-debug/valgrind ) " diff --git a/dev-lang/python/python-3.10.18.ebuild b/dev-lang/python/python-3.10.18-r1.ebuild similarity index 98% rename from dev-lang/python/python-3.10.18.ebuild rename to dev-lang/python/python-3.10.18-r1.ebuild index e773b36793d81..674506c19202b 100644 --- a/dev-lang/python/python-3.10.18.ebuild +++ b/dev-lang/python/python-3.10.18-r1.ebuild @@ -50,7 +50,10 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - ensurepip? ( dev-python/ensurepip-wheels ) + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -71,8 +74,12 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) + test? ( + app-arch/xz-utils + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) valgrind? ( dev-debug/valgrind ) - test? ( app-arch/xz-utils ) " # autoconf-archive needed to eautoreconf BDEPEND=" diff --git a/dev-lang/python/python-3.10.9999.ebuild b/dev-lang/python/python-3.10.9999.ebuild index 34bb287093020..f43d0be50200a 100644 --- a/dev-lang/python/python-3.10.9999.ebuild +++ b/dev-lang/python/python-3.10.9999.ebuild @@ -44,7 +44,10 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - ensurepip? ( dev-python/ensurepip-wheels ) + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -65,8 +68,12 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) + test? ( + app-arch/xz-utils + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) valgrind? ( dev-debug/valgrind ) - test? ( app-arch/xz-utils ) " # autoconf-archive needed to eautoreconf BDEPEND=" diff --git a/dev-lang/python/python-3.11.13.ebuild b/dev-lang/python/python-3.11.13-r1.ebuild similarity index 98% rename from dev-lang/python/python-3.11.13.ebuild rename to dev-lang/python/python-3.11.13-r1.ebuild index c5ec372681602..f078432fe3af9 100644 --- a/dev-lang/python/python-3.11.13.ebuild +++ b/dev-lang/python/python-3.11.13-r1.ebuild @@ -51,7 +51,10 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - ensurepip? ( dev-python/ensurepip-wheels ) + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -72,7 +75,11 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils ) + test? ( + app-arch/xz-utils + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) valgrind? ( dev-debug/valgrind ) " # autoconf-archive needed to eautoreconf diff --git a/dev-lang/python/python-3.11.9999.ebuild b/dev-lang/python/python-3.11.9999.ebuild index 224e9c5699b8b..769d7f5c80262 100644 --- a/dev-lang/python/python-3.11.9999.ebuild +++ b/dev-lang/python/python-3.11.9999.ebuild @@ -45,7 +45,10 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - ensurepip? ( dev-python/ensurepip-wheels ) + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -66,7 +69,11 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils ) + test? ( + app-arch/xz-utils + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) valgrind? ( dev-debug/valgrind ) " # autoconf-archive needed to eautoreconf diff --git a/dev-lang/python/python-3.13.5.ebuild b/dev-lang/python/python-3.13.5.ebuild index 11664b8e09e78..7e399422782d0 100644 --- a/dev-lang/python/python-3.13.5.ebuild +++ b/dev-lang/python/python-3.13.5.ebuild @@ -79,7 +79,6 @@ DEPEND=" test? ( dev-python/ensurepip-pip dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel ) valgrind? ( dev-debug/valgrind ) " diff --git a/dev-lang/python/python-3.13.9999.ebuild b/dev-lang/python/python-3.13.9999.ebuild index 37ac8dcf64d39..5af2cbe80f510 100644 --- a/dev-lang/python/python-3.13.9999.ebuild +++ b/dev-lang/python/python-3.13.9999.ebuild @@ -72,7 +72,6 @@ DEPEND=" test? ( dev-python/ensurepip-pip dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel ) valgrind? ( dev-debug/valgrind ) " diff --git a/dev-lang/python/python-3.14.0_beta3.ebuild b/dev-lang/python/python-3.14.0_beta3.ebuild index 4337b2f22edde..96b2eb246539e 100644 --- a/dev-lang/python/python-3.14.0_beta3.ebuild +++ b/dev-lang/python/python-3.14.0_beta3.ebuild @@ -80,7 +80,6 @@ DEPEND=" test? ( dev-python/ensurepip-pip dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel ) valgrind? ( dev-debug/valgrind ) " diff --git a/dev-lang/python/python-3.14.9999.ebuild b/dev-lang/python/python-3.14.9999.ebuild index 14832e250609b..0ded39fc40706 100644 --- a/dev-lang/python/python-3.14.9999.ebuild +++ b/dev-lang/python/python-3.14.9999.ebuild @@ -72,7 +72,6 @@ DEPEND=" test? ( dev-python/ensurepip-pip dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel ) valgrind? ( dev-debug/valgrind ) " diff --git a/dev-lang/python/python-3.8.20_p7.ebuild b/dev-lang/python/python-3.8.20_p7-r1.ebuild similarity index 98% rename from dev-lang/python/python-3.8.20_p7.ebuild rename to dev-lang/python/python-3.8.20_p7-r1.ebuild index fdb933080a1ef..befe9e3cb75e6 100644 --- a/dev-lang/python/python-3.8.20_p7.ebuild +++ b/dev-lang/python/python-3.8.20_p7-r1.ebuild @@ -50,7 +50,10 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - ensurepip? ( dev-python/ensurepip-wheels ) + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -68,7 +71,11 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils ) + test? ( + app-arch/xz-utils + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) valgrind? ( dev-debug/valgrind ) " # autoconf-archive needed to eautoreconf diff --git a/dev-lang/python/python-3.9.23.ebuild b/dev-lang/python/python-3.9.23-r1.ebuild similarity index 98% rename from dev-lang/python/python-3.9.23.ebuild rename to dev-lang/python/python-3.9.23-r1.ebuild index 5a8c6b388ddaa..143e7fe9107e9 100644 --- a/dev-lang/python/python-3.9.23.ebuild +++ b/dev-lang/python/python-3.9.23-r1.ebuild @@ -50,7 +50,10 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - ensurepip? ( dev-python/ensurepip-wheels ) + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -68,7 +71,11 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils ) + test? ( + app-arch/xz-utils + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) valgrind? ( dev-debug/valgrind ) " # autoconf-archive needed to eautoreconf diff --git a/dev-lang/python/python-3.9.9999.ebuild b/dev-lang/python/python-3.9.9999.ebuild index 4a4effea93f82..efa77f20d705c 100644 --- a/dev-lang/python/python-3.9.9999.ebuild +++ b/dev-lang/python/python-3.9.9999.ebuild @@ -44,7 +44,10 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - ensurepip? ( dev-python/ensurepip-wheels ) + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -62,7 +65,11 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils ) + test? ( + app-arch/xz-utils + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) valgrind? ( dev-debug/valgrind ) " # autoconf-archive needed to eautoreconf