From 768b019c5ff0f8cbe34434d026bced33f0049313 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 3 Jul 2023 07:15:02 +0000 Subject: [PATCH] dev-python/setuptools: Sync with Gentoo It's from Gentoo commit 63d70ae6b687dd0fbb1b8cfe910bd201162c7dff. --- .../portage-stable/dev-python/setuptools/Manifest | 2 +- .../dev-python/setuptools/setuptools-67.8.0.ebuild | 2 +- ...setuptools-67.7.2.ebuild => setuptools-68.0.0.ebuild} | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-python/setuptools/{setuptools-67.7.2.ebuild => setuptools-68.0.0.ebuild} (93%) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest index af75d90824..6119f84619 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest @@ -1,2 +1,2 @@ -DIST setuptools-67.7.2.tar.gz 2491608 BLAKE2B bd77a85081e95813cdd8fc1f63b768c73036b2f49103defcfd09ba9df7b2c5dba84d4f1aca553e0642ab8d764ae390310f1c6bebbae31736d1b5c16802cdc0e5 SHA512 06db096193ef52111f064c327daefb12ea2bb2ebc6712436bae01f986165455fe89a1d2220cbaaa6391a182e2aee19b9cf7a709c158af8c5ab6232dfbc258bd9 DIST setuptools-67.8.0.tar.gz 2492475 BLAKE2B 37c34605a58b41e14300e389402fe6debf9eeed20c72ddf53fa798b41484d1522d2b5313c74eb69a687eaf32c225f0931f901f452aebf6f7023b2419d127b808 SHA512 5dda7082fc563ce73d810efc9cdbccb8649fef2eac52f1a902c76ab5ec67a87ff64e36e918d0e3b168f5214d787bdc22e8ef9adeccb77d8d368dcbb48f5fb35d +DIST setuptools-68.0.0.tar.gz 2194111 BLAKE2B 614a1c69f640ce8d0e510c444e058fecd3810421983a03cd345e43e1148799bed7e5d53ac689a4fe3ce3174d16f2bb719236bd5442b5f06ffc7659d0f4c7d15f SHA512 da6d535a0db6eaf477c8c2148efbc2100fd88a14f3adad44d20e22bf52bee3f00fe86547ea650fe653519bd6ff5f9ef033a55bb3a05fed041e88e78cdfb81d7e diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.8.0.ebuild index 4a58b9549d..033fc9581e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.8.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.8.0.ebuild @@ -21,7 +21,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.7.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-68.0.0.ebuild similarity index 93% rename from sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.7.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-68.0.0.ebuild index ff59935d83..0fcc9137f3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.7.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-68.0.0.ebuild @@ -7,7 +7,7 @@ EAPI=8 # please bump dev-python/ensurepip-setuptools along with this package! DISTUTILS_USE_PEP517=standalone -PYTHON_TESTED=( python3_{9..11} pypy3 ) +PYTHON_TESTED=( python3_{10..12} pypy3 ) PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) PYTHON_REQ_USE="xml(+)" @@ -21,7 +21,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" @@ -75,8 +75,7 @@ src_prepare() { distutils-r1_src_prepare - # remove bundled dependencies, setuptools will switch to system deps - # automatically + # remove bundled dependencies rm -r */_vendor || die # remove the ugly */extern hack that breaks on unvendored deps @@ -87,8 +86,6 @@ src_prepare() { } python_test() { - local -x SETUPTOOLS_USE_DISTUTILS=stdlib - if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then return fi