Adding metadata

3 files changed, 12 insertions, 74 deletions

diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index ff1a094eece5..62685933e187 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,3 +1,2 @@
-DIST httplib2-0.22.0.gh.tar.gz 373972 BLAKE2B 6adfbc61d4f898666512da5d02cf082fcaf76bf1816de955510f5c4721a36c38d99fef963d5150b62cca091543ed65bb1ef5f33ce99123e1cd2abe467d4970e3 SHA512 77210f85ccaa2d2cf4a6c89f5146ca5eb9a6f26f00e862f6d0716ec73baffdf94714ae1d5eaced4349920b91276a7835e2f028c6d9156e84c241514b198791e5
-DIST httplib2-0.30.0.gh.tar.gz 276043 BLAKE2B a7381b38fa0969bfc19046cb2d5ca4c751135ad2a1d059b9193f66545c9882f3bafde6ae2a870295b7f5420846007892e3c5a6c284eb6b235c600a52dd240243 SHA512 5e7d6d6e4e7f3695b02f2a29314c2668cd11b2ee693b38aa82a20464cc47901640d8206243def668a350258118db28696f1e95f83620fdeaf9b49e249f875283
 DIST httplib2-0.31.0.gh.tar.gz 277430 BLAKE2B adbf06ae9372ec1be4a7c268791964ae35a7468e29912a6345778bd3748abe57636ac26741700db77e2d4f073d9741eed27843df06ecf62fbdb745765c2cee40 SHA512 6dba1b02b1e08da782be3eff275fe1920dda80ac8c638ccc18c3cfdbef0daf6cda8ebb168469442b7233756fd8cd7b4585c0c0fe7e4eaf5ba45225b84ceab781
+DIST httplib2-0.31.1.gh.tar.gz 277455 BLAKE2B 10f488d9a75a1a003d2a3d17d55af640824e7af57fc0005224586851a795e2a73d79e1be5d0ffaaa6a3b9b3bae26db6a0fc83dd009c240276aa61bb629d4e931 SHA512 c5b8ad2685ea7e26ab0b99c3856a64fc81f4986d4d925fee2391f3609abadfd76f1e5974ab3d93244f9b9dbd2260bbc3152842a8b14acb597f5bb998ddc91162
diff --git a/dev-python/httplib2/httplib2-0.22.0.ebuild b/dev-python/httplib2/httplib2-0.22.0.ebuild
deleted file mode 100644
index 5db28abc3f39..000000000000
--- a/dev-python/httplib2/httplib2-0.22.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..14} )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-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 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
-
-RDEPEND="
-	app-misc/ca-certificates
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		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 )
-
-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 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
-		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
-
-		# 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
-	epytest tests
-}
diff --git a/dev-python/httplib2/httplib2-0.30.0.ebuild b/dev-python/httplib2/httplib2-0.31.1.ebuild
index ff9e8d8d7a9c..5dae42ac293e 100644
--- a/dev-python/httplib2/httplib2-0.30.0.ebuild
+++ b/dev-python/httplib2/httplib2-0.31.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,19 +21,22 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="socks5"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
+	socks5? ( dev-python/pysocks[${PYTHON_USEDEP}] )
 "
 BDEPEND="
 	test? (
 		dev-libs/openssl
 		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/pysocks[${PYTHON_USEDEP}]
 	)
 "
 
-EPYTEST_PLUGINS=( pytest-timeout )
+EPYTEST_PLUGINS=( pytest-{forked,timeout} )
 # note: tests are racy with xdist
 distutils_enable_tests pytest
 
@@ -43,3 +46,9 @@ src_prepare() {
 	rm httplib2/cacerts.txt || die
 	distutils-r1_src_prepare
 }
+
+python_test() {
+	# TODO: there is something broken with pytest.mark.forked in pytest>=8.3.3
+	# work around that via --forked for now
+	epytest --forked
+}