dev-python/httplib2: add 0.20.4, drop 0.19.0-r1

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.19.0.tar.gz 263522 BLAKE2B b35c8dcf86de17a5d8eac86a9a6b4110fb247925662e24a7645a67dfd0b2e640dc29875b41673c5a91a083f17e9619fd40dd08cf2c9ee7f48c8069bc14a50966 SHA512 9193a0e8e9a58a3f0e9b27fdf827932482a47b88af297af6e5f004164ca0b72feeff513b8191bf7c48d6714070a1390ae54eb8a2c6840f54f2580889c7837c7f
-EBUILD httplib2-0.19.0-r1.ebuild 1423 BLAKE2B f67a2236348dca6499ae08641a09122c304bed72dc6d9d74f7f9528711a5edb0f31bd4aed076d93b2c619f8640b3754ada478e6a773d9c5da31817a3e84a9e1b SHA512 9191a0c1330bdc58d4fd3fddc16c2433ed42bfb241f595d5f49f27d3c88995216c319faa3263a6e765b6813b00f0e7437af713c7a9402569621d331842def44a
-MISC metadata.xml 451 BLAKE2B cfd70c4b4a9dce8c74291054a4188d758d574db0128a8c95faef95a30c2ec23cddb234e3c69063b924918227b6c196f59fe1145ba4ba7ae1cede855266088938 SHA512 27b81fbfc3e05fa676fe87b3c8940726734854bd67388dde76041e54fef4a89643bf6422f00de196af4d436eb18f6613a56a8015ec5dfb0434c9d2128cb3c32e
+DIST httplib2-0.20.4.gh.tar.gz 371778 BLAKE2B 85e2dd0b6213cc5015d4f2f7f923209a61649f948f003eaf3c95c956cb08e6f5bf9dc4e40109c0ddea6a18ab47870a21c7d367ea1eeec2644507568f4e271005 SHA512 46396a9bb439e61939e481a2502567a6dc40686471267ea4c357f141ac138193107f90ac465db683e4ab71e5d92249b810657bff0cb74af7a37a9a23c8320741
+EBUILD httplib2-0.20.4.ebuild 1764 BLAKE2B 09648723368bef3e035ca2af71bef3f50f7f0ff33168e797456476e16fec4ac2371716a58b03681ce5afdd031f470a5a05f4eba802ffc4a6c1d15ee154f3341c SHA512 a983c25e874f7da775fbfa3495af2756ac7513b2a4416694ae21bb2b661e2fd8c6e7eacd80ecb8e0429eace583173f72cd83721bdb6601e1a4c0e9360321c6d5
+MISC metadata.xml 508 BLAKE2B 08443007f680a01d86a97c12c529066f22a52a58ff290bb2db0f122908ad02929823f34681cc58c643dadca9bc838dd1073265a6001d07590365bb5293b70fa3 SHA512 526b225fecef80a1badeaf514f9db9ac12254b2047d6fde1dddd4aa62abd9ce7102e025772bdd4bda17b6025133a9f5bfd163509e130e426ff6d8173a3d7371e

dev-python/httplib2/httplib2-0.20.4.ebuild

@@ -3,38 +3,50 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://pypi.org/project/httplib2/
+	https://github.com/httplib2/httplib2/
+"
+SRC_URI="
+	https://github.com/httplib2/httplib2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="
 	app-misc/ca-certificates
-	dev-python/pyparsing[${PYTHON_USEDEP}]"
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
+		dev-libs/openssl
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
-PATCHES=( "${FILESDIR}/${PN}-0.12.1-use-system-cacerts.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
 
 src_prepare() {
 	sed -i -e '/--cov/d' setup.cfg || die
+	# cryptography dep is entirely optional, and has a good fallback
+	sed -i -e 's:from cryptography.*:pass:' tests/__init__.py || die
 	distutils-r1_src_prepare
 }
 
 python_test() {
-	local deselect=(
+	local EPYTEST_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
@@ -43,10 +55,16 @@ python_test() {
 		# 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
+
+		# broken by recerting (TODO)
+		tests/test_https.py::test_min_tls_version
+		tests/test_https.py::test_max_tls_version
+
+		# new cryptography or openssl-3?
+		tests/test_https.py::test_client_cert_password_verified
 	)
 
 	# tests in python* are replaced by tests/
 	# upstream fails at cleaning up stuff
-	pytest -vv "${deselect[@]/#/--deselect }" tests ||
-		die "Tests fail with ${EPYTHON}"
+	epytest tests
 }

dev-python/httplib2/metadata.xml

@@ -7,6 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">httplib2</remote-id>
+    <remote-id type="pypi">httplib2/httplib2</remote-id>
     <maintainer status="unknown">
       <email>joe@bitworking.org</email>
       <name>Joe Gregorio</name>