gentoo new year resync : 01.01.2021

7 files changed, 17 insertions, 22 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 2ea629b2e6b0..9c461b3e0ac6 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/adzapper/Manifest b/net-proxy/adzapper/Manifest
index a780f91a96a1..3fd26de5e6d3 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
+EBUILD adzapper-20110915-r2.ebuild 1448 BLAKE2B 91b3c6e30441e3288a6315e7fda8846cc5ef577bd2c638c4e885caa92b18e75d12851d7bc63632b92cdae88da3688aaeb42a790c21ad10f9484df861093fa5eb SHA512 b8e39e71896ab029c43eca8865b8996d686d4136ad54db38a128824dd6710b079b9a960cc13e12d8f1b3c4d6a367217ff87623312a8162e16f590d530ee4485f
 MISC metadata.xml 245 BLAKE2B 3042c1bbbe1474e9a8ede43957c1a6a247a0ec0723972e2e9800a508bdddc4c867c5d8e8fc18db9189dd21f43f97b769fea1e612f8adc7b028e7d5b1f48e9996 SHA512 9791990a73c78c55718416f66a5eeb7f22c5f0a378f18d9c19c76c4f729319dbe7406802d5a7f1540da5bae60dd1818025a86c0af98609e9ba0a01b9b6555c38
diff --git a/net-proxy/adzapper/adzapper-20110915-r2.ebuild b/net-proxy/adzapper/adzapper-20110915-r2.ebuild
index 52760d757d15..d972ca4552cc 100644
--- a/net-proxy/adzapper/adzapper-20110915-r2.ebuild
+++ b/net-proxy/adzapper/adzapper-20110915-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://adzapper.sourceforge.net/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl"
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index d4ad2a43b451..90bd17ebdc1f 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,5 +1,5 @@
-DIST sshuttle-0.78.5.tar.gz 74663 BLAKE2B 47e295219c1ada7bee4f0340cc169620c5b91abd1f72b933289ef2dea0c5ba088673f2d1348d444f662e9f6c2638ee6dfd3e8df1fa8344bc7c48adf1a3a96d3f SHA512 562acbf0e825ad41458c5b6065592a45b8bac92cd64b20619027fe4d0bec60a22c5191c7a7ed6b216d8cf5c9e027f58a6cdca69dd3a11ec6f6d348ef2f13bb38
 DIST sshuttle-1.0.3.tar.gz 79216 BLAKE2B fefc93654c4991bad54de6b156916ee656f7d460d609c5333b15c601e9b2b0169c1670e911988dfa8290a5bc1885d94f9ec9656066d2b13da0b4d53d9739297a SHA512 22132dba0e6b7dd835f0af1368a5e8c3a95db66e11ffec9ec3cae72cc7ed4eec13580eeceb08071bee12cae8169852772578f8e29a69583cb79c71d350f474bb
-EBUILD sshuttle-0.78.5.ebuild 1376 BLAKE2B 465e786d5b32cb5d89eb2afbd7e20a3fff07d95280bd9df9ab0fe7c2d434d00d48ad7fda22daa4ba68b752369857ce9ad47f5c37e550d69a547e07c8954a76a8 SHA512 a468ae099a8d9dd1a0d35cd65051f1116a649b9c7dcc6f8e3b3a891f9befbc6150cb1acc550495143c6bc5786de992aa06a8c67b0655007617408be4becea240
+DIST sshuttle-1.0.5.tar.gz 88823 BLAKE2B 6a68be71a92c8245e2e60df1f425c6959547f8c2b972bdafcd774449c3779698c2549f2c7a3575c102158962ef9dd2edaaecec564f36f7f5cc84ed3f53b3daa3 SHA512 a9ebc8f8cf5ccc351796c2eb5b224b5d76908d23a367b768fa4e7b9cd8517ee7ff9c232c92ed4332f46d02d890ad8114f8beaa66876a8c0d7d4850c18ff4c2b3
 EBUILD sshuttle-1.0.3.ebuild 1211 BLAKE2B 4827fafd4d95ef0063f696e64384fc3ba5b97cbae0a1ee899bab41248f84fe2496780e5276864a3109254526ae41e6c8a9540f9d3b3936838f5219aea6313201 SHA512 0af06ce5b9c5c5c1b2607b3355aa35af3375397258a86a7cd7383a44f5ff6f6990cc7b9a37eac7aeeead8ee256f9f9d7912a469e7be07ab688caa6d9a94334e9
+EBUILD sshuttle-1.0.5.ebuild 1253 BLAKE2B 293d346d9daa31119ce27627ac95db9fe119da07f1306996c93c0d38b6c7ef67e63aa9f8732754d7854afac2466c002c7522e33baac5cb7715706b7b302772d7 SHA512 5e69c06a013493fe701c201662f1b8f8e2a81b7f51e4b753448b43d361d87f9f0648c9a4a59c2fb7563cf73836fe2f255bd84e243bf251517f2279368055e5b6
 MISC metadata.xml 302 BLAKE2B aaef94f4b028c3f346523d5bbd42876e24fa82ab119c03a3db5c1ca40237efdbec97377b27584d3c307491a1c542d1194ac066a8c532cfbdf1ff9a9c1d06a6d3 SHA512 7e81df3d00fdf3c231e968d844a693c3d90e6e64c73f90b93d437331a2dafbc5d4f48bcb46596f9efb36ecb2c1d16ef2e37f50bdf8fa8e41e3a0ae3e3eff3985
diff --git a/net-proxy/sshuttle/sshuttle-0.78.5.ebuild b/net-proxy/sshuttle/sshuttle-1.0.5.ebuild
index 497f9299ed09..b297f3b3390a 100644
--- a/net-proxy/sshuttle/sshuttle-0.78.5.ebuild
+++ b/net-proxy/sshuttle/sshuttle-1.0.5.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit linux-info distutils-r1
+inherit distutils-r1 linux-info
 
 DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
 HOMEPAGE="https://github.com/sshuttle/sshuttle https://pypi.org/project/sshuttle/"
@@ -12,26 +13,24 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( net-firewall/iptables net-firewall/nftables )
-"
-DEPEND="
+BDEPEND="
 	dev-python/sphinx
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+	|| ( net-firewall/iptables net-firewall/nftables )
+"
 
 CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~NF_NAT"
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
 	# don't run tests via setup.py pytest
 	sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die
@@ -46,10 +45,6 @@ python_compile_all() {
 	emake -j1 -C docs html man
 }
 
-python_test() {
-	py.test -v || die "Tests fail under ${EPYTHON}"
-}
-
 python_install_all() {
 	HTML_DOCS=( docs/_build/html/. )
 	doman docs/_build/man/*
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index 635e5fb38f34..11e6c3bd83a6 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -5,5 +5,5 @@ AUX tinyproxy.tmpfiles.conf 48 BLAKE2B f2cd35878580eb198920f5db8493e3e266b432516
 DIST tinyproxy-1.10.0.tar.xz 176060 BLAKE2B 58f9b443c731de6b74d689a80ebd422d3b6f51f643546ee144b37fb3262725246f6a5fa1015267a94f192f8715eaf71ffc078ead75e6225a210f58ec28ee8fcf SHA512 8d82598c5f9c89bc672f4632139ac52696d5c7788963de51688a8aeb576c69004f8338fe1e1897bf704a21dfd25ab1effb092003b6afaa9a88c2b5d0608310f5
 DIST tinyproxy-1.11.0-rc1.tar.xz 176732 BLAKE2B a448c90b17a8d3256aec1dba4307e9bce87ac421a67486e4987afbf22e49041971138f09e98a4a775cc05071b73b4f1b34e652eb2c0992b2a5fa1861a0df26b2 SHA512 e1d05777072d178c66d1f007163bcb4b3a0b1dfdf460881daaf962b5f1c0d0213ec5403bf50c161d811f46c8b50a476cd534f535962ec01b70fbb955471c1af1
 EBUILD tinyproxy-1.10.0-r1.ebuild 1653 BLAKE2B 30ee264b5f273c6a9902f2c9680acfe46fbddabe2e826d9255f4a9b9e210a08c37cd619e5b78a7b2d59a45e73685b7ac758dcce13d349a5c4788e2555d8bc2e2 SHA512 7c4606f12aa17a36dee5bcc4561f7fd0e5d104f646d1347f3de37abc9b7f8c788a3f0be6907b4fa58916cea4c2778851299396e9d1b2cd6c377a4690469ac2d8
-EBUILD tinyproxy-1.11.0_rc1.ebuild 1722 BLAKE2B 5bbb0718f57f8b690aa7f309f4ed23225e75613a1ff3bf831ca86d466ee0370a4e82874db0b85c41bf2200aa65b72e681c4808f29767dbae61eebde5268dfc76 SHA512 d1c350ece4642aed0ceaf1c449a4a286e701b030b03d546b3865d6d32fcd2468316a1c8eba2a74e604b6ec21bd53498f10148f00d5de71937f3e66ad1580ff13
+EBUILD tinyproxy-1.11.0_rc1.ebuild 1721 BLAKE2B e87e9283c447c319f24ae11aba8add3b476922e8d4bd0022da10cc2c88c4a548f992ec0b2ce9eac4f0c6691890e56827507e5993881c5e6b52a04dc1c70af24f SHA512 d035e8d0dbe312b26ad0e5e51e0ff2a7738db6bb35c5c96932a413003ec45a56fcfaa29929211331b6ba7cfa160373b520762c12e0ce6235fce5a2f268cf69f7
 MISC metadata.xml 562 BLAKE2B db41afc703d1338c10ef24e682a96b5a945bc80fd4a4e798fa7e74fdfbb9b1b8449a9126b8506e60524e733fc4810a1499e1320e565840798f8bea4722d46380 SHA512 ade2407ef37db41cef982bee16d02621813899fff1c4c3eaa00dd7517af254def7ecf08f508a1e873eaf5d2843df22154272bf58f84954e512614107d333805c
diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild
index 7c0e27a1928d..a6027018a5dd 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${MY_PV}/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 
 IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
 +upstream-proxy +xtinyproxy-header"