gentoo resync : 29.01.2021

10 files changed, 12 insertions, 297 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index afbbd6cee5ff..d2edc17ba453 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index f2c593ee4715..21c14851241d 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,9 +1,3 @@
-DIST mitmproxy-5.1.1.tar.gz 27223155 BLAKE2B 38369eb07c41bde9f8e8c246ab5cc4fc6edfcd222f353624f4d2ae193f176228471aafdadd1b65238ccd808d778a69e1d140035be9116b87a75c286493747fe8 SHA512 ac5cd82d4d89590b57625661c493aca6a702605c612ea1acd9e0d0806067d47f60085ee68260bba2a10dc343410ae6a76ea1575287a0e312e4467a4e8485c6e1
-DIST mitmproxy-5.2.tar.gz 27251381 BLAKE2B d6bc5de8a3840a880664f52e011736cb640d324c6aa3846d4f2b3c2fc0d49467ab8ad3e8268a591cbe19d9f6dda5acc37fa2de705b4de1c1920b5003e10ea457 SHA512 6073c73b24618d6f64c4e99f199ebb6bc4157a3f83bfa7aff10a113f8dde823715e95bdf4202a1526dc0856d120858d32842b814327c3b98452b629fccb1790d
-DIST mitmproxy-5.3.0.tar.gz 27272534 BLAKE2B 2a35824616ca0a63a9e432a110adf14423df229568636456aa9d3959fc306b9ba30d8069c78cbc7c5950ef3e44526882b028c6ed05af417ef667b07215c258c6 SHA512 3f52f5285869de49c7c04ef9b6c0f3ef66689eb45fb6f9e971111049bf1aa0777e3e84b51f7031c1bdf105ce3f17fa4b03036d72617985b92996c6eea7566c38
-DIST mitmproxy-6.0.1.tar.gz 27272092 BLAKE2B ecc01d0d498eb802baabe8e361c04c0826a7c31f4d5369ee34e655ee7741beb89098a03bbd5d840f21b400a7f9679c9fabb0cbee62a02a5d52949ed196d07bd9 SHA512 848ced92f16863da1c41cbb33fe9fec76b837336e2f252860de80039463b1b7527caa7928124885105c25b922a1cd26c4414f75dd4f1ae950624271d7df47023
-EBUILD mitmproxy-5.1.1.ebuild 2884 BLAKE2B a066a3006656839fb2e04efe8b17ae2db0b0db899958f359e5718341c3988d9870911c817eedd91680ee250ee2d2bd32c3b0706897c58ac8db73339a6d5ca5b7 SHA512 045fb1f56dcaf446d6d5396db7ee78c0dd9f10e15688b29a29fffde0efa1e1a2c5ee37795c2def434536da60cd8c0ae55142847cc2b7013e0a4a4406e46f046f
-EBUILD mitmproxy-5.2-r1.ebuild 3029 BLAKE2B 2d7de2fddfd8b9d939b33a66352fe830466135d32fe097588ede71d345fad0abd4881b3ddc89ad05a2e1e713f926fb7e133b94f0f5bfd7b6f82eec6a1f4fa140 SHA512 e803ead1473693b6a580db34eb958bf28b93866f37da5778e9586623eeb5e231957e53de2edc063e0d17807da28930085511b04bc1a51c4eabe7d80fdec54202
-EBUILD mitmproxy-5.3.0.ebuild 3164 BLAKE2B e5db2d54f2e1a065b7cab0b5f2a3823dc2ff455108aae1171b65d86b9896a21953dd5a5a9724e020cd26c04c58c72394d2c34b5f929c46e601a625f6715edbbd SHA512 fc0eae0b3b09742dd31a41045abdb9300f0bb5270bb08b498480549a62b2456eb31b470af3a9cce7693b674ffb68f2543035a8fc86d8d80d67d33e6b4704e10a
-EBUILD mitmproxy-6.0.1.ebuild 3107 BLAKE2B d1048ef4b4108ffe51fb82ddecd318a21be726c983f8b85c5725d798ba2d6189f8c197788221c1d8739d95f7ac8add38f2151b74f0fab8778a3c147f3aef0341 SHA512 818f165e5c200a0bc0c09e3ef9c25befd082ba9299402d8bd49a631e41b5ba64cddbaf1f14275946d68c8c1405ce3d8c435bac01bfa7fe437e26c947fb382e5b
+DIST mitmproxy-6.0.2.tar.gz 27274682 BLAKE2B 146fc4cd376e4ff02d13bf168b26868c5a33b47b30e678fb6d97df36c4b8ec9e8b9ca6e864e56c3943b231a2f2745c1abd7c58814ddf712113c2a20704a6964f SHA512 27eb5e9736891148b5ebec963a2d18de6a69b44428538d2ed1cf9a1dcdd7cbcdeeed662edb2d25521098374e2f9a29b5bb8fba8da4f77ac0d32bf7881ac70d61
+EBUILD mitmproxy-6.0.2.ebuild 3114 BLAKE2B 862dc87f9745307c64abc22dacf3e994eb4a30dbab46e3f721c7a9f25e74a7c13719adc020399b7bddc7076c5991b6e0e12c3b0a5820f56cb2c356e83ca495ad SHA512 3d991400b0d36982cf37bc8e17275a6043c37ddb8b262fd459a7e70f1180b1d80de21149aef5d6fdc247ec570b58a633b5d5ae61c22675dbf2e6cf5ccf816bcc
 MISC metadata.xml 1035 BLAKE2B 8d378cec75895df5c0fe8414ad37676de709f1c73242cbc23a0bfa6e4863ea234d99aa724c9ace560a91d6f9e533dd4281914ece0cd38df05dd7375b134211ff SHA512 3bdb95f97d85f63e93fafd18e5a6c82e20c12a1d27acae162b6aa6f3813d65dbc3f756e29cfb05cd9b515522e19973a636b05e28c01891dd2c1028172e7c3fb3
diff --git a/net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild b/net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
deleted file mode 100644
index d127d4bbb616..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_7 )
-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="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/brotlipy-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
-	>=dev-python/click-6.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/hyperframe-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ldap3-2.5[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.15[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-1.5.4[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-	>=dev-python/urwid-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-0.11.0[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/flask-1.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.50.8[${PYTHON_USEDEP}]
-		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.3[${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 '/>/s/>.*/",/g' setup.py || die
-
-	# fix brotli dependency
-	sed -i 's/Brotli/brotlipy/g' setup.py || die
-
-	# remove failing tests
-	sed -e 's/test_iframe_injector/_&/g' \
-		-i test/examples/test_examples.py || die
-
-	sed -e 's/test_find_unclaimed_URLs/_&/g' \
-		-i test/examples/test_xss_scanner.py || die
-
-	rm test/mitmproxy/addons/test_readfile.py || die
-
-	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
-
-	# needs pytest-asyncio
-	rm test/mitmproxy/tools/test_main.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild b/net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild
deleted file mode 100644
index 67c9373c73f7..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
-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 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
-	>=dev-python/click-6.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/hyperframe-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ldap3-2.5[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.15[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-1.5.4[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-	>=dev-python/urwid-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/flask-1.0[${PYTHON_USEDEP}]
-		>=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 '/urwid/s/==2\.0\.1,!=2\.1\.0//' \
-		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-5.3.0.ebuild b/net-proxy/mitmproxy/mitmproxy-5.3.0.ebuild
deleted file mode 100644
index 2809a55fe100..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-5.3.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,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 ~x86"
-IUSE="libressl 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-6.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/hyperframe-5.1.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.6.0[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-19.1[${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.1.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( >=dev-libs/libressl-3.2.0:0 )
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/flask-1.0[${PYTHON_USEDEP}]
-		>=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 '/urwid/s/==2\.0\.1,!=2\.1\.0//' \
-		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-6.0.1.ebuild b/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
index 363549e67bf4..ec54ddf561d8 100644
--- a/net-proxy/mitmproxy/mitmproxy-6.0.1.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="libressl test"
 
 RDEPEND="
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index e27757fc0e40..d4938d415860 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -9,5 +9,5 @@ AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32
 DIST privoxy-3.0.28-stable-src.tar.gz 1753809 BLAKE2B 1ea0d6339c96bd294eadc124ebac252c43dcdc062709868668959bdb4f959267afb2ec7f27fc0d58db3655102f2412f1c8acb273267d447271465ac21f7a9be4 SHA512 5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc
 DIST privoxy-3.0.29-stable-src.tar.gz 1830550 BLAKE2B ecd0a78f2c4a3a6006fb229a7115a3c1b5041508233ef36d7995607984e5f9fbf7f117aa4611f384eed4434a6a3204a7f31a33857112d5f1f0a71fddb2134df3 SHA512 2f483a37d697738815f4c58a775fbf116a34ac5e0e74d19814252c5ff1572350181066d468327189faf20c92d808d551b0017a9525ec98276330ee539554c1ba
 EBUILD privoxy-3.0.28-r1.ebuild 3608 BLAKE2B dd2e6613f5b54c0dbf61b677415b56281de8eff1af08f85d92188ce0267c2d8e59095c109a38db4a1a7cbb33ca87f27c542d73637f81e272b26c243a199abd9f SHA512 91b810ee816d5ca3928fd6df7ae8124867970c5c3f7d8d7039f0e6f21b53bf00a3416d201a7ccee9b30afe3aa848640680b6d6af9dee7e19605fa90052bac2be
-EBUILD privoxy-3.0.29.ebuild 4054 BLAKE2B 5f83d5c40cdd130661d7d304dfad6b1bb5736f26927eded9076ad21ebfd4b9a5a842040af5e9262d1fe76d2f77fe53b0a801d0493783250efb96522d6ecf59df SHA512 6f5fa50980e8ec92ce97fb833be3c65cf87ee18caee6d93f385f0aecc03ab24bddc0ee60979743e7b084545ca38b7e7b576ee70f5f48c133190d2c0ab8edfb20
+EBUILD privoxy-3.0.29.ebuild 4049 BLAKE2B 93ad84845d3feaa3f390a3559808ae237d2f5d3e5b52fe24f3c9fcb31d00aba23cb7a51e678d749f4b14e96d15ec73717af01f52d61168bab98f70cba8de59e4 SHA512 d3b871ea9010eced2ac92b346f08be7b8fc009d209e3d2c24d0a251ac73438e4beb50fbf754c3c78b8ae32ff9bd007f1c080bc7b3032fd31d7c55877fa69f6c1
 MISC metadata.xml 2796 BLAKE2B 2da7f1b6b5cbdd5a175d017b579b902fee758821b49e5d5cdc172f0b85fa41accd90c571e447867aa6324f1913b3fea90e2d9d9d981640ebe99735a5dabbd6ac SHA512 d1452008357be66b661c500f9f352afb94c1c221a3afbaa3e6b27d3e576232259ee50ea81890119d7c8dda153a3587f3de0f732fe097f4097293b06736ab921b
diff --git a/net-proxy/privoxy/privoxy-3.0.29.ebuild b/net-proxy/privoxy/privoxy-3.0.29.ebuild
index fffcbe231db0..966001da72e1 100644
--- a/net-proxy/privoxy/privoxy-3.0.29.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.29.ebuild
@@ -19,7 +19,7 @@ graceful-termination +image-blocking ipv6 lfs +mbedtls openssl
 png-images selinux ssl +stats +threads toggle tools whitelists
 +zlib"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc ~x86"
 LICENSE="GPL-2+"
 
 DEPEND="
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index c664aa7d0e76..cebfcc27e675 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -5,5 +5,5 @@ AUX squid.initd-r5 4339 BLAKE2B 3529ddaab2e708215e6674514ce8e20e9d28d26e45860e19
 AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55
 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594
 DIST squid-4.13.tar.xz 2452752 BLAKE2B e2efdfda736f2324c6723e76272c4989a41fa6d0f52b48cc33957ae8e57e75350487d9683fc72c43926e5d91b698eef728282895018b78acefe23de2e67cfd74 SHA512 06807f82ed01e12afe2dd843aa0a94f69c351765b1889c4c5c3da1cf2ecb06ac3a4be6a24a62f04397299c8fc0df5397f76f64df5422ff78b37a9382d5fdf7fc
-EBUILD squid-4.13.ebuild 8152 BLAKE2B 89b0311eb8797a2c41f123cc6f9dfc29b9ed7a55d9d10591156d059103d2f624875fbeb2d23d32ba36ba8d15275a19c8c665cf70ac24c28a583181029d81d0a1 SHA512 28142f085bc13922e461172d7629735c46ddf8cc2ff4e03102febf8e68f5f9ecaa6bac9e4dcf8dde0a2807e1d739f83e88af63a84fbfec7c37a761018457aa0f
+EBUILD squid-4.13.ebuild 8176 BLAKE2B bfdf00d2098076f0065843b696c87c4c825abe08d4ac798acbbee39f6a1db2d22fb293bd055d4343cc0ebf23d0f5fe4866ddd5a527bc2834eecee1773ec5f99c SHA512 886a5ded8078fe47f3be439250136f7fb1ac01d0d61efafed7f533cf9292cfc65820d60c55722c0507af83da41f5c8b8607d310d7f799a1173861dec57678ec7
 MISC metadata.xml 1472 BLAKE2B ba8020d30b7fb7740a160a06f2f4323f1ae181c79bc89fe390b25b156000a5c751a68333a634753cb1a96a9097577b379369226db8ee6e04c22c4b9f0e8626bc SHA512 19fce272b91077d6114ee400adc6360993558c02bc6595c50fdf43323eb7aebd0f2c0d7cb6d688fd8f1db6af06305de24a7c5a0cddce62d150391c50da46e056
diff --git a/net-proxy/squid/squid-4.13.ebuild b/net-proxy/squid/squid-4.13.ebuild
index 5547d6a8e975..6201b7c45436 100644
--- a/net-proxy/squid/squid-4.13.ebuild
+++ b/net-proxy/squid/squid-4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -256,7 +256,10 @@ src_install() {
 	newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group
 	dodoc RELEASENOTES.html
 
-	newpamd "${FILESDIR}/squid.pam" squid
+	if use pam; then
+		newpamd "${FILESDIR}/squid.pam" squid
+	fi
+
 	newconfd "${FILESDIR}/squid.confd-r2" squid
 	newinitd "${FILESDIR}/squid.initd-r5" squid
 	if use logrotate; then