gentoo resync : 14.12.2020

4 files changed, 93 insertions, 14 deletions

diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 340a0eb58f80..58206ff0bb45 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,5 +1,7 @@
+AUX httpbin-0.7.0-brotlicffi.patch 1378 BLAKE2B b8a4ed9df72c8e031e8ee6fe02d1c8372a6114948de59ec0890e288cb2d52e5d08c4358648fdca4ee8319eebee05c4fe4dc2ed9aef36432f40bc82488b7fa7c9 SHA512 dd3538ed6373df0bf1bf648e2253fdc79737aa2abbe8780da0ad088d0438e266a4fa6e873e18a6b50fe56f9dde109f2a2755975740d990084f7b9ea1e4b2a95a
 AUX httpbin-0.7.0-optional-raven.patch 841 BLAKE2B bdf8cd94706b08d6706349ad471212fbda7f78e7125378073e4db43af352b26778706b2c61ca51f6c1c44aae4fd250432793e0ffef463102324ed39069da20bd SHA512 757bbe80463b332571e9d6e2e3266d2db3df519a180a7d3840b6f4813c2373382519e322547feb522c59ec3893d4721e42463d8231b4f5904725b9547af407bd
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
 EBUILD httpbin-0.7.0-r1.ebuild 1082 BLAKE2B 63b7219c6e200fa6e846f38d337c54838f3cb1438f89d2976332bdce5172d25b348a9b8df3391df8ff74d19696623745de99e8d73978e64e0f612f68e9c34fe5 SHA512 dc27b9cdcd2a7004e5a84b401540b2a4fdd4bf91e4bfa4dfe7a5dd5ec7d5a2841c6a3ce195d4b1117c558acb1d7c3a898a8373101bf3e058e11d1698d173aff8
-MISC metadata.xml 525 BLAKE2B aece3687c440aa7ad57ca9190e68fc3ee5deffdd79c1c20cb04333c64846273590e3ef3f0c2c5adf8db014b2f15281353cae4b8b9dcfbacca895714cef911441 SHA512 d3d076dd201fe1c920d4b753999bb20bce792e266a5b9d035128a8718be819642acb6141640857b6d740222a839d5a995b0f3346f48c78f0276a5cdfef702bd7
+EBUILD httpbin-0.7.0-r2.ebuild 1173 BLAKE2B 4a65a918f80cce1029828b51c18a4380f0bd0bd78dfde3352d8fa579d84c1169b7e7af63e0ccefb085e3966d7cbc30f91dfdabc33a8563737ad16c548fa5b3e2 SHA512 4bcaa2408f16887fc1d5d09f09d3382a1d2776cbd5d0375958709327db962fb9742f1616e39f5b8c8732e11ca04b8d7bbc4988a1e4ed7a6690616c3f917992c7
+MISC metadata.xml 393 BLAKE2B cf8a612371dbefdf4f9718ea0add3cd52071cc8956852af0c629260e1482840fcf386553d18ca6fdfcafba9c08c0c7a195ec9a07cd1e467079edbbe4c3052493 SHA512 9509a57c48252340258d8a5e3bc655ca7b4e9f0983bfc7b46f2be6f6c03ae87fd611d6ca03cad7ee61815f5d856934207815ad4e6dde9fe4be2a8ffc0f260ee4
diff --git a/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch b/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch
new file mode 100644
index 000000000000..f74474a70aa1
--- /dev/null
+++ b/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch
@@ -0,0 +1,43 @@
+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',
+         'raven[flask]', 'werkzeug>=0.14.1'
+     ],
+ )
+-- 
+2.29.2
+
diff --git a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..3a72b9fa95b0
--- /dev/null
+++ b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP Request and Response Service"
+HOMEPAGE="https://github.com/postmanlabs/httpbin
+	https://pypi.org/project/httpbin/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+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-0.14.1[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	# do not import raven if it's not going to be used
+	# (upstream removed it completely in git anyway)
+	"${FILESDIR}"/httpbin-0.7.0-optional-raven.patch
+	# fix tests with new versions of werkzeug
+	"${FILESDIR}"/httpbin-0.7.0-test-werkzeug.patch
+	# use brotlicffi instead of brotlipy
+	"${FILESDIR}"/httpbin-0.7.0-brotlicffi.patch
+)
+
+distutils_enable_tests unittest
diff --git a/dev-python/httpbin/metadata.xml b/dev-python/httpbin/metadata.xml
index 0c31c1889018..0ca90e9907ed 100644
--- a/dev-python/httpbin/metadata.xml
+++ b/dev-python/httpbin/metadata.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">httpbin</remote-id>
-    <maintainer status="unknown">
-      <email>httpbin@runscope.com</email>
-      <name>Runscope</name>
-    </maintainer>
-    <remote-id type="github">Runscope/httpbin</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">httpbin</remote-id>
+		<remote-id type="github">postmanlabs/httpbin</remote-id>
+	</upstream>
 </pkgmetadata>