gentoo resync : 16.04.2022

4 files changed, 2 insertions, 52 deletions

diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index 56f3fd2dd6dc..7f6311925f63 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,7 +1,4 @@
-AUX pycountry-20.7.3-fix-tests-for-pypy3.patch 740 BLAKE2B 64113481df5b7fb385604f16d7b3be066a12b6a5e1dab38cdf879101da132bcacf407fdf773d5f15381789114be265c7e1ee3ab880c38dae6e904e6820923ee5 SHA512 0df7756ac4d3dd3ccc409307f21a95021c93851ad3b6ce07ce244eade4957d9906dc6aaabdbafe671cf6f9619623cdd22097119642c0c926376e4991eb6a1a4f
 AUX pycountry-22.3.5-fix-tests-for-pypy3.patch 740 BLAKE2B 192233d0307af96304a8fac1454389b81488365a1d44088b183cd3e2455ae600066e00e39a1ee68974961e5f5386967f24a495734490768f9423e21f15d259a9 SHA512 c593e382150bfea0e19446bb720e0d4f733aaf8964bf07689e8c8f238c8fe9ca2e89c957249c46cc489f9ca84540f0184659899945562e728bd35c965e2aa911
-DIST pycountry-22.1.10.tar.gz 10060795 BLAKE2B 51672b2e08e48528797e57e6a546261d4ceee0af364d5c943f243a5956008ffc417b02e553f376c252bfbfbf76af40585c9f910815a9c2943ff88be6fb9d4180 SHA512 93e5737df29affe5bbf8a2aa2caef59727adcc198eab301a5ddbc4275e32955cec0de9ab2820470a8cf87b0c0a9d48bfddd18411d93a700212aba8372e5a52b4
 DIST pycountry-22.3.5.tar.gz 10141551 BLAKE2B d645eade8ce9be3b99f4f2b189cc50c3395ecb3899ab9fa668066993abbfa576191cfcc05b7bb2764d088a86df492770bcc0a8834f04e6fde58a01defe8a1b14 SHA512 07dc507ee94f1880727761df197f81704386d9246163c9a5872f47083d37c7d1205dfbd28c6663ef0731a0b05277ade03a1a1929ab84087e0e85c05028c68b89
-EBUILD pycountry-22.1.10.ebuild 774 BLAKE2B 8259c9171831a1e6850debe19ea40e7fadd443698a3480fd83baa5015a8dc8cae04d37caa74ddbc0059fb2c6a3630af188d7bb70b6856710c4e07c4477bb509a SHA512 b088811c30f857814e5cc45a04e637ad576e51e2eca6be8af3a02633ab9e54a55069c710808783e934c6750337e3b4155f79176c0520a22584ed4f362b7bab15
-EBUILD pycountry-22.3.5.ebuild 710 BLAKE2B f902f39f8f88f1e4d75580e76a0f8dabd28eb231447b4e71157a790084d56f822f4e44f43caa6a334e5c82c3596aec1c5a873c43fead4134d028371506ef8a4c SHA512 fa82d6e56ec8b9b6e08f4f495e9947b59ac94a83df9ba7838df83d4f5ec19405c080bbe720182bfa15488486c548834fa55444561f5d424fa687af2bb9301dc2
+EBUILD pycountry-22.3.5.ebuild 706 BLAKE2B b7afe235d57315fc279be6038fdd7fcd0df2e64046cdafad1d40d3746f017e0d2b2f4d21bdbc33a22f88f7a9ac306fddcdb5a5a0629ad676223146bf1ceb7fa3 SHA512 80083ce73e817e559e543645395ecb94078d7af3346e88c074297e81cfc9a78135d5cd46a1e444d057a86ad13b77da0a94d537e65247f4bb39744dad6315f1c7
 MISC metadata.xml 473 BLAKE2B d0b559ee14fa944b040388608d545a32952eac9ca3dd4d9c96b21b2457f195dda3034a2df4c3c3f54ac4f19b828e10eb603806ba6442aeff1d1ca93e9c67b5f5 SHA512 a4ef64a3474ced295324a04b292e892e5d4bfabaf850c38421b7d45d1a35a40bc8ca9a452e792d4a33b195896a8f29292b8a019a81b3e86f822ae792ecedba7f
diff --git a/dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch b/dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch
deleted file mode 100644
index 453c57f362cd..000000000000
--- a/dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 57a64b69704640bd85270d886c369ef5a31eee80
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Thu Sep 17 13:01:07 2020 +0200
-
-    Do not rely on CPython-specific __builtins__ for tests
-    
-    This makes test_locales pass with PyPy3.
-
-diff --git a/src/pycountry/tests/test_general.py b/src/pycountry/tests/test_general.py
-index ea697ae..ad1090f 100644
---- a/src/pycountry/tests/test_general.py
-+++ b/src/pycountry/tests/test_general.py
-@@ -149,7 +149,7 @@ def test_locales():
-     german = gettext.translation(
-         'iso3166', pycountry.LOCALES_DIR, languages=['de'])
-     german.install()
--    assert __builtins__['_']('Germany') == 'Deutschland'
-+    assert _('Germany') == 'Deutschland'
- 
- 
- def test_removed_countries():
diff --git a/dev-python/pycountry/pycountry-22.1.10.ebuild b/dev-python/pycountry/pycountry-22.1.10.ebuild
deleted file mode 100644
index 01aa2ed2d9eb..000000000000
--- a/dev-python/pycountry/pycountry-22.1.10.ebuild
+++ /dev/null
@@ -1,26 +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} )
-# The package uses pkg_resources to determine its version
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
-HOMEPAGE="https://github.com/flyingcircusio/pycountry"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 ppc ~riscv ~sparc x86"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests --install pytest
-
-# https://github.com/flyingcircusio/pycountry/pull/51
-PATCHES=( "${FILESDIR}/pycountry-20.7.3-fix-tests-for-pypy3.patch" )
diff --git a/dev-python/pycountry/pycountry-22.3.5.ebuild b/dev-python/pycountry/pycountry-22.3.5.ebuild
index 11db0887d579..3b48902c8f3c 100644
--- a/dev-python/pycountry/pycountry-22.3.5.ebuild
+++ b/dev-python/pycountry/pycountry-22.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~ia64 ppc ~riscv ~sparc x86"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"