gentoo (valentine's day) resync : 14.02.2021

2 files changed, 15 insertions, 14 deletions

diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 1ac9998b6af9..17d375e81b22 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,4 +1,4 @@
 AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
-DIST httplib2-0.18.1.tar.gz 262930 BLAKE2B d8130dfbbee71dae1319a8a65fb2ae96d667bba08cfc586c0a9239d6bf6cb475fbd4548d6b5276b8001a02417eebff4a7565024d43c630b8ed51e467cdd3de71 SHA512 a1bb527279bdc92fb75bffebc317ff549bb6efb678580cbe40d187921b7ace66b1a5bc1d98bdf065ec5667fe69632da086b0eb201ff911497324fd817bfe1b7a
-EBUILD httplib2-0.18.1-r1.ebuild 1338 BLAKE2B 11510b489533c130adabc31f20aadd06c5e9c3fdda2f5cfb7bc6911d238235655fd62981dd664bec789c328493298cc3ee239a0357fd99bfd23258292af95dbf SHA512 7996fbe00e9096d09a15b206cb03b538182bdc56bdfc18afbe28975ab8f0c8513c093c431dc6380f7fb41a59294d2b1badd820f3caa84b1a3b65b5a0e638a476
+DIST httplib2-0.19.0.tar.gz 263522 BLAKE2B b35c8dcf86de17a5d8eac86a9a6b4110fb247925662e24a7645a67dfd0b2e640dc29875b41673c5a91a083f17e9619fd40dd08cf2c9ee7f48c8069bc14a50966 SHA512 9193a0e8e9a58a3f0e9b27fdf827932482a47b88af297af6e5f004164ca0b72feeff513b8191bf7c48d6714070a1390ae54eb8a2c6840f54f2580889c7837c7f
+EBUILD httplib2-0.19.0.ebuild 1384 BLAKE2B 26789a048ba3592fb2a7e6493d42ea964ffe5b4f0b6be030ea6428c68b048acb0ef82affb0aa398ee33479ccab45bbc665739e9a7cd48f74feafc08bf1970e5a SHA512 2ca8ea7a37229402322dc2b1b9e542ad09ec1c0a56bf05fb856af87059b6e656042f7132ff88c765f2275c722e194e0040672e1ba9dc9e0acf80d516c3bc9b32
 MISC metadata.xml 405 BLAKE2B d6f84c1836d38410590b2da8878ee9afe2b3b8754900c140e0dcb2a8098c998e078db1d93b7d5d5c0cec8b714a4447f9bc032e98d4c4fdb84649b32c3a14e405 SHA512 3b3a073097dfa5c018db5f5a3d8c5b3a65fdc56e9c0fbf3c00610a3a256596b7b6c5d40c20e7fc91007eb27bc7d1ec358f42a4d01f37ebed3656f88896df5f40
diff --git a/dev-python/httplib2/httplib2-0.18.1-r1.ebuild b/dev-python/httplib2/httplib2-0.19.0.ebuild
index 9a1167aa81ef..38f41cc3a92a 100644
--- a/dev-python/httplib2/httplib2-0.18.1-r1.ebuild
+++ b/dev-python/httplib2/httplib2-0.19.0.ebuild
@@ -28,22 +28,23 @@ PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
 
 src_prepare() {
 	sed -i -e '/--cov/d' setup.cfg || die
-
-	# broken by using system certificates
-	sed -e 's:test_certs_file_from_builtin:_&:' \
-		-e 's:test_certs_file_from_environment:_&:' \
-		-e 's:test_with_certifi_removed_from_modules:_&:' \
-		-i tests/test_cacerts_from_env.py || die
-	# broken by new PySocks, probably
-	sed -e 's:test_server_not_found_error_is_raised_for_invalid_hostname:_&:' \
-		-e 's:test_socks5_auth:_&:' \
-		-i tests/test_proxy.py || die
-
 	distutils-r1_src_prepare
 }
 
 python_test() {
+	local deselect=(
+		# broken by using system certificates
+		tests/test_cacerts_from_env.py::test_certs_file_from_builtin
+		tests/test_cacerts_from_env.py::test_certs_file_from_environment
+		tests/test_cacerts_from_env.py::test_with_certifi_removed_from_modules
+
+		# broken by new PySocks, probably
+		tests/test_proxy.py::test_server_not_found_error_is_raised_for_invalid_hostname
+		tests/test_proxy.py::test_socks5_auth
+	)
+
 	# tests in python* are replaced by tests/
 	# upstream fails at cleaning up stuff
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
+	pytest -vv ${deselect[@]/#/--deselect } tests ||
+		die "Tests fail with ${EPYTHON}"
 }