Merge branch 'edge' into next

8 files changed, 17 insertions, 17 deletions

diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 178463b7d34f..62f4ff965f51 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/hatop-0.7.7 b/metadata/md5-cache/net-proxy/hatop-0.7.7
index 7d5700c93ca6..493042bd4f84 100644
--- a/metadata/md5-cache/net-proxy/hatop-0.7.7
+++ b/metadata/md5-cache/net-proxy/hatop-0.7.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Ncurses client and real-time monitoring and displaying of HAProxy status
 EAPI=5
 HOMEPAGE=http://feurix.org/projects/hatop/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-proxy/haproxy
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-proxy/haproxy
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://hatop.googlecode.com/files/hatop-0.7.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3af3bcdcdd90b4a6dd008c64dea8100c
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-4.0.4 b/metadata/md5-cache/net-proxy/mitmproxy-4.0.4
index 039c456b3854..bd177a189dbd 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-4.0.4
+++ b/metadata/md5-cache/net-proxy/mitmproxy-4.0.4
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/blinker-1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/click-6.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/ldap3-2.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/passlib-1.6.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=www-servers/tornado-4.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urwid-2.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/flask-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/parver-0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-3.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
@@ -7,10 +7,10 @@ HOMEPAGE=https://mitmproxy.org/
 IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-python/blinker-1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/click-6.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/ldap3-2.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/passlib-1.6.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=www-servers/tornado-4.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urwid-2.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/blinker-1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/click-6.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/ldap3-2.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/passlib-1.6.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=www-servers/tornado-4.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urwid-2.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v4.0.4.tar.gz -> mitmproxy-4.0.4.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2513faf7c8c7ca003a823c83e0972a92
diff --git a/metadata/md5-cache/net-proxy/obfs4proxy-0.0.11-r1 b/metadata/md5-cache/net-proxy/obfs4proxy-0.0.11-r1
index 08799d15b36a..b1eeb00d6108 100644
--- a/metadata/md5-cache/net-proxy/obfs4proxy-0.0.11-r1
+++ b/metadata/md5-cache/net-proxy/obfs4proxy-0.0.11-r1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=An obfuscating proxy supporting Tor's pluggable transport protocol obfs4
 EAPI=7
 HOMEPAGE=https://gitlab.com/yawning/obfs4
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=BSD BSD-2 CC0-1.0 BZIP2 GPL-3+ MIT public-domain
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://gitlab.com/yawning/obfs4/-/archive/obfs4proxy-0.0.11/obfs4-obfs4proxy-0.0.11.tar.gz -> obfs4proxy-0.0.11.tar.gz mirror://goproxy//git.schwanenlied.me/yawning/bsaes.git/@v/v0.0.0-20190320102049-26d1add596b6.zip -> git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.zip mirror://goproxy//git.schwanenlied.me/yawning/bsaes.git/@v/v0.0.0-20190320102049-26d1add596b6.mod -> git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.mod mirror://goproxy//git.torproject.org/pluggable-transports/goptlib.git/@v/v1.0.0.zip -> git.torproject.org%2Fpluggable-transports%2Fgoptlib.git%2F@v%2Fv1.0.0.zip mirror://goproxy//git.torproject.org/pluggable-transports/goptlib.git/@v/v1.0.0.mod -> git.torproject.org%2Fpluggable-transports%2Fgoptlib.git%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/agl/ed25519/@v/v0.0.0-20170116200512-5312a6153412.zip -> github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.zip mirror://goproxy//github.com/agl/ed25519/@v/v0.0.0-20170116200512-5312a6153412.mod -> github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.mod mirror://goproxy//github.com/dchest/siphash/@v/v1.2.1.zip -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/dchest/siphash/@v/v1.2.1.mod -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.zip -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.mod -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/dsnet/golib/@v/v0.0.0-20171103203638-1ea166775780.mod -> github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//gitlab.com/yawning/utls.git/@v/v0.0.11-1.zip -> gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.zip mirror://goproxy//gitlab.com/yawning/utls.git/@v/v0.0.11-1.mod -> gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190329044733-9eb1bfa1ce65.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190329044733-9eb1bfa1ce65.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod
 _eclasses_=go-module	cca12a5688562f107c14ffcf28195dd7
-_md5_=cd1e0a590762e50420ece0fa4a7a0898
+_md5_=de73aa4bc7b83dfc41db662d3f80e379
diff --git a/metadata/md5-cache/net-proxy/squid-4.11 b/metadata/md5-cache/net-proxy/squid-4.11
index 25c53ad18340..4d7d579eed18 100644
--- a/metadata/md5-cache/net-proxy/squid-4.11
+++ b/metadata/md5-cache/net-proxy/squid-4.11
@@ -5,7 +5,7 @@ DESCRIPTION=A full-featured web proxy cache
 EAPI=7
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite perl qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/squid acct-user/squid caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( !gnutls? ( dev-libs/openssl:0 ) dev-libs/nettle:= ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-3.1.5 ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0 samba? ( net-fs/samba ) perl? ( dev-lang/perl ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v4/squid-4.11.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=41f97757337ab99afb12fb7483c493eb
+_md5_=3a53cb58e627c6c23c41b985dc0781df
diff --git a/metadata/md5-cache/net-proxy/sshuttle-0.78.5 b/metadata/md5-cache/net-proxy/sshuttle-0.78.5
index e17c5d5d6be0..966e95398509 100644
--- a/metadata/md5-cache/net-proxy/sshuttle-0.78.5
+++ b/metadata/md5-cache/net-proxy/sshuttle-0.78.5
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/sphinx dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Transparent proxy server that works as a poor man's VPN using ssh
@@ -7,10 +7,10 @@ HOMEPAGE=https://github.com/sshuttle/sshuttle https://pypi.org/project/sshuttle/
 IUSE=test kernel_linux python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( net-firewall/iptables net-firewall/nftables ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( net-firewall/iptables net-firewall/nftables ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sshuttle/sshuttle-0.78.5.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	linux-info	ed97304af323c7b2f6934f229982cb7d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	linux-info	ed97304af323c7b2f6934f229982cb7d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe3bfc253f1b87324eec7973b830a3c1
diff --git a/metadata/md5-cache/net-proxy/trojan-1.15.1 b/metadata/md5-cache/net-proxy/trojan-1.15.1
index 0995981b0b23..79b95784d532 100644
--- a/metadata/md5-cache/net-proxy/trojan-1.15.1
+++ b/metadata/md5-cache/net-proxy/trojan-1.15.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( >=dev-lang/python-3.7.7-r1:3.7 >=dev-lang/python-3.6.10:3.6 ) )
+DEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.7 dev-lang/python:3.6 ) )
 DESCRIPTION=An unidentifiable mechanism that helps you bypass GFW
 EAPI=7
 HOMEPAGE=https://github.com/trojan-gfw/trojan
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-conn
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/trojan-gfw/trojan/archive/v1.15.1.tar.gz -> trojan-1.15.1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	727554821dab8292d3a8198893c2ef8b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc46f37d0178e502d5e24f6cc9c89bec
diff --git a/metadata/md5-cache/net-proxy/trojan-9999 b/metadata/md5-cache/net-proxy/trojan-9999
index 509ce1c36963..3b1475519df4 100644
--- a/metadata/md5-cache/net-proxy/trojan-9999
+++ b/metadata/md5-cache/net-proxy/trojan-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( >=dev-lang/python-3.7.7-r1:3.7 >=dev-lang/python-3.6.10:3.6 ) )
+DEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.7 dev-lang/python:3.6 ) )
 DESCRIPTION=An unidentifiable mechanism that helps you bypass GFW
 EAPI=7
 HOMEPAGE=https://github.com/trojan-gfw/trojan
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	727554821dab8292d3a8198893c2ef8b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ded78bd60e1aee297b54ec5c079db2ef