gentoo resync : 16.09.2020

18 files changed, 108 insertions, 19 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 81728e602393..dc480c4460f1 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/adzapper/Manifest b/net-proxy/adzapper/Manifest
index 5d5cffb1d5ae..a780f91a96a1 100644
--- a/net-proxy/adzapper/Manifest
+++ b/net-proxy/adzapper/Manifest
@@ -1,4 +1,4 @@
 AUX 20110915-flush.patch 2376 BLAKE2B c277dc6adb3d0e11ddf6ed5d723f822b63e93c5cc909ec1ec5b4ab7ead409acc9ef36b222e2f350434f200600878874fffa1ade53b1a70dfec5fa274a7854b0e SHA512 a15464953d0e589b4e679116a734e9d590990ce619858b8b8d9faac18a991c13b650c3f1edc732dbc4e8c2d38e82f67700471421b3a7250fdec4e6461f58d2ca
 DIST adzap-20110915.tar.gz 128132 BLAKE2B 4395c6270c7a4581505a1bd27550d1311e6bca9e1ac25cc1b029b695845f9ce586deb306f5122b6125095fe157251dd0482c1cc666bd37063f665fd6954765f8 SHA512 8b3566fc708b3db3b8eaa0306f90c75a82ac001cfdc3bc925fc649481420532ddc017f1b5139fce36733d3a38b2a7a31b39872b522ba4f49c098177496d64416
 EBUILD adzapper-20110915-r2.ebuild 1447 BLAKE2B 8f1bf6885252a5630883ce0fe47144530ed01b0368a5f860f0ed4e9c894cb4d265728ef230270b83dca92ffd1757909f4e61ec11ba63eb51429250ece5cc489d SHA512 ff0fbad6ba8562e652d76b6ab0beb7ba7633cb583602a275e68edec01534e05c13ca33bc3915baab3d058f7a06bb109518d5adebfe8294c7aa2c4d376dc02dec
-MISC metadata.xml 363 BLAKE2B f791b270d3ede68aaedbac2476a39d633f0a5503408ea0e02766e6b48a4d1c792d79ab4fcfb479336cbae3dffb99ca25407cb7639ad280c9306510401f87f7e6 SHA512 3d6c6318383863347bd23341e82d5b149a40b660870726bc1abdeb10214178d81d750b30c28c12907062a6f934d58cb036452b1bcaecd2f8f777e9a5b99e9c99
+MISC metadata.xml 245 BLAKE2B 3042c1bbbe1474e9a8ede43957c1a6a247a0ec0723972e2e9800a508bdddc4c867c5d8e8fc18db9189dd21f43f97b769fea1e612f8adc7b028e7d5b1f48e9996 SHA512 9791990a73c78c55718416f66a5eeb7f22c5f0a378f18d9c19c76c4f729319dbe7406802d5a7f1540da5bae60dd1818025a86c0af98609e9ba0a01b9b6555c38
diff --git a/net-proxy/adzapper/metadata.xml b/net-proxy/adzapper/metadata.xml
index ce554bb8d936..b56552c89971 100644
--- a/net-proxy/adzapper/metadata.xml
+++ b/net-proxy/adzapper/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>Redirector for squid that intercepts advertising, page counters and some web bugs</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">adzapper</remote-id>
 	</upstream>
diff --git a/net-proxy/cntlm/Manifest b/net-proxy/cntlm/Manifest
index 88e6744fa9df..e33bca9a2401 100644
--- a/net-proxy/cntlm/Manifest
+++ b/net-proxy/cntlm/Manifest
@@ -4,4 +4,4 @@ AUX cntlm.initd 480 BLAKE2B 9ff99a0189c04f7550fa201c7c1fb7d65e4b314c3230de0299e9
 AUX cntlm.service 207 BLAKE2B 1297446b05325a36e632b80743e67820db70c8ffb9db5119c19c63aabe48fb2cdc18a76a5a305627cdb85939661b0fe2e4a4920b4eb57239752f0173ed6b5b3c SHA512 5084b6e65b4b91120a8fe369f7cec1566103db04f1c25f9d13241e8051a49bc776bc68601992e02156719623f0f62e6e77f3781a40776601b19faa53e1039324
 DIST cntlm-0.93beta5.tar.gz 718018 BLAKE2B daaf75f42c63dd191dfe36bd326dad42d0b7f774749d2dc644d4009fdf6d9b22c863759ed6ad0425fe8bde31ed99fa358c04254f6e83d67d49c719d8e088a62b SHA512 5cb59788a0d6dc5cd787acb36dbe6de9a3909727d63327c9a12b20973619b777add9e0acbe94ed6a3cf1c189ef0e0ac6c01aa3c1c4739881bbd371b4c90744cd
 EBUILD cntlm-0.93_beta5-r2.ebuild 1070 BLAKE2B c466479f654da1ecbf5835ccd3dd07fc0dabca0b4276e939c9f865d6812d2d987e7452bbe910b11c2136db4699b36ead9900ddd0608bf4b9564e29ab038e7c26 SHA512 d16bfd29e3744962ebbb2d9f8b0e6b067cc00ba895532ae0098993df48bdc00bc82d4c9644605c3ffd0254cb01bb86db86219f12ea8b37abddc3a0a8dc9489c1
-MISC metadata.xml 389 BLAKE2B 1156b8eed98d97ec63084c4e6f5b510601beac3860ccc82b71ead6721f00a2ddd975af4671aa5f1b1664459302b25f82f41fa64e7ca74f1fbecbc9e2bd3d5b10 SHA512 5d765000881049ae413629dfc297a72bda28e2000e3e145782aadeb2da3c8dd2ee51378f0333dc1e3a0d23012c916e1313b4aacf65998a0a17b898658b1602eb
+MISC metadata.xml 242 BLAKE2B 8752cddbbc7973767fba3404814c85d49881b491b6e36e88efd733d5b7e5780a46f1117b6fff3181e0eb165c1cfeb7ad79bac21eba6f008fb8aabb04407cf860 SHA512 7e39b103b558c87cf3e0de64039989303f8488d1bbbe93ca53ee314016931c5a7ed88ae12fc492bc635de17e99e5c7c8d2258335fdf24d1366a6059c1528ae99
diff --git a/net-proxy/cntlm/metadata.xml b/net-proxy/cntlm/metadata.xml
index 86bbb0e6615e..f16f3984bf46 100644
--- a/net-proxy/cntlm/metadata.xml
+++ b/net-proxy/cntlm/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		NTLM authorizing proxy. Upstream seems dead, but this is still a good
-		alternative to ntlmaps.
-	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">cntlm</remote-id>
 	</upstream>
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index df8fe88e01ad..37f6adbf52d2 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -13,4 +13,4 @@ AUX sockd.conf-with-pam.patch 295 BLAKE2B f41c2109e21878d2b473c6cffb4fe845d59ac0
 AUX socks.conf 4185 BLAKE2B cb41b40e858c83d06bd5e199c4fc991e8dda0ee64d48fd94e52d6ef836e79d6a6f5f50b6dd55074e92b6f96f20db65922f53869f08506100ae8b59b722643cdd SHA512 d15ea77e20ad750f10285a42c9c6305cbed48313dea205139d8cf59fda4a4640bdd5c5bd2c295b32e0015b774d463f9ad34fa5a22fb188ae921dba1a533553eb
 DIST dante-1.4.1.tar.gz 1284288 BLAKE2B 34c78007245339088d79e0b969b8f55d20b0ee59d89c1bf19510b563799ac3c54c6b8b5f37bfb64410d60e893beb0e2d1d79893c0264b7481aeb4cdab2037e90 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e
 EBUILD dante-1.4.1-r2.ebuild 2685 BLAKE2B 04121f835399e9b46e13452ceb8283022f8718e0e0de62323812a4c0e31c96e82985b099543fc0c4d56418e784c7b9976c281f7d1089bd60ef1bb0b8e00d0034 SHA512 20fbbe8a291b336e4cee35ed66b3b503278b7864ca4fb62072599ba5a1c06bd492deae688eb0c5660f6bb3d914f3e19ddf811f3c50120ea03d72bdbd6856dff6
-MISC metadata.xml 296 BLAKE2B f91f0392a93ffe384cc2879ce1a83cb8f7d92867d1376ebe2480687a8ffe2a5b5c6e0581c0bcf1b2c9708558da60371e1c24ab9fd6950e89f4b13f2f393664c7 SHA512 af311f739f67a9e4d7386aa2ba575f2d0ba5e6d1cd9710dc107876c6876a05ce301568da03c4287e2557665d1ca5cba174ca31b41c6788b1f1300c2fed9005ab
+MISC metadata.xml 212 BLAKE2B 3fa0112dac8ca387a2efccd5fcf038abfa26b67a2a512f3eb68491666f2ccb3fd63d1aa63044b0911aa6e5a8e856c762b3120045946afbf256611526d102558e SHA512 81dddbd7e6951957aa574cacaea6594ca44449251e028abd1a34e45e0b32dce1948c815478a65b4ed504364e4dd09f5a2c39d1f7019fc9b827a9ba28f52aca00
diff --git a/net-proxy/dante/metadata.xml b/net-proxy/dante/metadata.xml
index 47c971ca58ca..680a2c2af3ee 100644
--- a/net-proxy/dante/metadata.xml
+++ b/net-proxy/dante/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person"><email>robbat2@gentoo.org</email></maintainer>
-<longdescription>A free socks4, socks5 and msproxy implementation</longdescription>
 </pkgmetadata>
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 5088f6be38b4..08ccb71bc2d2 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,3 +1,5 @@
 DIST mitmproxy-5.1.1.tar.gz 27223155 BLAKE2B 38369eb07c41bde9f8e8c246ab5cc4fc6edfcd222f353624f4d2ae193f176228471aafdadd1b65238ccd808d778a69e1d140035be9116b87a75c286493747fe8 SHA512 ac5cd82d4d89590b57625661c493aca6a702605c612ea1acd9e0d0806067d47f60085ee68260bba2a10dc343410ae6a76ea1575287a0e312e4467a4e8485c6e1
+DIST mitmproxy-5.2.tar.gz 27251381 BLAKE2B d6bc5de8a3840a880664f52e011736cb640d324c6aa3846d4f2b3c2fc0d49467ab8ad3e8268a591cbe19d9f6dda5acc37fa2de705b4de1c1920b5003e10ea457 SHA512 6073c73b24618d6f64c4e99f199ebb6bc4157a3f83bfa7aff10a113f8dde823715e95bdf4202a1526dc0856d120858d32842b814327c3b98452b629fccb1790d
 EBUILD mitmproxy-5.1.1.ebuild 2884 BLAKE2B a066a3006656839fb2e04efe8b17ae2db0b0db899958f359e5718341c3988d9870911c817eedd91680ee250ee2d2bd32c3b0706897c58ac8db73339a6d5ca5b7 SHA512 045fb1f56dcaf446d6d5396db7ee78c0dd9f10e15688b29a29fffde0efa1e1a2c5ee37795c2def434536da60cd8c0ae55142847cc2b7013e0a4a4406e46f046f
-MISC metadata.xml 239 BLAKE2B 9ce254c9d79c1823be126f0737ead27524b2690a447914d59f3cad0ec3c549b2020fd9b31e50f67054b819c2264791cec5befd5602be80b4c0b0cb86b50d615d SHA512 70f4cee52fc1b316d727f8d0a423b718e78fb5b6d78ec321fc2aea5ba5dc5b08cc0142846a6d4b1cbe478f5a6322254222b08843a72e0307ecfd053cdb801c03
+EBUILD mitmproxy-5.2.ebuild 2382 BLAKE2B 899639d6769bd25192518d94f4352274c4bebaf4022d9309cdb8c6af81cd77f04c00d8605906b72d8dde7cc422bd45f4c965968d6ad1e324e6a51e40421c21c1 SHA512 46b95ce796156df2b5bf2b706a5cc8e06385db044a4337d3f624736d6ea7f2c2e5c711eef8cef0d724bcb2ac586a65fd20b97a18f3013ff1b93f7765ad3f338a
+MISC metadata.xml 1035 BLAKE2B 8d378cec75895df5c0fe8414ad37676de709f1c73242cbc23a0bfa6e4863ea234d99aa724c9ace560a91d6f9e533dd4281914ece0cd38df05dd7375b134211ff SHA512 3bdb95f97d85f63e93fafd18e5a6c82e20c12a1d27acae162b6aa6f3813d65dbc3f756e29cfb05cd9b515522e19973a636b05e28c01891dd2c1028172e7c3fb3
diff --git a/net-proxy/mitmproxy/metadata.xml b/net-proxy/mitmproxy/metadata.xml
index c7003e858b46..1d76cc4073ae 100644
--- a/net-proxy/mitmproxy/metadata.xml
+++ b/net-proxy/mitmproxy/metadata.xml
@@ -1,8 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>matt@offtopica.uk</email>
+		<name>Matt Smith</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		mitmproxy is your swiss-army knife for debugging,
+		testing, privacy measurements, and penetration
+		testing. It can be used to intercept, inspect, modify
+		and replay web traffic such as HTTP/1, HTTP/2,
+		WebSockets, or any other SSL/TLS-protected
+		protocols. You can prettify and decode a variety of
+		message types ranging from HTML to Protobuf, intercept
+		specific messages on-the-fly, modify them before they
+		reach their destination, and replay them to a client
+		or server later on.
+	</longdescription>
 	<upstream>
+		<remote-id type="github">mitmproxy/mitmproxy</remote-id>
 		<remote-id type="pypi">mitmproxy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-proxy/mitmproxy/mitmproxy-5.2.ebuild b/net-proxy/mitmproxy/mitmproxy-5.2.ebuild
new file mode 100644
index 000000000000..d5ba12b4c7c2
--- /dev/null
+++ b/net-proxy/mitmproxy/mitmproxy-5.2.ebuild
@@ -0,0 +1,75 @@
+# 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} )
+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
+
+	# requires asynctest
+	rm test/mitmproxy/addons/test_readfile.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/net-proxy/polipo/Manifest b/net-proxy/polipo/Manifest
index 2d52892d9c69..af0503cec426 100644
--- a/net-proxy/polipo/Manifest
+++ b/net-proxy/polipo/Manifest
@@ -5,4 +5,4 @@ AUX polipo_at.service 184 BLAKE2B 4a70215df39715f6d8972a41fa4bd191a2a6cbeee8c4d9
 DIST polipo-1.1.1.tar.gz 182891 BLAKE2B 92d3b4a6665d88ebe98afc6a3e7a624689d5e48da9a83dfc89af4a3d6ee2be3be447b252b9cfa1b56677cb80ffc8d438ed870887a409b716502965468be70e50 SHA512 7324ca96c19bf9f089146a12dba349ea8cd2669ee02d0599ed6c6116d11eb0e7cef7830d91d16921ba5cdd0ce06e6f831901832326d8118ebe0a565feeec7fb1
 EBUILD polipo-1.1.1-r4.ebuild 1646 BLAKE2B 3ed627100c7c12aafbb701add7b36e56691cfc599cde640ce6b88ba719842ffa9bc0b1f18233afa81f46a8f954b8067474b971a5c5ca14040cf23cc9f7abfcf3 SHA512 e36c7738bac32f9982a9239f13f46170b8e8b24429c46ee41cb4268d95b7568d7335b6493959f70ffd916570460378148e5f6df65b61d07331bc2bca621f2e8f
 EBUILD polipo-9999.ebuild 1648 BLAKE2B e665d45bf421243666eb3dce91bfe5be0e68b00c7a83edefdcc560a4f01ec9cbba76e48c6dbb5c0cba61b86ce5f7ead09e7915d510d9771e1a569e5e1e1fb507 SHA512 a91d887ce7ce9ce0f204cb67d2ae4cdbd7921a3f86e48c171a652ab283142aafa6c67dcadab03a01991f82399cb36c858ae6d68c45e587141d81b9da41ea496f
-MISC metadata.xml 350 BLAKE2B 1c10a25d44d854dbe4b638d1ab48c77710ba5bdc9e66a85561e5a6c54a83c58ab90329345d2e1450302364b1dce8e45a41e70cd9bab42fca80b17af06b5d7a13 SHA512 f1a615c85840eaaeaf3ffddc6ee4cf6e0c63b75227ffbbc6d3eb2c02809d45110610a39a4872497f31c5966a23056a6c1190d9db84c2817252df8e6f61ebe7a9
+MISC metadata.xml 218 BLAKE2B 2aefc34034ef5c26834231f38f9f7bf82f5f1f65b985a17be4760c385565bc9b11f9533eb56342785281a468ca2093141bcabc5a76720213d27c4cb34e38d68b SHA512 9f76a02d232e22173b3ba0bc0cf66f14e8efaa46db95a257c4ef5bd9f94a95cef41bec5ebb74b029f1043f65968674f82bc317565c7b690c2012f8c268ee78ee
diff --git a/net-proxy/polipo/metadata.xml b/net-proxy/polipo/metadata.xml
index 7833140b1e69..305aa5fbd224 100644
--- a/net-proxy/polipo/metadata.xml
+++ b/net-proxy/polipo/metadata.xml
@@ -4,5 +4,4 @@
 <maintainer type="person">
     <email>bircoph@gentoo.org</email>
 </maintainer>
-<longdescription>A small and fast caching web proxy designed to be used by one person or a small group of people.</longdescription>
 </pkgmetadata>
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index bfd27edc6f3e..331319538c74 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -8,5 +8,5 @@ AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32
 DIST privoxy-3.0.26-stable-src.tar.gz 1741772 BLAKE2B 19dc72d93535e6eb960a53e3679886655b2aff037ad6002844eb76c970c7da52d016b7a54993e3dcf453c394da354cf8ec8f1f23a02b9216240e5460d6239b34 SHA512 e448305287d0451c761b76b8d8974ea1ec837b621bbb498a7ff16a54cb4d8f1f734efe2eef03235c01163bb40e225785065aad6ee265a31d90970ab98af11044
 DIST privoxy-3.0.28-stable-src.tar.gz 1753809 BLAKE2B 1ea0d6339c96bd294eadc124ebac252c43dcdc062709868668959bdb4f959267afb2ec7f27fc0d58db3655102f2412f1c8acb273267d447271465ac21f7a9be4 SHA512 5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc
 EBUILD privoxy-3.0.26.ebuild 3432 BLAKE2B a3716db8d65b192f58a0dc30f93240c5a9fd90fc12c55b51182684c05c46a3be77ea490fbfc6d2b7f7623e68989ba55d72ed7d7ffbac315cd7a83a677d393652 SHA512 bde8f38c2cab1242496290248c455fb5262e1e22b5870ca3793f042a83e068603a1baa6a2dbbd64073e441835faea7b2fa35640268cc0fb2158a7f2104d26478
-EBUILD privoxy-3.0.28-r1.ebuild 3610 BLAKE2B 1e1d842092362ac116f917f67e7b88be9f74248a99ea3ce962047c43957fb205abbdd78822ea11109055f958be31739c976ada51844905fa1d863d7ba62ec31e SHA512 24774633fb27016a8119519ee103859e5967a87b90e2fdce32bf492d99fce2a22e2d22c12995f46f7c53388b70d0190fe08b59a0fdfd1b0bf4bbc577fdb01357
+EBUILD privoxy-3.0.28-r1.ebuild 3608 BLAKE2B dd2e6613f5b54c0dbf61b677415b56281de8eff1af08f85d92188ce0267c2d8e59095c109a38db4a1a7cbb33ca87f27c542d73637f81e272b26c243a199abd9f SHA512 91b810ee816d5ca3928fd6df7ae8124867970c5c3f7d8d7039f0e6f21b53bf00a3416d201a7ccee9b30afe3aa848640680b6d6af9dee7e19605fa90052bac2be
 MISC metadata.xml 2440 BLAKE2B f19609a881546a03d6bc5c76b182c5798feaa567369342c0a25994bbf12eff83db4c7b4e9af40e703500b6aa8dc58e49b2d4240958ddd6030bca0b567f77c196 SHA512 f620d755d33400faa3f58b49af79bebe1a5b59ed382e93844c761e3095009af9b1201b3a9d2c692dc21e871a19eda57d95b856c26f97e6496912fa80a1315f4f
diff --git a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
index 43f6d86aead3..cab9db7be630 100644
--- a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
@@ -18,7 +18,7 @@ external-filters +fast-redirects +force fuzz graceful-termination
 +image-blocking ipv6 lfs png-images selinux +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/squirm/Manifest b/net-proxy/squirm/Manifest
index 72a8bf07d423..d4b886732417 100644
--- a/net-proxy/squirm/Manifest
+++ b/net-proxy/squirm/Manifest
@@ -2,4 +2,4 @@ AUX squirm-1.26-gcc5.patch 182 BLAKE2B c583aaef670d104202513ea1a37c44df2d6238bf3
 AUX squirm-1.26-gentoo.patch 1019 BLAKE2B ecabb023c59c8db0c0dd4a076ab3f6171ba586d8cff133710593b7f34a64cf6c74f7aa9663517204776d51b89963b3c4e89fadf16dd61f2b2abffd4cabb385a8 SHA512 673997c76a660d276f628007e4a2a66ea9afb502f6803e2ef9c9b289b7e50c86428cb95abb48aee992cb7afe5c7684790328549adc0b69e70888528d076636b9
 DIST squirm-1.26.tgz 24151 BLAKE2B 2e653575d0043c73d8a6ffc526af38c06e32c4bba7726bdc57d56b556ca2bbcf489ed6e009952c4559b3aa63ca79fb4569c30c1cd11b758d669656b192b2274f SHA512 f6d0ec06d796b053cbe77e3099aa15665dc42a0e48e7c5b48c25c35a02677152bbb868ed822460cd52a1e898ec0ad605c43fe408c19e85e473e04257c8ffd9be
 EBUILD squirm-1.26-r1.ebuild 761 BLAKE2B a4eb8c046545b92b2619604361f92ba08f9294a98efa3c3814ba10e9fb5ee6b80fb3c7013d01140e319bd0113ade1c85684a5d4264c15fb528680a24fdd3691a SHA512 3cf9af0e0221e15e3243ee4b80d4767b8bb62a1bf197238f391a24c80e2967d5afe14d732f8f2d2798ad82433437b7bc6dab1e8e99cefac9f2ad651f44460adb
-MISC metadata.xml 224 BLAKE2B 57788b34a866218126d20afd7e72fd5f81eefbbb7478ba730426ca26e692679a6fdd8f66b58b0ed6627b2cdaa308fc9e2e5b392001ca2a7a35fbb4d1bbd506fe SHA512 e043725d9ce38bc38f1ba8e83df62662ef680b4c101172b6e4782e4125816234dac3bded9e57f621ca9b9a86b09cab0249a190ed5826cf241d70e07a871402fc
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-proxy/squirm/metadata.xml b/net-proxy/squirm/metadata.xml
index 979868f666de..6f49eba8f496 100644
--- a/net-proxy/squirm/metadata.xml
+++ b/net-proxy/squirm/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>A redirector for Squid</longdescription>
 </pkgmetadata>
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index ac400c1529bd..e368e0bb39c4 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -3,5 +3,5 @@ AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca
 AUX tinyproxy.service 172 BLAKE2B d2e6199bfee2bac52e08d4c5506131f19e2630ebe1d9ed12f71d575cef37454c229e9e08b1fc89d9e26052a1192913289ed3602d69686d6894eb68b8639e7a5a SHA512 4c4cd36a7e34d9ee27c05475b72d1b61f90592ccb44c9deb96a1375bb681b7901702f078ed24b7c633074c83e450275a4a66829f3b270f75fc786a50d1ef393f
 AUX tinyproxy.tmpfiles.conf 48 BLAKE2B f2cd35878580eb198920f5db8493e3e266b4325160a9590a0b59bef1cf0577d0129bb636d99442cdb2154b444a8cdc1c6d01b4850b57df774be00338c61902e4 SHA512 24440cdaed0af6cbdb191acb1769e0a17871ef95e03e62a6621a413a2616e5d90d748d909bb5d18c029b25d7bf91485dbe46ee11e8703a1cb9008be470536715
 DIST tinyproxy-1.10.0.tar.xz 176060 BLAKE2B 58f9b443c731de6b74d689a80ebd422d3b6f51f643546ee144b37fb3262725246f6a5fa1015267a94f192f8715eaf71ffc078ead75e6225a210f58ec28ee8fcf SHA512 8d82598c5f9c89bc672f4632139ac52696d5c7788963de51688a8aeb576c69004f8338fe1e1897bf704a21dfd25ab1effb092003b6afaa9a88c2b5d0608310f5
-EBUILD tinyproxy-1.10.0-r1.ebuild 1662 BLAKE2B 247a724e2aafb0b189ffaf6e413b1a47004dce4401f13289b967171015659e81ff8413857e1c085f426bd3fb092d038e05d67185f21999c67e412e6768805322 SHA512 17248ee440d1096e4afee14ebff144a456e932af77d81e15aeea77c001ef3abbe5062dd1d1afe2e7894c60f33ed837d689ab3241fc86861b57bb38f840ddd30a
+EBUILD tinyproxy-1.10.0-r1.ebuild 1653 BLAKE2B 30ee264b5f273c6a9902f2c9680acfe46fbddabe2e826d9255f4a9b9e210a08c37cd619e5b78a7b2d59a45e73685b7ac758dcce13d349a5c4788e2555d8bc2e2 SHA512 7c4606f12aa17a36dee5bcc4561f7fd0e5d104f646d1347f3de37abc9b7f8c788a3f0be6907b4fa58916cea4c2778851299396e9d1b2cd6c377a4690469ac2d8
 MISC metadata.xml 562 BLAKE2B db41afc703d1338c10ef24e682a96b5a945bc80fd4a4e798fa7e74fdfbb9b1b8449a9126b8506e60524e733fc4810a1499e1320e565840798f8bea4722d46380 SHA512 ade2407ef37db41cef982bee16d02621813899fff1c4c3eaa00dd7517af254def7ecf08f508a1e873eaf5d2843df22154272bf58f84954e512614107d333805c
diff --git a/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
index 1bc212ef1284..8bca4032ebe2 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
@@ -60,7 +60,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}-1.10.0.initd tinyproxy
 	systemd_newunit "${FILESDIR}"/${PN}-1.10.0.service tinyproxy.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
+	dotmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf
 }
 
 pkg_postinst() {