gentoo resync : 20.10.2021

5 files changed, 4 insertions, 118 deletions

diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index a1847d7ae4b5..5479bdb6da95 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1,9 +1,4 @@
-AUX flit-2.1.0-tests.patch 287 BLAKE2B e2deed39a206096f1c4be29678a93fbfc7dabd7cb26bbf8e1e249bc506e5c8550e5531d3252f93d99cc2bad9e317b61d10f1d87e3094f3dd8c1c2d34a85b9049 SHA512 2e628275e3db217c9d5c1a593d3ea6a8539902737da8ed2d98f96f5fc99e0e25da1d427ea153f8279f3de0d7afde14684a7898c7e01e55ebeab4a5572479724b
 AUX flit-3.2.0-tests.patch 445 BLAKE2B 313f975352b67a1dbc5c582ac854dea1625f1819fb1ae147d3fed254dddf69e416d79fb4d787f9deb48d2992d4deea8bfaad681c8a506959a142b8e065a73adb SHA512 737d97e8d9b2c1d1c9a5ef6d6ddd719245a3550092034097899c1917f99604dcd2c5b183f51a7cce8f70c98df9c679adbf3d29068782687018cf085e3cdf931a
-DIST flit-2.1.0.tar.gz 106459 BLAKE2B db51d8cc119ae8aa5f8d0ac1655cd29390065567391cbdf06ca7dbb98a79e96a6d8f318273c2f9a58aaf549090a903360701a844ac071d15304a21ea54052a91 SHA512 0fcbfaa1e5e83216a5c98cc87b0a8f2aa17e2c184ec3f09c7dd0dd5e695311be62344ac4f101cb71f87390513496f8c1152a2cd8d7363202f7696ee002f07a55
-DIST flit-3.2.0.tar.gz 115192 BLAKE2B dda4b9f5b56b9868d737516841d7fc49c0e97ef8a71f9f0628112f68c3dadae89a87aef56cebfe8ec3762af5970d206fe462add146d52b3893fb8852fd7f9625 SHA512 1db7c4118fe1d70d1e318db3bc282747d6cc3f3b626ad68420fa056e585caad9ff0a3f230e17c919ea260ddeb6330effc4bbed8b30d11ed7b27e78d9d7af0445
-DIST flit-3.3.0.tar.gz 117809 BLAKE2B 8ad74f70406e41b35b44886b145b52d83fc30d0a1395bf711807da2ae3974ae8606113e4bcd556694854c48c8c01c3c03b4a1021c7cc3e33cce0e99a5abbb9ea SHA512 904889298aab581640e8323fd68c83d753ea97af0ed1b8f438f192d84d09ced83718440a03d23864885fcf966de9665c3046f0f3a1b1d4170b2decf8430ff006
-EBUILD flit-2.1.0.ebuild 1417 BLAKE2B 070718c185f263ebd450cee23d6ea7cb08a9c7c35638e07f2725b66f54cb201836ee2c288153baa9b0723c129fb82daa469f0035731e0cb870f897dc449d8a48 SHA512 61ca338e64c5537a25a1fd326acf55d31eb376c61d16af2403e8a77a7709951f4fb77bc63c9264a8ccaa3a68f8a6bc7be470d126994ee0da06c9c79eac6a1b0b
-EBUILD flit-3.2.0.ebuild 1209 BLAKE2B 651d171f9c9b79aaee9b42486fd4840a78a47b04a1e9059eda2523c59cbe24f3e9870438d68cfbc640f3e5d2e4db3415d4d952eb2d68780f150b4a0254028c41 SHA512 1ec0cfaf96533b12d77e76b9a8486699c7ef03e7f936fad09e1e3062a269bd57f070f9c92bc8d0abace09cdb0732bc2d7a6c2efe6d8dbc8df77ee66f747f7be3
-EBUILD flit-3.3.0-r1.ebuild 1043 BLAKE2B d7a503ed102473ed487e132e33732276d508da1b76b387855d5ad8837ca21f0157c3331f5dc313bd2f72b73c851136c7e5ba7e387e4ea1667ab889dbc3761e52 SHA512 c277432f6a225ab1f9eefa86d43e54e6c1d581372e6bd1fd6138f649766ed916815b1ff8bcd85999c5e1bb62ba21fbc6ae9c9ac5d8608d2024f8fe60eb2a655a
+DIST flit-3.4.0.tar.gz 120418 BLAKE2B e99eb67daa9a1d8e738ff9b917117edaf7372bbe267163f8af64967e43c3bed94893849e9752d36d3965e70c798dd3fb3b454131cee2d34697cc389f11aaea69 SHA512 18f1d1cb86508e76b4e37e6c1ca2c414400c86e9163bcc52fd3358220e5b4362da4001da7ce427926c62ad67ee86799ea8d08e858e5e17230941c529b9995ce5
+EBUILD flit-3.4.0.ebuild 1082 BLAKE2B cc125fd9b21f3b781d6b648f034a67f11ea27c242db8b21e6e4e43fedf1c967e0bbd008b8b1ed16210cbab4ac783f0ab20703ef4003b69b61903c6e4c0bc1ecc SHA512 19b373cded16e7c9d5da02d6606bf8b19577d291186547332b55720c16d8be0376822860dfb1369b5f68f8c938dc9ea9301cd868ef6142e3f045016d445fe011
 MISC metadata.xml 472 BLAKE2B 75bd369814d338504d8e2a7980ea720d9b82e5ea9c40ef73c9a1a7748671a6904704d1bd051cd8e2b9316c64af76e23da0d41287c8185dd57fda16abd37246f9 SHA512 3f1dcd9612b74111d25cf74343ef69758d02b54aeee96e3c55b8516ab4cb70307ad804f8d21c749051643fc74d94f5e76ca99f52821a61838dc4025203987ecc
diff --git a/dev-python/flit/files/flit-2.1.0-tests.patch b/dev-python/flit/files/flit-2.1.0-tests.patch
deleted file mode 100644
index 04cf9839dbc4..000000000000
--- a/dev-python/flit/files/flit-2.1.0-tests.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/tests/test_inifile.py b/tests/test_inifile.py
-index 150fa47..53ce597 100644
---- a/tests/test_inifile.py
-+++ b/tests/test_inifile.py
-@@ -7,2 +7,3 @@ samples_dir = Path(__file__).parent / 'samples'
- 
-+@pytest.mark.skip("Needs internet access")
- def test_invalid_classifier():
diff --git a/dev-python/flit/flit-2.1.0.ebuild b/dev-python/flit/flit-2.1.0.ebuild
deleted file mode 100644
index 4dd0cc171729..000000000000
--- a/dev-python/flit/flit-2.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	<dev-python/flit_core-3.0.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	sys-apps/grep
-	sys-apps/findutils
-	test? (
-		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/flit-2.1.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/pygments-github-lexers \
-
-python_prepare_all() {
-	printf -- "from setuptools import setup, find_packages\nsetup(name='%s',version='%s',%s)" \
-		"${PN}" "${PV}" "packages=find_packages(exclude=['tests'])" > setup.py || die
-
-	# use toml instead of depricated pytoml
-	grep -r -l -Z -F 'pytoml' | xargs -0 \
-		sed -e 's:import pytoml as toml:import toml:' \
-			-e 's:pytoml:toml:' -i || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flit/flit-3.2.0.ebuild b/dev-python/flit/flit-3.2.0.ebuild
deleted file mode 100644
index 289ae9807716..000000000000
--- a/dev-python/flit/flit-3.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	sys-apps/grep
-	sys-apps/findutils
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/flit-3.2.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/pygments-github-lexers \
-
-python_prepare_all() {
-	printf -- "from setuptools import setup, find_packages\nsetup(name='%s',version='%s',%s)" \
-		"${PN}" "${PV}" "packages=find_packages(exclude=['tests'])" > setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flit/flit-3.3.0-r1.ebuild b/dev-python/flit/flit-3.4.0.ebuild
index d54807828524..1bc9a7f33b5c 100644
--- a/dev-python/flit/flit-3.3.0-r1.ebuild
+++ b/dev-python/flit/flit-3.4.0.ebuild
@@ -21,7 +21,8 @@ RDEPEND="
 	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/tomli-w[${PYTHON_USEDEP}]
 "
 BDEPEND="${RDEPEND}
 	sys-apps/grep