gentoo new year resync : 01.01.2021

4 files changed, 2 insertions, 87 deletions

diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 7973f025c8d4..6efd2d63ea12 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,13 +1,9 @@
-DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
 DIST importlib_metadata-2.0.0.tar.gz 29289 BLAKE2B 4ec24db057006affe1dee20e021a47d385770b1aa905db4ff4223d59f19b53dc85c21475875074664a84a0fb6994493735f5e098d38f938816ebc69dced7a40d SHA512 3f789d717f04f7649dd4a75895669b4f9b875671937035c1c76bd089504afff8c2ba5bfb6a91096ba29eccadc88dca98ea1da5107772fd2053541db15c52b16a
 DIST importlib_metadata-3.1.0.tar.gz 29246 BLAKE2B 2144e10601e089e26e1d85269ed067d505de8ca86071524e038e87850420f42701b36fad5e1fe01529230333d5f23e0882f17a279bacfa39da335f3d968987dd SHA512 24d20d7658c2d15d2207d3660bd181016a16d0a2e3c86b8e86f7f95baab18f01f1a8753942d15ab648a40431bfc6db7d5109339575ef1a50802403eb580baede
 DIST importlib_metadata-3.1.1.tar.gz 32217 BLAKE2B 85155574f554146d89fedbaeffa5b5842c5c76f98d0f8488a019cded9fc7e45323b31a9cb612f81c379feb822a0e5a44f86566510c5bccaa344cbe10ef8676e9 SHA512 a0a3fc0c4cb08ba5676ae144a2176e9b2e02d122a09c1be67fe0c1e1c8304aeac4f624fa060898b20f99f67f9cfee2bdf1177d82cd12e5879edfa268e02cdce3
-DIST importlib_metadata-3.2.0.tar.gz 32793 BLAKE2B e99fc4544ec64bc320754b1bac80ab021fd4212930cb2b28fc44cd6f6c9691214fce2fc408aa65147ae45df589e5ad64d4681e29620a16ffd1d3231faebde077 SHA512 3e744ebaa4606477252243b6e473c33b70332879385719835a4187d5edad135f0f9076c26e4843aea4497c2a5a2b51fa7b5654e9ff97a8f5ec3808053dccc734
 DIST importlib_metadata-3.3.0.tar.gz 33549 BLAKE2B 6646cf7f8dbbeeadd7b4e9e572a59c14e2f17444dcd84aef817e27b299cbc3f0fa868657a59221a42ea8c49c5cc75e9e170a787df3e3014808d19eff1f89debf SHA512 af2215405b0f7e120d2745f3736d021174e611ad226abe64b496192a210e85786e78560349f1188deb3bffbfceb36385e9fbac20f4447aafb025a1d735c333ac
-EBUILD importlib_metadata-1.7.0-r2.ebuild 996 BLAKE2B 2e04af2cd739c2f896b5380dd73625c88cc76150bb8ad9ed1f73a71d253132e6afb272263dcb38383965f620e97696ec57eba41e72aed3673dd140a8e2411dd4 SHA512 1d5a62e708c34147dd3a25f77565c1ab4298ed0c0915f4c056cc7199edc854e2d86aff18dff6e5028ec3f03c03e697525d7c06470d0f68e652d3bb62e1152ad1
 EBUILD importlib_metadata-2.0.0.ebuild 1050 BLAKE2B 6657fb32eb94f02f06e5e09c75cf824278b45d8e9411da2eb5279dcc60c7a3be5018782380a44ac12e6c0421346815f0dcf2d9bfd2af38a57e5e5c842c98363f SHA512 990434854cc236cdf4eb6b44525007dd385985783d7e7387eb6c9d0dd0455c9afc152a30f51e932ad909fac3cb5e46c3b34b250705b5f86d1212255b35b6a5fa
-EBUILD importlib_metadata-3.1.0.ebuild 1016 BLAKE2B 59cf223d538c76d04291195d5c6af921dcce936eb936a168114ef20df8db04cd84eb2adf5e743d0d57d8095b87bc9e1e6fa4e1ef5acad670ec27e017a81880cd SHA512 7dbbd757b1c9ef77646cf095b4b42c03b1d397dea0cb74216b381c03870f9de536b529e8513d41b68def070ded09704530f20feef00724ef875a7c351362e9d7
+EBUILD importlib_metadata-3.1.0.ebuild 1008 BLAKE2B 7255bba30420cdde3405e5fa0c351700cb03caeaf1ca87068877072e65461874ae9a0c5a32c3c894b0c59da37b12a0e146c7e917e1ed24486bfe3c6ee8d62484 SHA512 6dfc50b17e21f401ed8295282dd458dd3722f5a4c0bdd2c728d544d7bca55937effa65153032d928de06449ca21fbeca7d1dfc83cb7eabf101efe6a26d8ac393
 EBUILD importlib_metadata-3.1.1.ebuild 1044 BLAKE2B 455410110f0f1e17d7df2cdbb64364b625d3b4140733f33be55d77deb16c0e2c21a4e816924b603bfa87c76c5294954e2996e252f31f04f5a311326f58c26dc5 SHA512 001f3af3e0133c3149755e482322cc5c91bfb74f578adfd165273926b94f22747c217e8e75ea4cae87918c6ba09bd4c11d236e722b1cb552823c301f2700163d
-EBUILD importlib_metadata-3.2.0.ebuild 1134 BLAKE2B 3e75a125614992d4b1edbc736476b96fdecc97e412ae34a7d0661339f59045365097983c98966f97e1c26fc1a08a1c32eac62dd8c055ee2633a256de48b1a44d SHA512 9425d39127e14bc4bdec23fea4156d9b12fc752397f4c60f3b68b5047aa4a98fa9e96572627254e221e0f9723d82e7ad86772489331fafe1badf6b9238e0461a
 EBUILD importlib_metadata-3.3.0.ebuild 1134 BLAKE2B 3e75a125614992d4b1edbc736476b96fdecc97e412ae34a7d0661339f59045365097983c98966f97e1c26fc1a08a1c32eac62dd8c055ee2633a256de48b1a44d SHA512 9425d39127e14bc4bdec23fea4156d9b12fc752397f4c60f3b68b5047aa4a98fa9e96572627254e221e0f9723d82e7ad86772489331fafe1badf6b9238e0461a
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild
deleted file mode 100644
index 20283369fcf4..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx "${PN}/docs" \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# remove dep on setuptools_scm
-	sed -e 's:test_find_local:_&:' \
-		-i importlib_metadata/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
index 47bffcc15b52..f52f996857c5 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild
deleted file mode 100644
index 7fe2947b8391..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Included in Python >= 3.8
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}