gentoo resync : 20.03.2022

3 files changed, 78 insertions, 6 deletions

diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index e3904e521b89..644dcd8b2e9f 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,3 +1,5 @@
-DIST importlib_metadata-4.10.1.tar.gz 42013 BLAKE2B 056a8e16cacc961bef5168c903f5143a764eeee028f576da964fa4b1462ecb98b5baa1b59653cf15a49b0f8d8c31cc9993c16c89d04d188cb1a99d3943ac4ec4 SHA512 96ceb9286145e2933ca3a1724fde4519819c27a1dc0947ef8e0c399a4cc2026875e673ab352f08bb4dd6aa10d78d8c9773a6fb0138e3065961df7e850ff37757
-EBUILD importlib_metadata-4.10.1.ebuild 994 BLAKE2B aa13445b7cf7d7f0ae20a3710a24440798a253c647bb7b00dbe21ac20db1005988ea8cbf25b3b55a804e77338ae732ca8ef76cd693ecc3c268ea4a86b66ba229 SHA512 cbb721aaf32761dbe3f8c0142874479e1012504806e6ea7ba3a6f07d65f68ef4ef1ca3815081cf778e3fc9495a5b7e396c1f14347ae74b5bb950e751b29e4d96
+DIST importlib_metadata-4.11.2.tar.gz 43293 BLAKE2B ea515da66eed404d7d6bdf09fc3ade31c34a48656a6e37219c2d86eed3004ef2c82dc80f916de54b45e4b462a3b142d40b8e2ee959614e9be011844ba12eb3fc SHA512 114a8078b15905a898d63934f208d6409ec043cd5ac35f9455f532956fb7e5262df26aadcd8618ca8b2baf69333147a15d456fdb0d8e50163aecedfccb6003d9
+DIST importlib_metadata-4.11.3.tar.gz 43607 BLAKE2B 661f8ce68869540995dbee39c6be07d7b88e8339267d4d49744691f2347ab2bcc9ac33c4cafd6caed5fa9ce3d4a3640a816e4659eee9a59b5ccc1df2edd2f6aa SHA512 d33efa2abba5f6f770615f133c940a61948ce5091d59526ee2c7e3866aebd74d79ac464f72602404c2b56fe284a93a9cd1b0cac251ceea53666019485bdddf23
+EBUILD importlib_metadata-4.11.2.ebuild 1467 BLAKE2B 5ff1523d641eeb12c1188d2da0c267968d03e73767f0cb5647147445cdcbb35d51e9b330b20d3f6d64e46ff3fe5d062614b5825c009bd2c22765054242ca3260 SHA512 0202201ab7a8be0cf1c8cc34c35e5b95e44792bc979efb9d07fabdec08b2a9810c9ab48b9accc1d8cdc20a64e605cb92a0c29f568542d2f9942c55a0906056f0
+EBUILD importlib_metadata-4.11.3.ebuild 1475 BLAKE2B f6ef6dd43a4314a8025de3369eb24ad5570aceeb3cfd6a86a0a20e24f47b7d5d23955037e2c3903d04a444584e1bc4fd93161fb39705eab879486c9336b2df6a SHA512 227ed3d264ca9372d522535fba49b7b942a94ba2eca1735d64de22d28e196e4dc1a04c02b313364103de1380b9603529bd18b1b1df2ffa1879ef93937b62d80c
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.10.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.2.ebuild
index 8d0367de7209..209783a3deb0 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.10.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.11.2.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
 
+DISTUTILS_USE_PEP517=flit
 # NB: this package extends beyond built-in importlib stuff in py3.8+
 # new entry_point API not yet included in cpython release
 PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
 inherit distutils-r1
 
 DESCRIPTION="Read metadata from Python packages"
@@ -14,21 +17,36 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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/zipp[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/packaging[${PYTHON_USEDEP}]
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
 			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_8)
+		' 3.8)
 	)
 "
 
 distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
 distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, 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 = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
new file mode 100644
index 000000000000..4a5821a20865
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
@@ -0,0 +1,52 @@
+# 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
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' 3.8)
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, 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 = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}