gentoo auto-resync : 06:10:2024 - 04:27:04

4 files changed, 2 insertions, 142 deletions

diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index 43a163cb324d..99133472cfc9 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,6 +1,3 @@
-AUX pytest-httpbin-2.0.0-certs.patch 3725 BLAKE2B 4460298caf15ee802a350cb9525942523a89812ea74482fe38a232f05dd4da440faf326ae1cf9ab6e2ff61fc17b46a5ee79b7c55640d1950a13360ec8ead15a5 SHA512 1beb28d59e520737cd13c0735c350969fd8705c2641af7fca458d9011c674a3e3e3b063035262b0ad1fcc30a09101f23bdf4badc58618d5f5bb488b13b11e3a3
-DIST pytest-httpbin-2.0.0.gh.tar.gz 19799 BLAKE2B 7725bc958417c076ee920abce83bdad8295bc4c9551500040867650d54c306e79a1ea92b013124b793058103fc9685dbb2202be5f1b2da935509f68457d63d68 SHA512 62876590bacae6601739f5cc2eccb087024e16731afc9613b5e6928c2a2f64b73418ddcb3c4f13a4bfe1f074510f922d85411d05ebf66f123a4a09d535771b64
 DIST pytest-httpbin-2.1.0.gh.tar.gz 13140 BLAKE2B d1108b8464dbc1075007b4695810afe46fed17b51a785f12dfa184ba27efcfe88818ab8073c050334398eecfd647cd9169ef2d053e3fb424a02ece8a8d8c1518 SHA512 849985f170318ea3ad1d2af8811f3e3fef0e62bd6bdc611f061a8cd7d84a2d85d0ba9caf8c97298e1c99b979b08f1a28476927fa7abc1fa57334732ecfbdf2db
-EBUILD pytest-httpbin-2.0.0-r1.ebuild 1282 BLAKE2B 5884fab595e91281aeab2101cf6a76a491beb4cf01a8694db609c23efa9a5ff94b797ae9cd2df61fe07c2cf1f3fffa4037a2cf925fd22e5293379992adf9e12a SHA512 91eab00fece133d0ee95b7215fe63c7d02a502caf388fc673e7ad112b69c7e54172296f16d7c9ebf94817e61ef4ed775cba07a3b17aca1a75ac9095f9c19b6bb
-EBUILD pytest-httpbin-2.1.0.ebuild 783 BLAKE2B 3174aa1cbfb122262603dc7ed4aa18a0e7be88e13b9fbc57cbf73473c0c6acdbabe77f9d821779b28cd009debeab1033fc9559cb97607f313a271c9775c5b66a SHA512 489dc7aef06317ab9411320adaadf9e9bcbf22f75712aa2ab41d857a49ffbc832bd3c58bb94eda4659df61eaac584f577658241879672951e6f1b6974e6b0ac5
+EBUILD pytest-httpbin-2.1.0.ebuild 775 BLAKE2B 5959990a43abae9366f3e361f55187ad85c1eb0aba5b88af5110a7634d59066a2f5492fe5667e623f00b2b6da7d3352e26a83b8128b0259d1148d43695e4d509 SHA512 384ac0f63bbe42a024210aaf659ae7aea6ed523d85e5551aa93a3a0ec192df453693106d7f2c0f67ba4c84e38f4546ae374c77fa717581fbfe676da02f94f879
 MISC metadata.xml 547 BLAKE2B d60e6b3e6c7d0c37dcc42dcffeed9e08fb7ad3dec5e4f5fdc0ffd1f7a2c46d89ef57a9576028457ee433d0ecbd100ae200ef507b22bb326838732751a7c644fc SHA512 4629dfe7e4cf27d5d52e7ce3e646f590b4d80a490c638cb035352416a587b494328d3f23e088d13ae1677c415080a7249301d9830be0cfbce7a44023302bf582
diff --git a/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch b/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch
deleted file mode 100644
index fbf8814ea63e..000000000000
--- a/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 7bf62b4e8848ce0990cb8d09b8b630dc4140f41b Mon Sep 17 00:00:00 2001
-From: Thomas Grainger <tagrain@gmail.com>
-Date: Tue, 30 Jul 2024 11:52:27 +0100
-Subject: [PATCH] generate certs with trustme 586f775
-
-diff --git a/pytest_httpbin/certs.py b/pytest_httpbin/certs.py
-index 75444d5..230f41b 100644
---- a/pytest_httpbin/certs.py
-+++ b/pytest_httpbin/certs.py
-@@ -15,7 +15,7 @@
- def where():
-     """Return the preferred certificate bundle."""
-     # vendored bundle inside Requests
--    return os.path.join(os.path.dirname(__file__), "certs", "cacert.pem")
-+    return os.path.join(os.path.dirname(__file__), "certs", "client.pem")
- 
- 
- if __name__ == "__main__":
-diff --git a/pytest_httpbin/certs/client.pem b/pytest_httpbin/certs/client.pem
-new file mode 100644
-index 0000000..7946137
---- /dev/null
-+++ b/pytest_httpbin/certs/client.pem
-@@ -0,0 +1,12 @@
-+-----BEGIN CERTIFICATE-----
-+MIIB0TCCAXegAwIBAgIUScnyyX1CI+ywC6GdKol8IIwuGnkwCgYIKoZIzj0EAwIw
-+RDEbMBkGA1UECgwSdHJ1c3RtZSB2MS4xLjArZGV2MSUwIwYDVQQLDBxUZXN0aW5n
-+IENBICNBdXNVcWJaNG81d3pjb0tCMCAXDTAwMDEwMTAwMDAwMFoYDzMwMDAwMTAx
-+MDAwMDAwWjBEMRswGQYDVQQKDBJ0cnVzdG1lIHYxLjEuMCtkZXYxJTAjBgNVBAsM
-+HFRlc3RpbmcgQ0EgI0F1c1VxYlo0bzV3emNvS0IwWTATBgcqhkjOPQIBBggqhkjO
-+PQMBBwNCAARhrRi78wmZY28t3/y8MTDDCsi7Lzir4WaQm96gf4/9kSolBTFVDUvB
-+MkSC7Yged+2bWEzTRERZQLf88uiorUnAo0UwQzAdBgNVHQ4EFgQUHymIBJV4gCrA
-+qv+6Q9pSJFtd7PYwEgYDVR0TAQH/BAgwBgEB/wIBCTAOBgNVHQ8BAf8EBAMCAYYw
-+CgYIKoZIzj0EAwIDSAAwRQIgLf0sybmdbJoTIgZWrU1k11oecQbdkzh+3jFtNEFn
-+zYUCIQCRXjIBDZXtyaywk3DgIggByCQxrrB5vjlnyYTd9vNUSw==
-+-----END CERTIFICATE-----
-diff --git a/pytest_httpbin/certs/server.key b/pytest_httpbin/certs/server.key
-new file mode 100644
-index 0000000..fd9fd82
---- /dev/null
-+++ b/pytest_httpbin/certs/server.key
-@@ -0,0 +1,5 @@
-+-----BEGIN EC PRIVATE KEY-----
-+MHcCAQEEIPNMu1H1DN9x0VLZNzO3BFp5boEGyc80XFaR1ML18uFRoAoGCCqGSM49
-+AwEHoUQDQgAEiNIfYxmsmjemcRRpcd4qP+x1yONFBZZli7CEKxg9j3x5j1OJPeyC
-+BQ83kogrxJYLbRjdHUx4VOCEXjffmYhnMA==
-+-----END EC PRIVATE KEY-----
-diff --git a/pytest_httpbin/certs/server.pem b/pytest_httpbin/certs/server.pem
-new file mode 100644
-index 0000000..7c70f64
---- /dev/null
-+++ b/pytest_httpbin/certs/server.pem
-@@ -0,0 +1,15 @@
-+-----BEGIN CERTIFICATE-----
-+MIICTDCCAfOgAwIBAgIUZ9rBQX/YRZFcqXCIzOSAd1D0IUcwCgYIKoZIzj0EAwIw
-+RDEbMBkGA1UECgwSdHJ1c3RtZSB2MS4xLjArZGV2MSUwIwYDVQQLDBxUZXN0aW5n
-+IENBICNBdXNVcWJaNG81d3pjb0tCMCAXDTAwMDEwMTAwMDAwMFoYDzMwMDAwMTAx
-+MDAwMDAwWjBGMRswGQYDVQQKDBJ0cnVzdG1lIHYxLjEuMCtkZXYxJzAlBgNVBAsM
-+HlRlc3RpbmcgY2VydCAjLVdQNWpjLTllQ0U0S0JxMjBZMBMGByqGSM49AgEGCCqG
-+SM49AwEHA0IABIjSH2MZrJo3pnEUaXHeKj/sdcjjRQWWZYuwhCsYPY98eY9TiT3s
-+ggUPN5KIK8SWC20Y3R1MeFTghF4335mIZzCjgb4wgbswHQYDVR0OBBYEFCO99Ega
-+h7pEyFEJVwe09DZzNHDtMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUHymIBJV4
-+gCrAqv+6Q9pSJFtd7PYwLwYDVR0RAQH/BCUwI4IJbG9jYWxob3N0hwR/AAABhxAA
-+AAAAAAAAAAAAAAAAAAABMA4GA1UdDwEB/wQEAwIFoDAqBgNVHSUBAf8EIDAeBggr
-+BgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMDMAoGCCqGSM49BAMCA0cAMEQCIHB0
-+imdD2aQuq4DipTvnFJjmT+w8i3D/Pz8X6bPdkJW/AiATl+m4TW4BE5v1ID3ftDhz
-+ja8s574nAjDAqcSL7otVpQ==
-+-----END CERTIFICATE-----
-diff --git a/pytest_httpbin/serve.py b/pytest_httpbin/serve.py
-index c15c227..8310140 100644
---- a/pytest_httpbin/serve.py
-+++ b/pytest_httpbin/serve.py
-@@ -60,8 +60,8 @@ def finish_request(self, request, client_address):
-         try:
-             context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-             context.load_cert_chain(
--                os.path.join(CERT_DIR, "cert.pem"),
--                os.path.join(CERT_DIR, "key.pem"),
-+                os.path.join(CERT_DIR, "server.pem"),
-+                os.path.join(CERT_DIR, "server.key"),
-             )
-             with context.wrap_socket(
-                 request, server_side=True, suppress_ragged_eofs=False
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild
deleted file mode 100644
index 638ad7ac691a..000000000000
--- a/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
-HOMEPAGE="
-	https://github.com/kevin1024/pytest-httpbin/
-	https://pypi.org/project/pytest-httpbin/
-"
-SRC_URI="
-	https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/httpbin[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	tests/test_server.py::test_redirect_location_is_https_for_secure_server
-	# minor exception message mismatch on pypy3
-	# https://github.com/kevin1024/pytest-httpbin/issues/77
-	tests/test_server.py::test_dont_crash_on_handshake_timeout
-)
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/kevin1024/vcrpy/issues/848
-	# https://github.com/kevin1024/pytest-httpbin/pull/90
-	"${FILESDIR}/${P}-certs.patch"
-)
-
-src_prepare() {
-	# remove old certs
-	rm -r pytest_httpbin/certs || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.ebuild
index 302d6d0a6faf..3fd5fe093592 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]