gentoo resync : 20.03.2022

4 files changed, 13 insertions, 47 deletions

diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index ff76ed661eb3..587e0af8be65 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,7 +1,3 @@
-DIST tomlkit-0.7.2.tar.gz 159643 BLAKE2B 6946cdc4c991671eb9e38cf836196a0dfdb7aba2697db95f3fcee58652d3c8ba96295df447b8145f0143447339834015abbd60928d7588c68ae31c298fd6d2d4 SHA512 cfb17d133463c22ae8b76dd03587f23f6dafedfd2decdf15ae29fe5c05117ebd3e17057f49bdb17345386f5ce3073b1e5b1937c6ab6683aefb0fc0abd7571580
-DIST tomlkit-0.8.0.tar.gz 179067 BLAKE2B 871eb8371d94c76552d78a56adfbde5ebb9da4b93aa29229ae9aa279ae35fac488a1b4986169b818d2e5366883b8f246b44dc9075d0d9785b2d7d6f97e222ec1 SHA512 77b267201021e740d8134d0d5edfbef2cf077adac0b320d80887fdedda3f63f74df1957e8230976f16c80fcc58fd4cfabb195cccf0eda7d6cd29f5f65d362147
-DIST tomlkit-0.9.0.tar.gz 176037 BLAKE2B 2301b1c9d28eeb595b0580ae4172b0c044a67c75b417b0a004af2afa5bb4bddb07a73e8cdc2949008efa024ab603e44e43d830453827e02d2b7a4483cc360dc3 SHA512 36cb7fd683b4dc6e82a4828db76ad997de79302ed485751b14375e7483400adbce8e9b8bf913a6f404ffc16a06cf90158caca20c4419bd032a7d27a8790573db
-EBUILD tomlkit-0.7.2.ebuild 449 BLAKE2B c413dee3459365d17cef896d6d5fa974d586d96b5c725dfeb1d9b5285fe196357f9ffe13285c16ee01562e30f7d490e258c42f8764b935eee2c4255b2425fd07 SHA512 a3e7dbb7fcf92acd8770c9f5ae47d0a98fefc24da208bca1cd135ffbb42ccabfd5a31e92da5453d6da29f40cf7adc2c207346900dac040181abed3b025ab778a
-EBUILD tomlkit-0.8.0.ebuild 529 BLAKE2B e1e56d0c91669197eca00998e472cef650951f1d28a1715d38f9a05a29e102907f458253ca76688b310d4f7f43ac76843982df396f9242d7aa54c29ef65917e8 SHA512 7225759f5e3b621574425a971eeb339ddf72e1e6ab3316f249e2c764ddd77a2f004bf82193fc35f266297045baa12098168ea23b08318a070a8fdee0b59220e8
-EBUILD tomlkit-0.9.0.ebuild 558 BLAKE2B a3f2c36f1a8beb88a0c88ce1948f8349afbec5cad0ae2e19e7a2d41cdc99a126de13985075f88acb4df9413a92ce5929a182cbcdad87ea1f3999f5c5fceb1e56 SHA512 46a2d8bd66650f5310830dad1b2b721ea7fbdc625b829b10600accea97934ada1ed4a41630c7cac0c5b284a8513e32a93a3fd7e84d76e040a03401c5af764da7
+DIST tomlkit-0.10.0.tar.gz 183499 BLAKE2B b9906dea2dd8867dca0208f3ce86b3d587f8504addfe25cf29f9164f50dc12d244010df53791ed01e0e7dd16e71ad77ce22c9ea7a37a6216880059c058f112e8 SHA512 05d03ae71a1d72ca0e03276f2b2530ca9fab7d6f366166a79839c66eaa00b55abb5f70a669ecb4d762dbbd655f10e4c4a373a7683cd781ae034d0910a0c3eccf
+EBUILD tomlkit-0.10.0.ebuild 767 BLAKE2B 7ad977e65116339b9540af40b167a129ffd4f0e26c682410d4317fb7d2855ca4602371e0abd9f6a3f8c5c96a862af78c44d749f744386fdf5813455fdbeb0ec8 SHA512 6f63e46e9dd16bf2d62dd35e40a8323073baf387f23337ea0f873ee9099294cf26db035efd0dfb12803d1bea1efc6441b6016edf9c7f2d2a65eab96366375f17
 MISC metadata.xml 418 BLAKE2B 6013d98bdc27197495bc61306e7038b81c725d392ee57611d451b9289885f4b019c76721ef3877d5ec1183ceb8b40f8b199556b4e1b63ccc61ba033b33308140 SHA512 f2c3c72396d6c073701a5dfa574cbc95243649cb964a08e179e707ef23098f018c2b5de6c92a110a9329e78880541ef54590c50c31128c1ce6b4698e76388a16
diff --git a/dev-python/tomlkit/tomlkit-0.9.0.ebuild b/dev-python/tomlkit/tomlkit-0.10.0.ebuild
index 7ec87f0790cf..b5cb07612b11 100644
--- a/dev-python/tomlkit/tomlkit-0.9.0.ebuild
+++ b/dev-python/tomlkit/tomlkit-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=poetry
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
@@ -14,8 +14,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
+
+src_configure() {
+	# use setup.py to avoid circular dep with poetry-core
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["setuptools", "wheel"]
+		build-backend = "setuptools.build_meta"
+	EOF
+}
diff --git a/dev-python/tomlkit/tomlkit-0.7.2.ebuild b/dev-python/tomlkit/tomlkit-0.7.2.ebuild
deleted file mode 100644
index bea9c9c660d2..000000000000
--- a/dev-python/tomlkit/tomlkit-0.7.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Style preserving TOML library"
-HOMEPAGE="https://github.com/sdispater/tomlkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tomlkit/tomlkit-0.8.0.ebuild b/dev-python/tomlkit/tomlkit-0.8.0.ebuild
deleted file mode 100644
index dc3affcb4f9b..000000000000
--- a/dev-python/tomlkit/tomlkit-0.8.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Style preserving TOML library"
-HOMEPAGE="https://github.com/sdispater/tomlkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest