gentoo auto-resync : 03:06:2024 - 00:07:25

4 files changed, 16 insertions, 35 deletions

diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index e75a5e7d27b8..f8480e4b4195 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,6 +1,5 @@
-AUX pycountry-22.3.5-fix-tests-for-pypy3.patch 740 BLAKE2B 192233d0307af96304a8fac1454389b81488365a1d44088b183cd3e2455ae600066e00e39a1ee68974961e5f5386967f24a495734490768f9423e21f15d259a9 SHA512 c593e382150bfea0e19446bb720e0d4f733aaf8964bf07689e8c8f238c8fe9ca2e89c957249c46cc489f9ca84540f0184659899945562e728bd35c965e2aa911
-DIST pycountry-22.3.5.tar.gz 10141551 BLAKE2B d645eade8ce9be3b99f4f2b189cc50c3395ecb3899ab9fa668066993abbfa576191cfcc05b7bb2764d088a86df492770bcc0a8834f04e6fde58a01defe8a1b14 SHA512 07dc507ee94f1880727761df197f81704386d9246163c9a5872f47083d37c7d1205dfbd28c6663ef0731a0b05277ade03a1a1929ab84087e0e85c05028c68b89
 DIST pycountry-23.12.11.tar.gz 5927399 BLAKE2B a8d32593d80a881abd03b482a99afc22996a730d911577f91eb8035336f07a25a8cd74cd19f9396675acacbab953098bf831119f8b9f7c72fc6c2807713fe6c9 SHA512 25b5a74c0dd8115473571976a64b6fed7010f62c1b3b4c1888b9e13a7cf4f533173f51d4652d55c426adee4e0ff119bb6e3132d04dce150b9d1ca4b11366c579
-EBUILD pycountry-22.3.5.ebuild 742 BLAKE2B 24e1b4cd4fa3c5ce13426e9789ce4a050383d2706b692c566d4a19df0252aa71268272320852e565e02a55ab6d674fef074b314f2e0bc19d598340c4e7b75eb6 SHA512 9effc0b629931bce29883dbdbf1973f5afc007cc94e82c0f5ad650d70e0d2f4c19782f95e30b54e4baa64cc861f3c5b52da770c3a0290cecaa639d4eaccc2f77
-EBUILD pycountry-23.12.11.ebuild 615 BLAKE2B bb8f1830c6c0efb9c92efd6bdb22d3be7ae182e8295ae86592273a7b66fd60f6283d0bf25a9f3042e07383449b3c76d402023504ed1062ec9cebd1aabf582de3 SHA512 c38609dbc1c0784e3314015efdbfc0af909641bbfbc163cfceaf19885271db1ea035e88e998a32271910ea06277f9d8564ec99b3503961a09998bc13ca434b9f
+DIST pycountry-24.6.1.tar.gz 6043910 BLAKE2B 53e5f3bb89edb95a10cc7bef3d5cef463d957b9bd80da1aea57c274f76f9fc5f4848c9ceabcf97d369343a5bc39f6b8e7fb2e80344ff29ccd5856a4de9770b3b SHA512 36d8f68b830d74259a5f9ac1c9c97c1b228b0072613229e6f579ea5af587ab1cd25f0637a2cdd1dbf2ae8225e2aa2958d25f1e6df42d577da821d85c4c49ae93
+EBUILD pycountry-23.12.11.ebuild 611 BLAKE2B 750387d940ad6461d5cd1bfe6e99c895e3408fa0cf2a7109fdcdf68a5e63c76c43898d158d31878fc6decb4a9095340db36f344ee95db2326c8e656efe5ab920 SHA512 0ec6c5b84114ecb16f624c4255c0b3ce1e2f1279f210e0e00678b86875cff0e3bde59131938dad81ce35b016c8d0205afd622e16424f5284070b8640f994d06b
+EBUILD pycountry-24.6.1.ebuild 723 BLAKE2B 528609151d654b13178810bd206bbdacbc3a0d8f89a1785c32b142ee32bda93f7753948a59604a36b9a01d839c5be6edfb2e116dfee5ef14c4fd0c46ddeb384c SHA512 e8cbb75e7aa1a007e8c5515240a9007484863dacc18d833dda49952224a63883af46941519fe8a96851c778fbbbfc7db815540b4e17ed271fe3279138feb97ca
 MISC metadata.xml 463 BLAKE2B 59f17132a93f1409b1cc14bafcab38887eedb9f66fd220c8c0696f7d1cfac3ac6005d9193f400d4f4a913343c6aa6bb8b6382012bb716af14d900f903f2c1b0d SHA512 2ed9620b00447a881a0f5311c13696105d149d72ad3b649519ba6dba93487e41cb5ac381741ed9e0388ff1780e3ba3699fea01bf1e7453daad4161a4d9ff0c9f
diff --git a/dev-python/pycountry/files/pycountry-22.3.5-fix-tests-for-pypy3.patch b/dev-python/pycountry/files/pycountry-22.3.5-fix-tests-for-pypy3.patch
deleted file mode 100644
index 2de5d0bb7630..000000000000
--- a/dev-python/pycountry/files/pycountry-22.3.5-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-23.12.11.ebuild b/dev-python/pycountry/pycountry-23.12.11.ebuild
index 3db3277b69db..dd397c07b70c 100644
--- a/dev-python/pycountry/pycountry-23.12.11.ebuild
+++ b/dev-python/pycountry/pycountry-23.12.11.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pycountry/pycountry-22.3.5.ebuild b/dev-python/pycountry/pycountry-24.6.1.ebuild
index e0fdeac24dc3..48fbe8ffcd2a 100644
--- a/dev-python/pycountry/pycountry-22.3.5.ebuild
+++ b/dev-python/pycountry/pycountry-24.6.1.ebuild
@@ -3,27 +3,30 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( pypy3 python3_{10..12} )
 
 inherit distutils-r1 pypi
 
 DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
 HOMEPAGE="
-	https://github.com/flyingcircusio/pycountry/
+	https://github.com/pycountry/pycountry/
 	https://pypi.org/project/pycountry/
 "
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
-# https://github.com/flyingcircusio/pycountry/pull/51
-PATCHES=(
-	"${FILESDIR}/pycountry-22.3.5-fix-tests-for-pypy3.patch"
-)
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts= -o required_plugins=
+}