commit: 0d712ad5a66b1b4ae882babb8a7a05a3b5f39a38 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Jul 14 16:51:51 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Jul 14 16:56:16 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d712ad5
dev-lang/python: Move ensurepip deps to PDEPEND, to avoid cyclic dep Closes: https://bugs.gentoo.org/960054 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-lang/python/python-0.3.13.4.ebuild | 4 +++- dev-lang/python/python-0.3.13.9999.ebuild | 4 +++- dev-lang/python/python-0.3.14.0_beta4.ebuild | 4 +++- dev-lang/python/python-0.3.14.9999.ebuild | 4 +++- dev-lang/python/python-0.3.15.9999.ebuild | 4 +++- dev-lang/python/python-3.10.18-r1.ebuild | 10 ++++++---- dev-lang/python/python-3.10.9999.ebuild | 10 ++++++---- dev-lang/python/python-3.11.13-r1.ebuild | 10 ++++++---- dev-lang/python/python-3.11.9999.ebuild | 10 ++++++---- dev-lang/python/python-3.12.11.ebuild | 4 +++- dev-lang/python/python-3.12.9999.ebuild | 4 +++- dev-lang/python/python-3.13.5.ebuild | 4 +++- dev-lang/python/python-3.13.9999.ebuild | 4 +++- dev-lang/python/python-3.14.0_beta4.ebuild | 4 +++- dev-lang/python/python-3.14.9999.ebuild | 4 +++- dev-lang/python/python-3.15.9999.ebuild | 4 +++- dev-lang/python/python-3.8.20_p7-r1.ebuild | 10 ++++++---- dev-lang/python/python-3.9.23-r1.ebuild | 10 ++++++---- dev-lang/python/python-3.9.9999.ebuild | 10 ++++++---- 19 files changed, 78 insertions(+), 40 deletions(-) diff --git a/dev-lang/python/python-0.3.13.4.ebuild b/dev-lang/python/python-0.3.13.4.ebuild index 58645b4268a9..0911815c1048 100644 --- a/dev-lang/python/python-0.3.13.4.ebuild +++ b/dev-lang/python/python-0.3.13.4.ebuild @@ -53,7 +53,6 @@ RDEPEND=" dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -95,6 +94,9 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc diff --git a/dev-lang/python/python-0.3.13.9999.ebuild b/dev-lang/python/python-0.3.13.9999.ebuild index 0861f69afcf6..ef85280df0cc 100644 --- a/dev-lang/python/python-0.3.13.9999.ebuild +++ b/dev-lang/python/python-0.3.13.9999.ebuild @@ -45,7 +45,6 @@ RDEPEND=" dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -86,6 +85,9 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M diff --git a/dev-lang/python/python-0.3.14.0_beta4.ebuild b/dev-lang/python/python-0.3.14.0_beta4.ebuild index 26514fc0a693..3e8ab699256b 100644 --- a/dev-lang/python/python-0.3.14.0_beta4.ebuild +++ b/dev-lang/python/python-0.3.14.0_beta4.ebuild @@ -54,7 +54,6 @@ RDEPEND=" dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -95,6 +94,9 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" # https://www.python.org/downloads/metadata/sigstore/ [email protected] diff --git a/dev-lang/python/python-0.3.14.9999.ebuild b/dev-lang/python/python-0.3.14.9999.ebuild index 391c0123711d..4d8ec4f1527b 100644 --- a/dev-lang/python/python-0.3.14.9999.ebuild +++ b/dev-lang/python/python-0.3.14.9999.ebuild @@ -45,7 +45,6 @@ RDEPEND=" dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -86,6 +85,9 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M diff --git a/dev-lang/python/python-0.3.15.9999.ebuild b/dev-lang/python/python-0.3.15.9999.ebuild index 45b968978310..7a6b7fc82b4f 100644 --- a/dev-lang/python/python-0.3.15.9999.ebuild +++ b/dev-lang/python/python-0.3.15.9999.ebuild @@ -44,7 +44,6 @@ RDEPEND=" dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -81,6 +80,9 @@ BDEPEND=" RDEPEND+=" !build? ( app-misc/mime-types ) " +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M diff --git a/dev-lang/python/python-3.10.18-r1.ebuild b/dev-lang/python/python-3.10.18-r1.ebuild index 640cb5a898cc..83fee15f15f6 100644 --- a/dev-lang/python/python-3.10.18-r1.ebuild +++ b/dev-lang/python/python-3.10.18-r1.ebuild @@ -50,10 +50,6 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - 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:= ) @@ -91,6 +87,12 @@ BDEPEND=" RDEPEND+=" !build? ( app-misc/mime-types ) " +PDEPEND=" + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) +" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc diff --git a/dev-lang/python/python-3.10.9999.ebuild b/dev-lang/python/python-3.10.9999.ebuild index f43d0be50200..ed0d871103fd 100644 --- a/dev-lang/python/python-3.10.9999.ebuild +++ b/dev-lang/python/python-3.10.9999.ebuild @@ -44,10 +44,6 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - 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:= ) @@ -84,6 +80,12 @@ BDEPEND=" RDEPEND+=" !build? ( app-misc/mime-types ) " +PDEPEND=" + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) +" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M diff --git a/dev-lang/python/python-3.11.13-r1.ebuild b/dev-lang/python/python-3.11.13-r1.ebuild index 541230b5f8f7..be4577db2582 100644 --- a/dev-lang/python/python-3.11.13-r1.ebuild +++ b/dev-lang/python/python-3.11.13-r1.ebuild @@ -51,10 +51,6 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - 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:= ) @@ -97,6 +93,12 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) +" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc diff --git a/dev-lang/python/python-3.11.9999.ebuild b/dev-lang/python/python-3.11.9999.ebuild index 769d7f5c8026..0a20da9335c9 100644 --- a/dev-lang/python/python-3.11.9999.ebuild +++ b/dev-lang/python/python-3.11.9999.ebuild @@ -45,10 +45,6 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - 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:= ) @@ -90,6 +86,12 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) +" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M diff --git a/dev-lang/python/python-3.12.11.ebuild b/dev-lang/python/python-3.12.11.ebuild index d73d44638f23..621dd5b4c291 100644 --- a/dev-lang/python/python-3.12.11.ebuild +++ b/dev-lang/python/python-3.12.11.ebuild @@ -51,7 +51,6 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -95,6 +94,9 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc diff --git a/dev-lang/python/python-3.12.9999.ebuild b/dev-lang/python/python-3.12.9999.ebuild index 09aa0d642de2..89574c0c4136 100644 --- a/dev-lang/python/python-3.12.9999.ebuild +++ b/dev-lang/python/python-3.12.9999.ebuild @@ -45,7 +45,6 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -88,6 +87,9 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M diff --git a/dev-lang/python/python-3.13.5.ebuild b/dev-lang/python/python-3.13.5.ebuild index 0da2daf1ef2d..b8563854c773 100644 --- a/dev-lang/python/python-3.13.5.ebuild +++ b/dev-lang/python/python-3.13.5.ebuild @@ -55,7 +55,6 @@ RDEPEND=" dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -103,6 +102,9 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc diff --git a/dev-lang/python/python-3.13.9999.ebuild b/dev-lang/python/python-3.13.9999.ebuild index 5af2cbe80f51..43710763c1c8 100644 --- a/dev-lang/python/python-3.13.9999.ebuild +++ b/dev-lang/python/python-3.13.9999.ebuild @@ -48,7 +48,6 @@ RDEPEND=" dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -95,6 +94,9 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M diff --git a/dev-lang/python/python-3.14.0_beta4.ebuild b/dev-lang/python/python-3.14.0_beta4.ebuild index 96b2eb246539..dd98e1364ba1 100644 --- a/dev-lang/python/python-3.14.0_beta4.ebuild +++ b/dev-lang/python/python-3.14.0_beta4.ebuild @@ -56,7 +56,6 @@ RDEPEND=" dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -103,6 +102,9 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" # https://www.python.org/downloads/metadata/sigstore/ [email protected] diff --git a/dev-lang/python/python-3.14.9999.ebuild b/dev-lang/python/python-3.14.9999.ebuild index 0ded39fc4070..270f8a13c966 100644 --- a/dev-lang/python/python-3.14.9999.ebuild +++ b/dev-lang/python/python-3.14.9999.ebuild @@ -48,7 +48,6 @@ RDEPEND=" dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -95,6 +94,9 @@ if [[ ${PV} != *_alpha* ]]; then dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] " fi +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M diff --git a/dev-lang/python/python-3.15.9999.ebuild b/dev-lang/python/python-3.15.9999.ebuild index 456a4bcd55b2..ace3b698c2ed 100644 --- a/dev-lang/python/python-3.15.9999.ebuild +++ b/dev-lang/python/python-3.15.9999.ebuild @@ -47,7 +47,6 @@ RDEPEND=" dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libintl - ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) @@ -90,6 +89,9 @@ BDEPEND=" RDEPEND+=" !build? ( app-misc/mime-types ) " +PDEPEND=" + ensurepip? ( dev-python/ensurepip-pip ) +" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M diff --git a/dev-lang/python/python-3.8.20_p7-r1.ebuild b/dev-lang/python/python-3.8.20_p7-r1.ebuild index befe9e3cb75e..68f8fe262c0c 100644 --- a/dev-lang/python/python-3.8.20_p7-r1.ebuild +++ b/dev-lang/python/python-3.8.20_p7-r1.ebuild @@ -50,10 +50,6 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - 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:= ) @@ -88,6 +84,12 @@ BDEPEND=" RDEPEND+=" !build? ( app-misc/mime-types ) " +PDEPEND=" + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) +" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc diff --git a/dev-lang/python/python-3.9.23-r1.ebuild b/dev-lang/python/python-3.9.23-r1.ebuild index b01210124ddb..1ecaf9594c6e 100644 --- a/dev-lang/python/python-3.9.23-r1.ebuild +++ b/dev-lang/python/python-3.9.23-r1.ebuild @@ -50,10 +50,6 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - 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:= ) @@ -88,6 +84,12 @@ BDEPEND=" RDEPEND+=" !build? ( app-misc/mime-types ) " +PDEPEND=" + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) +" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc diff --git a/dev-lang/python/python-3.9.9999.ebuild b/dev-lang/python/python-3.9.9999.ebuild index efa77f20d705..b2bb63455278 100644 --- a/dev-lang/python/python-3.9.9999.ebuild +++ b/dev-lang/python/python-3.9.9999.ebuild @@ -44,10 +44,6 @@ RDEPEND=" >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl - 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:= ) @@ -81,6 +77,12 @@ BDEPEND=" RDEPEND+=" !build? ( app-misc/mime-types ) " +PDEPEND=" + ensurepip? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + ) +" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M
