gentoo resync : 20.10.2021

6 files changed, 2 insertions, 127 deletions

diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 65dae9fce9d6..ac0d6a6afba4 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,10 +1,3 @@
-AUX tldextract-3.1.0-skip-pylint.patch 539 BLAKE2B 94b0055259e6220d0aa2fec49af146b596377c493f950b27e4f2f578f153ca659e5dfdb2549932e0cf8a2ffbef844df773b279b715d86b5b6582b9464c849229 SHA512 961578dcd641c651a7ed52de99cc448d53178f03222bfda8f849a26f46c8b95c0e2351981f10bff6fc6adad2e16510fe30c879af117a7246398164ca7ed95945
-DIST tldextract-2.2.1.tar.gz 54538 BLAKE2B 0abfb1982d0b9e9cd767bc64db289da8bf2f58b599eaea7e703adf36934dae0d052170fa9a8205b8ac0b441d8f1ac75648ccc108515586b0bcacf2ecb43fef52 SHA512 db4f14e514c0e68f85f28226343d7ec91ceea2843ee01c9a2950f0972f365bf343640e07cfb118aff52bab975719be71d179fc6b3bd4da7eb62a47b62747cc0b
-DIST tldextract-3.1.0.tar.gz 101874 BLAKE2B 105f34699de2118126dc0f9d68f25999f99211aa8529c2640dd21d303cfb18cd5388819986881e235b8111a21b74d99c6424ad469a66a0ac45c25a0e7c31a21f SHA512 c6c67598b7dd2c8e85008c5061693182eb075e16390b001eb696fd12a0f5666d0a327667a0fd61e4f270003a8cfc97a8fbf7b53a246bab6f9e9ad95943dac9d8
-DIST tldextract-3.1.1.tar.gz 103195 BLAKE2B e0cdf85e22d58bf68705e9c37cfffaa8a9508316e734adf682b14daa50f02b408cbeda9f4554674f0f582b3246e750bbc46c70d7528c1a4af30b55f05e4bf595 SHA512 caec65beca0b2ba8f294043cf2f64839aef9fe472d1a76619bef1ec6b33ac99ccd08c24601c7fd97fef215621c9ec71a34911d3832febdb36d3f8ac9561b1175
 DIST tldextract-3.1.2.tar.gz 103248 BLAKE2B 5612016be7e8cd9b75dc5225f87ebc28635d66a7cacee54af2bd8db6ed6bb26ffe6ee5b4ab9b24473f19f0ad8d9d536e24236106288cd82cf635abef81f9babd SHA512 2c2340a9142d49aa7c0db71b5a7fb1a63e19354a5da8edd7de923e55c8ec03d8a8551f4710c66d6d1aece1d0d78701229ef5ed2ed49bcce44972b7b96747bd77
-EBUILD tldextract-2.2.1.ebuild 624 BLAKE2B 0a93652157e06ed51fa4862c4674dbe15b5ca349f50a1f3105d58add7fe00324794cf6004b2b50da90aa5ec211c47e180f151ed47d0e71a809245e940969949a SHA512 314957d9b89deb7a7e8618c81e5654259ab0f520170a44abe316f2ba629959b86b3eeb592374b97235817d391a86b33b9d5934715bcd96aaff95be240616c939
-EBUILD tldextract-3.1.0.ebuild 873 BLAKE2B 70683c219a32c2d559dc0af01c8f2a005ca45a46b9586c46b7f6705a97fd47f86982ba900a62ac0100179888746a7cc0a99bb918200114a42b117a2bebe7c1a1 SHA512 99d0d575cd4d39809f51e93cb8b3968b4ed18be5a4edecf0a28fce31c6c87a46fc47f21e18da062f33ea1bd1b1d291cfe096f28fef6c53084ce59930ac63d5a7
-EBUILD tldextract-3.1.1.ebuild 854 BLAKE2B 6f0199472e0a664f589c340271ee64fa4643a2db60d44cfd684430d132dcc9779f09ee8b2f66343f4964e11f4dc67bf89c67f950673ccf02e31d0a705e58fb48 SHA512 4f2062c18c84dcc5e3e892d1b3b5d8e541ae477b7d308307542bc6ee937966ec1ef7dec15c6e1458ba594d965fe843344358e81c4cf050b90f27c8ebc3c54013
-EBUILD tldextract-3.1.2.ebuild 764 BLAKE2B 1f1d4b707df76e07d4aecbfcada59d9f3f42282b3cd6ff644872225463e911aadaa9fbd3206f9c4b8133edf64de470823f17f240ed97feca3f5ffb3e23032a3c SHA512 149379f455b6fc865426785af800f00159e12a0cc382f50c0adb116b5fad4d5668e23233c910834ffc4a454c424d5e0917fd4e256f79a4455a3b34d805ae9d50
+EBUILD tldextract-3.1.2.ebuild 771 BLAKE2B deb8d4c38e27ccc025313c2431f6ea3005fcda34da9e57afdceb74eab70e373e168c0ee4da40c1a2becde0970841de62978f26ddf0099576e5733d9ab0e75d2c SHA512 b9f05b5de278149d50ec10b2fde7ea0dfa8ea702a771de35bb4516308b0a5ad9caa81b469db8e6a7ddc277a5915576f3096070f6a6171575a797db4291a04322
 MISC metadata.xml 560 BLAKE2B 4d6e6aa7507ce4734371e8b8442e8d4840db0d2896f7e7430438bc9b700edf6c8546fc3beb1e17d489013b6cc49d1daf805581d6fda29f51109e7a643b0e8965 SHA512 4e7ed8a1876afc62954ee58937557182099ea2289633d2d279a2982bb32a8de261163f0b83ba44c257b8c087c007b1bb462ecad69df1115a024a3a9c8ea1fe9e
diff --git a/dev-python/tldextract/files/tldextract-3.1.0-skip-pylint.patch b/dev-python/tldextract/files/tldextract-3.1.0-skip-pylint.patch
deleted file mode 100644
index c80541d79ce3..000000000000
--- a/dev-python/tldextract/files/tldextract-3.1.0-skip-pylint.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From f189ebb3ecf60b9764852021988112df5c9e25c7 Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Thu, 12 Aug 2021 13:34:52 +0200
-Subject: [PATCH] tests: do not run pylint by default
-
-There is already a separate tox environment to run pylint tests.
----
- pytest.ini | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pytest.ini b/pytest.ini
-index 6d94ff5..df3eb51 100644
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -1,2 +1,2 @@
- [pytest]
--addopts = --doctest-modules --pylint
-+addopts = --doctest-modules
diff --git a/dev-python/tldextract/tldextract-2.2.1.ebuild b/dev-python/tldextract/tldextract-2.2.1.ebuild
deleted file mode 100644
index 28690d11e5c2..000000000000
--- a/dev-python/tldextract/tldextract-2.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
-HOMEPAGE="https://pypi.org/project/tldextract/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/tldextract/tldextract-3.1.0.ebuild b/dev-python/tldextract/tldextract-3.1.0.ebuild
deleted file mode 100644
index bbd890ed877c..000000000000
--- a/dev-python/tldextract/tldextract-3.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
-HOMEPAGE="https://pypi.org/project/tldextract/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/john-kurkowski/tldextract/pull/230
-	"${FILESDIR}/${P}-skip-pylint.patch"
-)
diff --git a/dev-python/tldextract/tldextract-3.1.1.ebuild b/dev-python/tldextract/tldextract-3.1.1.ebuild
deleted file mode 100644
index fe0c1f271c53..000000000000
--- a/dev-python/tldextract/tldextract-3.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
-HOMEPAGE="https://pypi.org/project/tldextract/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--pylint::' pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tldextract/tldextract-3.1.2.ebuild b/dev-python/tldextract/tldextract-3.1.2.ebuild
index 4c780be125f2..235416ec6276 100644
--- a/dev-python/tldextract/tldextract-3.1.2.ebuild
+++ b/dev-python/tldextract/tldextract-3.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]