gentoo new year resync : 01.01.2021

4 files changed, 2 insertions, 84 deletions

diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index bf4229260a6a..0399b822b0f8 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,7 +1,4 @@
-AUX toml-0.10.1-skip-numpy.patch 1105 BLAKE2B a3cb255be800f833a5bf32b3860b7d6737b1c02b8f42079b99393ed49daac05659cbd9b9961de86160dfc7e995e5eb783c855fe2e4a3f1e75597e672dc8b3a4f SHA512 b51112969c531d465e83616690dc8c0098c3a3bee6ac56771beedbd92a0a0e7d79a4ee96e2961881a56b166283c2cdd4ecd75bb26bd0173c405e3fbe738b7f9d
-DIST toml-0.10.1-1.tar.gz 22559 BLAKE2B 17d9d9c78f2b78a6fc5bc0efd8530af5514d2f965eb1896a0eaca9a6d8ce1dda3a5dc825a8b6cd2a2096a582bd35952e6f0a3372021c739c69186d5a2c5642be SHA512 0a2348bffc889e63f4c6f8ae4faf022cceff069b178d086a37ff03e97e0f24b4b5a72810a345692f21810f3f41908b6981da902862adb06286bdb2941e9e0d60
 DIST toml-0.10.2-1.tar.gz 23325 BLAKE2B dedab7d08dadca963e62d64e9108e254dd73b78761985faa892792823027befc6473ae02c35c275a216b4544d1af8776afa78e39c63c95eb856e2bccf1de49c4 SHA512 5c706a3ae336e6b29bdce9752b91c677f7610cbcc1af4169cc24779e248031406cd19ac367725b2aa7903e4b1db71fa59255238c0270b2c146fd5d7e12d9a5da
 DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0
-EBUILD toml-0.10.1-r1.ebuild 1056 BLAKE2B 4d18ac31dd79412cc0cf7bb68bd3c0dd086452bc0c80b20efedc7a2f8456d5c834a82ab0fe1718caecb7f876e6ebc43ebdd5d51408b42fb442a3c219e029f2e7 SHA512 ba7fb9b2f169b73c3074f97f0920221a2cb01b255a6b085863a449524036d2052103dae995ce160a13f0d015bbc517062c1bfe832c4cfb201fedde46c2c56a48
-EBUILD toml-0.10.2.ebuild 1011 BLAKE2B d4f650c986a6115b4312aba7a3f3335ca3040309e551f30120615fee0730df9267b2b226832fe09ecd4556694b32d9042de1ad0839ac3b10be19b1f41170727a SHA512 31109b68c6f0855132c8f8a1df6e41e872e7a91e5512eb89853da5154c3db2517f120d544c0319c654d982d1b1504902ffc4508b118e7ee07df59beb1f3696d8
+EBUILD toml-0.10.2.ebuild 1037 BLAKE2B 525379828bf3ee7166e4fa574c700fce7e3b6639179382f913c59b1d1e62ad1f8d934bf81807a9ddcba837e9c860a50b8d64c8adb55a5b930a1d53529d9e2f62 SHA512 ecd38b22c796adfdeb72189ea988a24248be520a4b8e93f9bd61223c1141cc34ee5fde56a75d31105ac37e048100ebb6975a20c054ae8f6b8c5fb6ae75a3cb5b
 MISC metadata.xml 380 BLAKE2B ec4806e600de8ff5dc0ce341d90563166feae233c7911cf6c396ffe3b1e80b30fa1ac0b1a8c7b99a3e690cabadd8ae098882f53ca415377e54f08d37028e0b4a SHA512 09865620b098af31212c38a6aec4e5efd3e1725ed3963dcf7382aa815f0b607c4c4c4887d43ac678feda5165c9a3eef879c877b7853d133635023f7fc8f0b3bf
diff --git a/dev-python/toml/files/toml-0.10.1-skip-numpy.patch b/dev-python/toml/files/toml-0.10.1-skip-numpy.patch
deleted file mode 100644
index 5c6808d2daf4..000000000000
--- a/dev-python/toml/files/toml-0.10.1-skip-numpy.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 93901215b45db2ab9d50987ac109c29acbe34600 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 25 May 2020 16:38:17 +0200
-Subject: [PATCH] Skip numpy tests when numpy is not available
-
-Make it possible to successfully run tests without numpy installed.
-This package is becoming quite hard profile, and being able to test it
-without building numpy first would be a nice feature.
----
- tests/test_api.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_api.py b/tests/test_api.py
-index dd12eb3..67bcd88 100644
---- a/tests/test_api.py
-+++ b/tests/test_api.py
-@@ -103,7 +103,7 @@ def test_array_sep():
- 
- 
- def test_numpy_floats():
--    import numpy as np
-+    np = pytest.importorskip('numpy')
- 
-     encoder = toml.TomlNumpyEncoder()
-     d = {'a': np.array([1, .3], dtype=np.float64)}
-@@ -120,7 +120,7 @@ def test_numpy_floats():
- 
- 
- def test_numpy_ints():
--    import numpy as np
-+    np = pytest.importorskip('numpy')
- 
-     encoder = toml.TomlNumpyEncoder()
-     d = {'a': np.array([1, 3], dtype=np.int64)}
--- 
-2.26.2
-
diff --git a/dev-python/toml/toml-0.10.1-r1.ebuild b/dev-python/toml/toml-0.10.1-r1.ebuild
deleted file mode 100644
index 9e2ffd0b5013..000000000000
--- a/dev-python/toml/toml-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-TOML_TEST_VER="280497fa5f12e43d7233aed0d74e07ca61ef176b"
-
-DESCRIPTION="Python library for handling TOML files"
-HOMEPAGE="https://github.com/uiri/toml"
-SRC_URI="https://github.com/uiri/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz
-	test? ( https://github.com/BurntSushi/toml-test/archive/${TOML_TEST_VER}.tar.gz -> toml-test-${TOML_TEST_VER}.tar.gz )"
-IUSE="test"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' python3_{6,7,8})
-	)"
-
-DOCS=( README.rst )
-PATCHES=(
-	"${FILESDIR}"/toml-0.10.1-skip-numpy.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test; then
-		mv "${WORKDIR}/toml-test-${TOML_TEST_VER#v}" "${S}/toml-test" || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/toml/toml-0.10.2.ebuild b/dev-python/toml/toml-0.10.2.ebuild
index b62d25f5d86e..d4cff4d117ce 100644
--- a/dev-python/toml/toml-0.10.2.ebuild
+++ b/dev-python/toml/toml-0.10.2.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 
 LICENSE="BSD"
 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 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (