gentoo auto-resync : 30:10:2022 - 15:03:33

10 files changed, 52 insertions, 7 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index da4831951a3e..dfeddb9985dc 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 0b08d9d0dd35..a54fa7a8c96e 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-3.8.3.tar.gz 7337480 BLAKE2B 28d2b5bf6dd6f19506127747511e006c22fcb59959ab090bdc53ca5ee0f7f186aedb0c8b4103c2ea52399dc998fa2e6d3f872239223cf72629a1168e3950f1f8 SHA512 248c232604c91442b2fc9fa55fbf7df8e3af56dcf4cd9c516414a3a738c5c60a8a06395cd9c6e2c8ea9884728aea757423735c7b9be889e6f17e3ee6395a2f64
-EBUILD aiohttp-3.8.3.ebuild 2922 BLAKE2B 7b83eef57c1f351019b48661f6cab4e73f2228eb54a3494f5519d96fb094f65cadc8f75e4e0591b72fbe1e516374bcaaba6952f86c1f5f603fbbdb3d186e1f47 SHA512 1bce1e9c1aa73de44f1716d2921295689c637c305e6de8db94110a55389e1168ccacf86c7bcdca92ad51c1b63d17d50807990f24fdbc38fb1b6e0c72f701f254
+EBUILD aiohttp-3.8.3-r1.ebuild 3032 BLAKE2B 1e488b21dc798c9fd583eeafaec86e87191a7e152c7edfbfce6f1d4c53faebfef456c063a5c8e17dd2a362f4ad35bc3c67fb732baeb8747d79f4bf376ca08523 SHA512 1c2b116cf24344bf3219055acf0f14bb8106be08941c93da7cff2224e7a494657aa9ebe3270b5c54b654c49158b0622d004e43593682d01072949d0509d16dc3
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.3.ebuild b/dev-python/aiohttp/aiohttp-3.8.3-r1.ebuild
index 2196ae4a7a44..a627d09b22db 100644
--- a/dev-python/aiohttp/aiohttp-3.8.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.3-r1.ebuild
@@ -69,6 +69,9 @@ src_prepare() {
 	# which(1)...
 	sed -i -e 's:which:command -v:' Makefile || die
 
+	# remove upper bound from charset-normalizer
+	sed -i -e '/charset-normalizer/s:, < 3\.0::' setup.cfg || die
+
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/pyannotate/Manifest b/dev-python/pyannotate/Manifest
index d24b98b3a9b7..a3916f1081a3 100644
--- a/dev-python/pyannotate/Manifest
+++ b/dev-python/pyannotate/Manifest
@@ -1,3 +1,3 @@
 DIST pyannotate-1.2.0.gh.tar.gz 46148 BLAKE2B c52c93c0d27cb23b0b0683bbd5f353ba9a45714b8a50fb3a6f5aa4e67bfe71e60bc7afbee85a021ed25a7f5a1df720dc863fc6dd92d20dee0d97af72786866cf SHA512 cd755f3061f5c4320346f0198b71e4b312378a3810c5999f1d318b7427e7c55bd1bdfc4af84880bd45faf69eabccbd2684d1c18c1f9ad0661d35a377984ca063
-EBUILD pyannotate-1.2.0.ebuild 515 BLAKE2B 10c97a57092c8d04423ff39aeaeaab765a8e9d3554c9a44d3011e62b67cd7de4e4d5a0a1a9645ed06f0bc21b70dcee5f73f301ca335a9dfed82736e8167b807e SHA512 6ccb4b1ad3979c8683ecdc918e904af81b967d2f5a29f05946259b71b9dda663397d336b36f4e3da779a80058febba264d6434d38dacd41020279be6268cd67a
+EBUILD pyannotate-1.2.0.ebuild 515 BLAKE2B 158a36dd250763a4ef40ac1360a314529a0e5e6bf9749679f307102f19943c5192fba70b6ab7a264c238f9abefb391830ff4c2fea3d295d3d1036423b948f6b4 SHA512 d054d611de92bce716a3d1e5d3f8af72923e813807eea6ebb4692237926b451edfd4de572e1b979f5c0146d45893499d7d446acc4860d374291c4b74e2d3dd38
 MISC metadata.xml 604 BLAKE2B 72f9fad12803b851cf8dd2599471860208a0dc24bafe7f67d2b2a69be49bcd1eff6ae2c38e9b83ad2884fd6b3a44feadf72351076e7af7bfefb5523309946c25 SHA512 1a8329f48b59c4e7b1cefaeacf7c8b590f2e5a910d9513507d9d712aad955f59127bdcf44df95a6c0ac3927fcddd62eadf2b3969b9316539c129bd8204dac30a
diff --git a/dev-python/pyannotate/pyannotate-1.2.0.ebuild b/dev-python/pyannotate/pyannotate-1.2.0.ebuild
index 8f1e82ca06d5..d428d5c82b07 100644
--- a/dev-python/pyannotate/pyannotate-1.2.0.ebuild
+++ b/dev-python/pyannotate/pyannotate-1.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Auto-generate PEP-484 annotations"
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index a52c73c1bf51..048627b9b6c3 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -2,5 +2,5 @@ AUX pyproj-3.4.0-proj-9.1.patch 1995 BLAKE2B 0ce5cbf73d8d231dc07a0c764787d9aa9da
 DIST pyproj-3.3.1.gh.tar.gz 238373 BLAKE2B 7996d253a35e3d64a343141179a88d2ab97e88f96447f3daf14c9f8d731099b506228c163fe460d3be30ae69c87e908879b3c0fe31eb7624c3bb8da157838337 SHA512 7175479f4ec526ada830d178bea77552d66aace4c7f6cde584aebef5fc4c6b7a46272eea2bd95f71910411c9ac8d8832d350891ffffda8a86eabb5449177a5eb
 DIST pyproj-3.4.0.gh.tar.gz 231365 BLAKE2B a62e02a33424583ffec1e1de603a0162ea187b4eb093be51b957fb720b3625c7e4b65162f1272fb4a057edfd92f8146d74c17f1ad68a3beb0ae199df8641e03b SHA512 d0e9425ea5a10ce1620c2a2b3279be786741e75ad698a2430e38237acb73e2cd7dbd16dbb4cf952f52c38810526f4528c08f9bb0795a34fdab2f39686e6914c9
 EBUILD pyproj-3.3.1.ebuild 917 BLAKE2B a68f8b2ae45515fed681b2e17f510187753e9b34fef78122f1d08ca541e8ec1b9139fffb61a80a97cc3b513a86268336a53046c05768ebd36fb4a14eb497ead0 SHA512 50e98ad158e47af5488161d92c8feb90e2a30888c341df9f2a251407495b702cee5b75c5503f8f9591cf0e495351814e1446115bd6ed1e7ebf53a01ba0de11e4
-EBUILD pyproj-3.4.0.ebuild 995 BLAKE2B e36a786037940f5cc6d9d35d5991eae3f31856757cd1af288253294ff5e5378d9e926e7e0461511f65ca64b7d6936ed958ad9a8ac0cbc57de8a3cd0434980cc9 SHA512 57ff52b4667e8c3051a7706d8bd46ad647b75b7be7235f5d301eedc87c318295b878f2cd8c99012d8dea66c4521ec67ca2b06de0315014f3acd7d311d2a61c30
+EBUILD pyproj-3.4.0.ebuild 1215 BLAKE2B c0699cd364fbe553ef3427edb99aa0a9c16a549c1295239f350a58365b850b5b640b7a169863fc3bb2e8d591827ab79a7855d3c15129df8aa00242d4b002b7df SHA512 2869c6758252089009bc7706a69399b3f5bf0ebfe727b8426c08066416fb04cf07b0ac5360455d8682edb6468592d723757956c9dccc323d6454b9e22a72b1f1
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/pyproj-3.4.0.ebuild b/dev-python/pyproj/pyproj-3.4.0.ebuild
index 70379b19b4dd..c0065b0c9ead 100644
--- a/dev-python/pyproj/pyproj-3.4.0.ebuild
+++ b/dev-python/pyproj/pyproj-3.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -47,6 +47,13 @@ distutils_enable_sphinx docs \
 	dev-python/furo
 distutils_enable_tests pytest
 
+src_configure() {
+	# Avoid greedily trying -L/usr/lib, etc
+	# https://github.com/pyproj4/pyproj/blob/main/setup.py#L76
+	export PROJ_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export PROJ_INCDIR="${ESYSROOT}/usr/include"
+}
+
 python_test() {
 	rm -rf pyproj || die
 	epytest -m "not network" test
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index f8dbf1add92f..f735c657e8b7 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,3 +1,4 @@
+AUX pytest-django-4.5.2-pytest-7.patch 1363 BLAKE2B 167e9fe999261fbf39985de8da87e551d08c9e855812bfc3b35c0a8f6c4c64bb99c2dbc9e706714cb20258da30072420841b033fd71e3157a8821a728be8b0c3 SHA512 9e57788693cdbd472d45c6f40190514a90d7b2d067fd8bfa95938ffbd0471bc9855266f2027368f3ae51bc5f03f743fab65b986c830f450bf72a3269ca17f1d1
 DIST pytest-django-4.5.2.gh.tar.gz 75429 BLAKE2B 2e8fba037c7618c6dd1c9200c5c44a7b00a13a2d70b4a593a461af3dbc0333b6814ceca16f88a58f1b6aeea2700cac12b589ede702b8eaf023fb3948e0ab8b9a SHA512 09ed5bfe850599e95190d9b15e9383d1249ea575a7b3921744583da6266dd2c8d3eb4f93c8de96d98e1a8e33d1639937470cdc6d11558fcaea57d014dce13500
-EBUILD pytest-django-4.5.2.ebuild 1264 BLAKE2B 5eafb92d7e738ae39a966ef50940f064620c4684255b0733717b0343dd6d11b27fa66e41715bec0e30b6c5f2276fd866b4f9944ed3201150bd869472044365f8 SHA512 b13d6a0266b0eb5fcd9f793b885ea711252d780dea6b39deaad8c93072f2f2480a4bea5aa0d09387ced752c93e3d3e29323b15b35814b8a7b4a35c53fdd29bd7
+EBUILD pytest-django-4.5.2.ebuild 1312 BLAKE2B be90cd6b42439db68f2e826bd17dcf97f4a2e647e6cb7e253ba931a5d77549f869d03e61be6c20b8e63669516c853ffe698aa5d4367c161fba8740619ff27a23 SHA512 9edcdcb809578cd18301870c3f985da8120a5005fd1e02da347346104093cfe8fbeee004e8784b942c17e4eb8a2b9f6726229bbc34c365858ae86d1edfe0d45b
 MISC metadata.xml 405 BLAKE2B 973e3124eed7a497154d1160e5e1350503b2599a3111968329f0b01496ce1eb6b84b76aeddb427478ffd470aa8aee4102e5598b3406b8d2dbd01703cd9adbef8 SHA512 6d7a6a7e084283cd6564be193a43c80f0599c4aa98ad68a98e656f9f1aa7103cd6164acf040c1e71415e28ebe707b013f92bcf4f2f5139ee873ee20408aed150
diff --git a/dev-python/pytest-django/files/pytest-django-4.5.2-pytest-7.patch b/dev-python/pytest-django/files/pytest-django-4.5.2-pytest-7.patch
new file mode 100644
index 000000000000..657e5fa617a2
--- /dev/null
+++ b/dev-python/pytest-django/files/pytest-django-4.5.2-pytest-7.patch
@@ -0,0 +1,30 @@
+https://github.com/pytest-dev/pytest-django/commit/14b993d1cb291bfcf05f35f57db55c0419886534
+https://bugs.gentoo.org/834815
+
+From 14b993d1cb291bfcf05f35f57db55c0419886534 Mon Sep 17 00:00:00 2001
+From: Stanislav Levin <slev@altlinux.org>
+Date: Mon, 28 Feb 2022 13:12:37 +0300
+Subject: [PATCH] tests: Sync expected stream for Pytest's version
+
+https://docs.pytest.org/en/7.0.x/changelog.html#breaking-changes:
+> [pytest#8246](https://github.com/pytest-dev/pytest/issues/8246): --version now writes version information to stdout rather than stderr.
+
+Fixes: https://github.com/pytest-dev/pytest-django/issues/995
+Signed-off-by: Stanislav Levin <slev@altlinux.org>
+--- a/tests/test_manage_py_scan.py
++++ b/tests/test_manage_py_scan.py
+@@ -118,7 +118,12 @@ def test_django_project_found_invalid_settings_version(django_testdir, monkeypat
+ 
+     result = django_testdir.runpytest_subprocess("django_project_root", "--version", "--version")
+     assert result.ret == 0
+-    result.stderr.fnmatch_lines(["*This is pytest version*"])
++    if hasattr(pytest, "version_tuple") and pytest.version_tuple >= (7, 0):
++        version_out = result.stdout
++    else:
++        version_out = result.stderr
++
++    version_out.fnmatch_lines(["*This is pytest version*"])
+ 
+     result = django_testdir.runpytest_subprocess("django_project_root", "--help")
+     assert result.ret == 0
+
diff --git a/dev-python/pytest-django/pytest-django-4.5.2.ebuild b/dev-python/pytest-django/pytest-django-4.5.2.ebuild
index c8c2f52aae18..5ef63f301424 100644
--- a/dev-python/pytest-django/pytest-django-4.5.2.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A Django plugin for py.test"
@@ -30,6 +30,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest-7.patch
+)
+
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
 distutils_enable_tests --install pytest