gentoo resync : 25.09.2021

8 files changed, 2 insertions, 278 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 23ac425dc4a2..6fbdf776479c 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 8527eb1a4dd3..048e2a7d3e9d 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,4 +1,3 @@
-AUX haproxy-2.3.0-hpack-VAR_ARRAY.patch 1230 BLAKE2B 282f82e498126771c3837f2da3cdb433db703ac9f6035d86de50a31d7f45f5d02c5704a30a4888b3b02e78d953acb31f29fedacc4c07b9521217dbfaeb2fd61d SHA512 a6ea15ac6b07c46695b9dc1aafadd7e3a74d413fbb31cf827fda202669a48c0108a20d303cd5a3e9c25bf7d75d588d011ba874eee3f90b5ba65498c861eca1b1
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
 DIST haproxy-2.0.24.tar.gz 2707476 BLAKE2B 98539bf4affd7efd8703d29f0ef03182f2b58b0aed39984c2c47959996caeb3e3ee2863d46588d991fe4aabf073810712db0e4b78668d41a92e634b9cc31080f SHA512 8136639beb37f6ac19653e9553de24bb5e3f258cf9276d6d8caebe74d500e1f6e50e23f5f47d32a1a157bf906e04fff9b1aa062ecb15d361b5dd2aa0da6e63bd
diff --git a/net-proxy/haproxy/files/haproxy-2.3.0-hpack-VAR_ARRAY.patch b/net-proxy/haproxy/files/haproxy-2.3.0-hpack-VAR_ARRAY.patch
deleted file mode 100644
index 4f6bf4cf7174..000000000000
--- a/net-proxy/haproxy/files/haproxy-2.3.0-hpack-VAR_ARRAY.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 759146f0de143939b841ba987aabb83aa178a4fc Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@qasl.de>
-Date: Mon, 9 Nov 2020 09:15:21 +0100
-Subject: [PATCH] hpack-tbl-t.h uses VAR_ARRAY and requires compiler.h to be
- included
-
-This fixes building hpack from contrib, which failed because of the
-undeclared VAR_ARRAY:
-
-make -C contrib/hpack
-...
-cc -O2 -Wall -g -I../../include -fwrapv -fno-strict-aliasing   -c -o gen-enc.o gen-enc.c
-In file included from gen-enc.c:18:
-../../include/haproxy/hpack-tbl-t.h:105:23: error: 'VAR_ARRAY' undeclared here (not in a function)
-  105 |  struct hpack_dte dte[VAR_ARRAY]; /* dynamic table entries */
-...
-
-Signed-off-by: Christian Ruppert <idl0r@qasl.de>
----
- include/haproxy/hpack-tbl-t.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/haproxy/hpack-tbl-t.h b/include/haproxy/hpack-tbl-t.h
-index 344f665dd..07f1ca9ea 100644
---- a/include/haproxy/hpack-tbl-t.h
-+++ b/include/haproxy/hpack-tbl-t.h
-@@ -28,6 +28,7 @@
- #define _HAPROXY_HPACK_TBL_T_H
- 
- #include <inttypes.h>
-+#include "compiler.h"
- 
- /* Dynamic Headers Table, usable for tables up to 4GB long and values of 64kB-1.
-  * The model can be improved by using offsets relative to the table entry's end
--- 
-2.26.2
-
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 9db5d85f197d..bf1991c229ee 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,9 +1,3 @@
-DIST mitmproxy-6.0.2.tar.gz 27274682 BLAKE2B 146fc4cd376e4ff02d13bf168b26868c5a33b47b30e678fb6d97df36c4b8ec9e8b9ca6e864e56c3943b231a2f2745c1abd7c58814ddf712113c2a20704a6964f SHA512 27eb5e9736891148b5ebec963a2d18de6a69b44428538d2ed1cf9a1dcdd7cbcdeeed662edb2d25521098374e2f9a29b5bb8fba8da4f77ac0d32bf7881ac70d61
-DIST mitmproxy-7.0.0.tar.gz 27308204 BLAKE2B bea89db0dd39a8b3bd516d2e7c2868d4c226afdc78974ce0f88c055fcb4f907e398922c725cd93d344450e3e7e107c23c63ef6a60d19bff48400f6eeb4d0af0a SHA512 3836a33e5d2be09fb89987d2b0b898183dab9f17b990b98ab754d07cc5d7275786cfac0ab946e65a099ece054c7bbd65d62d01e4e4281e5f9b5f3dcdd0ac80b4
-DIST mitmproxy-7.0.2.tar.gz 27310814 BLAKE2B 294aad79f45b997d58c7c4cc869ccfedebe0e4fe72887679f942bf2eba37e2bcf5fff1922023bfd74b5ff46f7e62906a2ffaf99c4c59000f6d9d67fbcb68afdc SHA512 1335c868c93adc414fa84678b0ca7989aa7cf33906e220cf62cb5c57d17b57fe0e04143179a8d8033a312521f24654de040732416c5bed77f66591a2fe708c02
 DIST mitmproxy-7.0.3.tar.gz 27311502 BLAKE2B a55f8a43cc052e342a0630fdd80fc713be7ce3db7b3899ccce79cfcd385345b7ebe8480c618c626d63e851d92f528a350d614ac3c7dfb85b01a555389d914ff7 SHA512 cffbb60421724fa28aab69b3bf1100e0aa5ab6e8933186f5706eb4eee35ef0f716616001156dac07921c73024e6ad8b98499a273575c592bb7694c0dffb728da
-EBUILD mitmproxy-6.0.2.ebuild 3046 BLAKE2B e943a273e580e36956e75e794b9848f6206d6a4b111f3e8c398e1ae2e8af23a6e358519ff18219f649f2834ec6dbd843f85a4031253fdf8348063d099a038102 SHA512 a2770f8d6222a509c2d3e0e6b30fe49db2105ef9b35beba460fa9ce309a7f657b8606f7c23a4dcbae08e3d0bc20da15802077a25959bc0c76d5fc54b4a087d66
-EBUILD mitmproxy-7.0.0.ebuild 2206 BLAKE2B 7030cbd14ccc16403ff39adc2e8bd32d3e77ce3ba6ee909ccf2b756940838e38526323f29acdd805b270f13946470808075069ed71ef1a19da5b7f2ba6f9d8de SHA512 db05e1cac0b3c3cf93d39fbe3c3d69d9a4edb1d953ef3de3b45caedea22500fcd96d7a90b93cf68fde80bd69bbcd3e54bbfb314e14bbe76e318e27fdedb86922
-EBUILD mitmproxy-7.0.2.ebuild 2173 BLAKE2B 7692b4a6d995ebee669a2914a6d2465e9657c4b3e4de19950a71cd731a684653344dac92a2dfd2e6c381fde010603efe4aacba17939857acb9050074b095c0cd SHA512 a7e80fc27486d00719f1dbfc4db1743817fb91eca89bae18db9bf5a7f6bc54b75484692dac63d797a5e612c7d8a14fbaeffa878d4bfa881732df16b03a42b504
-EBUILD mitmproxy-7.0.3.ebuild 2174 BLAKE2B d6b95618e2566f86f63dba96e07a047944e19ce05e19974868b05de88a565dce2c96758a647e2733cf10704d1b18f881376e9b6f90de1151332a671819354464 SHA512 82f04079c6b66bd242a8b7a6fa4e9031616ec7f126d3de4ffe5037818a8c46c0d92dc27e53960518244b5eadc3637d1a0cf09fbfa22e3d972095f6ea29303732
+EBUILD mitmproxy-7.0.3.ebuild 2173 BLAKE2B 7692b4a6d995ebee669a2914a6d2465e9657c4b3e4de19950a71cd731a684653344dac92a2dfd2e6c381fde010603efe4aacba17939857acb9050074b095c0cd SHA512 a7e80fc27486d00719f1dbfc4db1743817fb91eca89bae18db9bf5a7f6bc54b75484692dac63d797a5e612c7d8a14fbaeffa878d4bfa881732df16b03a42b504
 MISC metadata.xml 1066 BLAKE2B 3422f5161cf706d9361875fd86d165425717f5756a530290e1b739703dc3b2088701838378d91463a8038925c5e8e95c0f69a3d5104441988c3ad7cfd8364b82 SHA512 740d3f498579906f42fcaa2a711fab7a4f04488ef1864850410de610d691509296691144e6a74a8c13b9ba9df4bb7dad08a3836aff016aac2a05a9efd4525c87
diff --git a/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild b/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
deleted file mode 100644
index 03adf19a0507..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="https://mitmproxy.org/"
-SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.2.10[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ldap3-2.8[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.3.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/hypothesis-4.50.8[${PYTHON_USEDEP}]
-		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-		>=dev-python/zstandard-0.8.1[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT="!test? ( test )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# loosen dependencies
-	sed -i \
-		-e '/>/s/>.*/",/g' \
-		-e '/python_requires/d' \
-		setup.py || die
-
-	# remove failing test
-	sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die
-
-	# https://github.com/mitmproxy/mitmproxy/issues/4136
-	# https://bugs.gentoo.org/740336
-	rm test/mitmproxy/addons/test_termlog.py || die
-
-	# requires asynctest
-	rm test/mitmproxy/addons/test_readfile.py || die
-
-	# Passes with OpenSSL 1.1.1g, fails with OpenSSL 1.1.1h
-	# https://github.com/gentoo/gentoo/pull/17411#discussion_r497270699
-	sed \
-		-e 's/test_mode_none_should_pass_without_sni/_&/g' \
-		-e 's/test_mode_strict_w_pemfile_should_pass/_&/g' \
-		-e 's/test_mode_strict_w_confdir_should_pass/_&/g' \
-		-i test/mitmproxy/net/test_tcp.py || die
-	sed \
-		-e 's/test_verification_w_confdir/_&/g' \
-		-e 's/test_verification_w_pemfile/_&/g' \
-		-i test/mitmproxy/proxy/test_server.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-7.0.0.ebuild b/net-proxy/mitmproxy/mitmproxy-7.0.0.ebuild
deleted file mode 100644
index 07d70bd2058f..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-7.0.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="https://mitmproxy.org/"
-SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.2.10[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ldap3-2.8[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.3.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-5.8[${PYTHON_USEDEP}]
-		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# loosen dependencies
-	sed -i \
-		-e '/>/s/>.*/",/g' \
-		-e '/python_requires/d' \
-		setup.py || die
-
-	# remove failing test
-	sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-7.0.2.ebuild b/net-proxy/mitmproxy/mitmproxy-7.0.2.ebuild
deleted file mode 100644
index 4007f6d62a82..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-7.0.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="https://mitmproxy.org/"
-SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.2.10[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ldap3-2.8[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.3.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-5.8[${PYTHON_USEDEP}]
-		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# loosen dependencies
-	sed -i \
-		-e '/>/s/>.*/",/g' \
-		-e '/python_requires/d' \
-		setup.py || die
-
-	# remove failing test
-	sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-7.0.3.ebuild b/net-proxy/mitmproxy/mitmproxy-7.0.3.ebuild
index 1fd919e90229..4007f6d62a82 100644
--- a/net-proxy/mitmproxy/mitmproxy-7.0.3.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-7.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]