gentoo auto-resync : 02:10:2023 - 17:46:37

7 files changed, 2 insertions, 193 deletions

diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 41420986599f..f3c7fc6e8b91 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,9 +1,3 @@
-AUX httpbin-0.7.0-brotlicffi.patch 1362 BLAKE2B 524973fe131181c6601ea7b973c25e55a3b195988ca56ba46debb80f44f6111c1bfe734abe659bee11caef36c322366d2c78b3a5798da54ce8bcc3ffaf20f313 SHA512 d0eda00e90904b090a43fb3504d0bbb4284837ecce1865ab87151e5661f0daa84dff81bfeb816181ee0e9f963114ff0fc46cec59b9b5de86ba322671abee4e56
-AUX httpbin-0.7.0-optional-raven.patch 1218 BLAKE2B 010a13db882711af3cd74175b87371d0c9c6e279168653836ce4a445357f4ca3fbd77fc262a57de5cbfccbc4da514e1e89253595b4fdab03553ed9adffddbc57 SHA512 2feb379c4b888560f825f5fce0130999705bfe83cff190da1651ffb9842243036ecb28d1f54cc92d7a855f73b45f0cf5164df75732f4ac2c9035b583941a9560
-AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
-AUX httpbin-0.7.0-werkzeug-2.1.patch 1158 BLAKE2B 7343f4dbe9886fd54fc8187bc48ed8bd016c03057c4e5de81a46c2389b8d9fdd381f687855dc8ded1d8133a47fb8f09f4ec6c8eae739ca1c157945af97a633c5 SHA512 3d9ed7ab76dc0a33d69cf973e16be7358daa0af0a48d5ac24e0ad6ea8d73a68a796b4c8526ad764c0ed09997448f744f205b909261c32405ff166b359be1fb8b
 DIST httpbin-0.10.1.tar.gz 107058 BLAKE2B a46732946fc3454e2ae71c4eec4f88521e190b736445c54f555021a273a75f57acbc9234237e6973a21fc3bf8f71d8c8b51d6422d719f03546ecd6887a20fe1b SHA512 e3b851253c347893a80e866e7d0188c572f2a87a540125de3d9cbe0b8c3f1ddfab2c60ee3ffde3fd7274fc662294c978c39b1b52acfd92c52fd552966da203be
-DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
-EBUILD httpbin-0.10.1-r1.ebuild 855 BLAKE2B 4b8363e6cee1761e0ed5d7cae6fde2b04b10fa458a160fc2d8487a50950378f7473083ad4e51094e502b3c6ac445be842b518ce0bd71c455662740e14869cb68 SHA512 1fbfd7a6f58cce71d119256e1ecf737dc56f029d2e68765b2f475d10fb25a1ff1f2b4f59fd29f871d4d64da863feddb439a221c787a971fe098e24378399ab39
-EBUILD httpbin-0.7.0-r6.ebuild 1651 BLAKE2B f3cb3c948f2d194179a553e9c9f8a10707e55f59e97c196fb50a840c6e7ac70af1c54d0dd2485e9fd65c38e128b433c9213542e1039167cc4bf20da4bb7d4205 SHA512 056f6766ba972195cef3498219e8505f850b78ced28dcc42c9d3cc31f2bf6c667836f90a0c8fdd125d5819a78e5710df2534d2493e04cb4cc4d15707599d3521
+EBUILD httpbin-0.10.1-r1.ebuild 861 BLAKE2B adec7c3d79f6fb85e162936867779ffebc86b252dcf10751d606503b46f156b694c54a01092a23a287dfbaba8d071c4bbc46238f358cb1e3661d7429034bcedd SHA512 5b845ad808dc20d0f1070efc409c25fc86ef465a8b55f86b875fd80bf014adcbf2918548afe56c89905a278b65a0b5ce5a828bc8aa6307a5f4d9f21bd096143c
 MISC metadata.xml 445 BLAKE2B c577334830bc0d51f9df221e224c231c254b3db9129e4028d53cbd96a4481728e3b721b44f569c243deeecfb38e8dc81a7566a0b7ccd665d51b1a69a3687eb18 SHA512 fcdbd0c24e12d91df89af24befa6c9600f28083c3fe38e88ebec9856f4fb5c4c137c3b85f2271422c513bbd7c31a457f8290ebc2dd755d9117d57aa42883eec8
diff --git a/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch b/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch
deleted file mode 100644
index 8031ad72de5b..000000000000
--- a/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 69d1e62e69b7f886ebbb41b8e9aae62e76adf375 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 2 Dec 2020 10:42:52 +0100
-Subject: [PATCH] Replace brotlipy with brotlicffi
-
-The brotlipy package has been renamed to brotlicffi.  Update the imports
-and dependencies accordingly.  The major advanage of the new package
-is that it no longer collides with the Python bindings provided
-by brotli itself.
----
- httpbin/filters.py | 2 +-
- setup.py           | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/httpbin/filters.py b/httpbin/filters.py
-index c6268b6..4deeaaa 100644
---- a/httpbin/filters.py
-+++ b/httpbin/filters.py
-@@ -10,7 +10,7 @@ This module provides response filter decorators.
- import gzip as gzip2
- import zlib
- 
--import brotli as _brotli
-+import brotlicffi as _brotli
- 
- from six import BytesIO
- from decimal import Decimal
-diff --git a/setup.py b/setup.py
-index 7f9956b..8e17ef3 100644
---- a/setup.py
-+++ b/setup.py
-@@ -34,7 +34,7 @@ setup(
-     packages=find_packages(),
-     include_package_data = True, # include files listed in MANIFEST.in
-     install_requires=[
--        'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlipy',
-+        'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlicffi',
-         'werkzeug>=0.14.1'
-     ],
- )
--- 
-2.29.2
-
diff --git a/dev-python/httpbin/files/httpbin-0.7.0-optional-raven.patch b/dev-python/httpbin/files/httpbin-0.7.0-optional-raven.patch
deleted file mode 100644
index 5d626768bd27..000000000000
--- a/dev-python/httpbin/files/httpbin-0.7.0-optional-raven.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -dupr a/httpbin/core.py b/httpbin/core.py
---- a/httpbin/core.py	2018-05-08 13:41:03.000000000 +0200
-+++ b/httpbin/core.py	2019-11-22 15:07:27.516500217 +0100
-@@ -21,7 +21,6 @@ from werkzeug.datastructures import WWWA
- from werkzeug.http import http_date
- from werkzeug.wrappers import BaseResponse
- from werkzeug.http import parse_authorization_header
--from raven.contrib.flask import Sentry
- 
- from . import filters
- from .helpers import get_headers, status_code, get_dict, get_request_range, check_basic_auth, check_digest_auth, \
-@@ -58,6 +57,7 @@ app.debug = bool(os.environ.get('DEBUG')
- 
- # Send app errors to Sentry.
- if 'SENTRY_DSN' in os.environ:
-+    from raven.contrib.flask import Sentry
-     sentry = Sentry(app, dsn=os.environ['SENTRY_DSN'])
- 
- # Set up Bugsnag exception tracking, if desired. To use Bugsnag, install the
-diff --git a/setup.py b/setup.py
-index 7f9956b..3cab2ae 100644
---- a/setup.py
-+++ b/setup.py
-@@ -35,6 +35,6 @@ setup(
-     include_package_data = True, # include files listed in MANIFEST.in
-     install_requires=[
-         'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlipy',
--        'raven[flask]', 'werkzeug>=0.14.1'
-+        'werkzeug>=0.14.1'
-     ],
- )
diff --git a/dev-python/httpbin/files/httpbin-0.7.0-test-werkzeug.patch b/dev-python/httpbin/files/httpbin-0.7.0-test-werkzeug.patch
deleted file mode 100644
index 956a2f5235ca..000000000000
--- a/dev-python/httpbin/files/httpbin-0.7.0-test-werkzeug.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -dupr a/test_httpbin.py b/test_httpbin.py
---- a/test_httpbin.py	2019-11-22 15:06:56.199774070 +0100
-+++ b/test_httpbin.py	2019-11-22 15:18:58.010069445 +0100
-@@ -144,7 +144,6 @@ class HttpbinTestCase(unittest.TestCase)
-         data = json.loads(response.data.decode('utf-8'))
-         self.assertEqual(data['args'], {})
-         self.assertEqual(data['headers']['Host'], 'localhost')
--        self.assertEqual(data['headers']['Content-Length'], '0')
-         self.assertEqual(data['headers']['User-Agent'], 'test')
-         # self.assertEqual(data['origin'], None)
-         self.assertEqual(data['url'], 'http://localhost/get')
-@@ -158,7 +157,6 @@ class HttpbinTestCase(unittest.TestCase)
-         data = json.loads(response.data.decode('utf-8'))
-         self.assertEqual(data['args'], {})
-         self.assertEqual(data['headers']['Host'], 'localhost')
--        self.assertEqual(data['headers']['Content-Length'], '0')
-         self.assertEqual(data['url'], 'http://localhost/anything/foo/bar')
-         self.assertEqual(data['method'], 'GET')
-         self.assertTrue(response.data.endswith(b'\n'))
diff --git a/dev-python/httpbin/files/httpbin-0.7.0-werkzeug-2.1.patch b/dev-python/httpbin/files/httpbin-0.7.0-werkzeug-2.1.patch
deleted file mode 100644
index cf7871268d99..000000000000
--- a/dev-python/httpbin/files/httpbin-0.7.0-werkzeug-2.1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5cc81ce87a3c447a127e4a1a707faf9f3b1c9b6b Mon Sep 17 00:00:00 2001
-From: Maximino BOGADO <bogamax2@hotmail.fr>
-Date: Wed, 30 Mar 2022 16:26:31 +0200
-Subject: [PATCH] Replace BaseResponse to Response class (new werkzeug version
- 2.1.0)
-
----
- httpbin/core.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/httpbin/core.py b/httpbin/core.py
-index 305c9882..2bad408e 100644
---- a/httpbin/core.py
-+++ b/httpbin/core.py
-@@ -29,7 +29,7 @@
- from six.moves import range as xrange
- from werkzeug.datastructures import WWWAuthenticate, MultiDict
- from werkzeug.http import http_date
--from werkzeug.wrappers import BaseResponse
-+from werkzeug.wrappers import Response
- from werkzeug.http import parse_authorization_header
- from flasgger import Swagger, NO_SANITIZER
- 
-@@ -77,7 +77,7 @@ def jsonify(*args, **kwargs):
- 
- 
- # Prevent WSGI from correcting the casing of the Location header
--BaseResponse.autocorrect_location_header = False
-+Response.autocorrect_location_header = False
- 
- # Find the correct template folder when running from a different location
- tmpl_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templates")
diff --git a/dev-python/httpbin/httpbin-0.10.1-r1.ebuild b/dev-python/httpbin/httpbin-0.10.1-r1.ebuild
index 5c1775fc8286..452043b95db7 100644
--- a/dev-python/httpbin/httpbin-0.10.1-r1.ebuild
+++ b/dev-python/httpbin/httpbin-0.10.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( MIT ISC )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/brotlicffi[${PYTHON_USEDEP}]
diff --git a/dev-python/httpbin/httpbin-0.7.0-r6.ebuild b/dev-python/httpbin/httpbin-0.7.0-r6.ebuild
deleted file mode 100644
index b905561d50cc..000000000000
--- a/dev-python/httpbin/httpbin-0.7.0-r6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP Request and Response Service"
-HOMEPAGE="
-	https://github.com/postmanlabs/httpbin/
-	https://pypi.org/project/httpbin/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/brotlicffi[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/werkzeug-3[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# do not import raven if it's not going to be used
-	# (upstream removed it completely in git anyway)
-	"${FILESDIR}"/${P}-optional-raven.patch
-	# fix tests with new versions of werkzeug
-	"${FILESDIR}"/${P}-test-werkzeug.patch
-	# use brotlicffi instead of brotlipy
-	"${FILESDIR}"/${P}-brotlicffi.patch
-	# fix compat with werkzeug 2.1
-	# https://github.com/postmanlabs/httpbin/pull/674
-	"${FILESDIR}"/${P}-werkzeug-2.1.patch
-)
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# a new version of flask or whatever converts relative redirects
-	# to absolute; this package is dead anyway, so just skip
-	# the relevant tests
-	sed -e 's:test_redirect:_&:' \
-		-e 's:test_relative:_&:' \
-		-i test_httpbin.py || die
-	# broken
-	sed -e 's:test_digest_auth:_&:' \
-		-e 's:test_base64:_&:' \
-		-i test_httpbin.py || die
-
-	distutils-r1_src_prepare
-}