gentoo resync : 02.02.2022

4 files changed, 65 insertions, 38 deletions

diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 9af8b0ecc3eb..2905c1e6d4d7 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,5 +1,4 @@
-DIST wheel-0.37.0.gh.tar.gz 68270 BLAKE2B a91714a57e0f1ef32e17b405668c765cbb586518b370e005c52fb4898c5a2e95a9781d7b71e22db12e613feb4d81dda14a8e462d73b4329c19db46653cce57dc SHA512 2e0eb1c5560a0229be9de450da8b2bc62153744abb6d8ab9a0625c150dc00d3fc3e24dbe37cc26f4ca6b6876b5c63298427b2076ee42b8f772c75010bfc135a8
 DIST wheel-0.37.1.gh.tar.gz 68751 BLAKE2B 55919649f82668565d3b5907d14d0758984bb7d29d8857807ad034288ed8c9e8660957dc16f418f18408e89a97cf0d3c30df874a17f56deb56918388b18246a7 SHA512 9493db2f29e16d17ca06a4d47854b3df5dfd17f21c77efd42befd54470858256fd59f56aa9585cbf0a09830927b657d546324f793e1b1153665bf0b74d0c0457
-EBUILD wheel-0.37.0.ebuild 824 BLAKE2B c7772a26eed0b01f3f554435b8d9434e0b3c07c38968fb0b2c7d2ae9cc3eac5a9a54ddae735dec49ea1248cdfb02b43408d933f5f2084a748428dc2d9e7f66ce SHA512 59da4cf546e2c9e27dc9cdef805940eb1b8986515dca135d618e7de797c82b9b024a3e0045df0c5062f7009752f996bf999b4850b791888b829b29b28d34b2d2
-EBUILD wheel-0.37.1.ebuild 849 BLAKE2B fddb92fae77d70938bab0b122ba11237f1b5a009a86995127e7f9ac44381aee0e9c38c928760cee47703689fc84e05425b3ffa1c848f5e2e68fb1124bd3f2ca8 SHA512 389ea5b5c1a6feb778611758c13de734d6b705f03f6d7bff39915f914a886d9593ffd52b0a45ab1049ff5d6640bee429b5c541fe1ea0d5e258438d362de45d95
+EBUILD wheel-0.37.1-r1.ebuild 1530 BLAKE2B 00bec97b8e75faa1faceea76246f488631b979f84c3a92dffcf28dbdab18d2813dc74ae655aa4637ab6dca0c5cef0e8a61b3b5b3620a915faf34bec40ab3eca8 SHA512 96b52c6cae9a0f6aed3f49f098f24694b2a25d85355f47764e05930c7a27764a473e5b5ec1c798e7661e652b468af01f17f3465c549bd7bac8124f8acc516b30
+EBUILD wheel-0.37.1.ebuild 841 BLAKE2B 6422085cf1faa5d2e4a0eeb1a8349e02a7a25197577cfa8a4d0f627d3868ec3ac664e4746142d3f9667178057a80d9e951ba71dc78fa43d205e00f51900b12d3 SHA512 b7adc349eba2c2a28661b028a1cd9a4f70c894d83d326dd2c3650e58e0f6272bd1cbf40f047d57cdbf1666e6ea29bfd88dafa6611763b3ea99536d88d799f9b4
 MISC metadata.xml 333 BLAKE2B b1d29210926de97a88c7287db920148c657fedc8a9f031a25b7aefaccc0195de53e2d30f756fefa79c2d80f06614d151261b68193fb5d1eafb7b866306749f43 SHA512 886dbf9547d18ea17c0ccab3dc811c673b567bdeb46d2f59badcd4e68c5738a0c49116187940f63eadaa9fb02da8324e12b949f5dbef6e603a2f12ac4f82b166
diff --git a/dev-python/wheel/wheel-0.37.0.ebuild b/dev-python/wheel/wheel-0.37.0.ebuild
deleted file mode 100644
index 7b550e8400b6..000000000000
--- a/dev-python/wheel/wheel-0.37.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.org/project/wheel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]"
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	sed \
-		-e 's:--cov=wheel::g' \
-		-i setup.cfg || die
-
-	# unbundle packaging
-	rm -r src/wheel/vendored || die
-	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/wheel/wheel-0.37.1-r1.ebuild b/dev-python/wheel/wheel-0.37.1-r1.ebuild
new file mode 100644
index 000000000000..a271177181e7
--- /dev/null
+++ b/dev-python/wheel/wheel-0.37.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="https://pypi.org/project/wheel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed \
+		-e 's:--cov --cov-config=setup.cfg::g' \
+		-i setup.cfg || die
+
+	# unbundle packaging
+	rm -r src/wheel/vendored || die
+	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	[[ -e pyproject.toml ]] &&
+		die "Upstream added pyproject.toml, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "wheel"
+		description = "A built-package format for Python"
+		dynamic = ["version"]
+
+		[project.scripts]
+		wheel = "wheel.cli:main"
+
+		[project.entry-points."distutils.commands"]
+		bdist_wheel = "wheel.bdist_wheel:bdist_wheel"
+	EOF
+}
diff --git a/dev-python/wheel/wheel-0.37.1.ebuild b/dev-python/wheel/wheel-0.37.1.ebuild
index 428e55ba2ebb..d44720c3b267 100644
--- a/dev-python/wheel/wheel-0.37.1.ebuild
+++ b/dev-python/wheel/wheel-0.37.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]"