gentoo resync : 28.04.2019

18 files changed, 49 insertions, 76 deletions

diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 7fffcbb0dd38..d17d423b7637 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/aiccu-2007.01.15-r5 b/metadata/md5-cache/net-vpn/aiccu-2007.01.15-r5
deleted file mode 100644
index 5e95c535b891..000000000000
--- a/metadata/md5-cache/net-vpn/aiccu-2007.01.15-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=net-libs/gnutls sys-apps/iproute2 systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=AICCU Client to configure an IPv6 tunnel to SixXS
-EAPI=5
-HOMEPAGE=https://www.sixxs.net/tools/aiccu
-IUSE=systemd kernel_linux
-KEYWORDS=amd64 arm hppa ppc sparc x86
-LICENSE=SixXS
-RDEPEND=net-libs/gnutls sys-apps/iproute2 systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=https://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_20070115.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b3ecadc325b5ac7eba6a82bf5b642e9
diff --git a/metadata/md5-cache/net-vpn/i2p-0.9.36 b/metadata/md5-cache/net-vpn/i2p-0.9.36
deleted file mode 100644
index 948012b0e828..000000000000
--- a/metadata/md5-cache/net-vpn/i2p-0.9.36
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/eclipse-ecj:* nls? ( >=sys-devel/gettext-0.19 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
-DESCRIPTION=A privacy-centric, anonymous network
-EAPI=6
-HOMEPAGE=https://geti2p.net
-IUSE=+ecdsa nls elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
-RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 ecdsa? ( || ( dev-java/icedtea:8[-sunec] dev-java/icedtea-bin:8 dev-java/oracle-jre-bin dev-java/oracle-jdk-bin ) ) !ecdsa? ( >=virtual/jre-1.7 ) net-libs/nativebiginteger:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://download.i2p2.de/releases/0.9.36/i2psource_0.9.36.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=043bec32a5d760355675d14685caa165
diff --git a/metadata/md5-cache/net-vpn/i2p-0.9.37 b/metadata/md5-cache/net-vpn/i2p-0.9.39
index 6d4a90356ba3..a9941e0dc3d7 100644
--- a/metadata/md5-cache/net-vpn/i2p-0.9.37
+++ b/metadata/md5-cache/net-vpn/i2p-0.9.39
@@ -3,11 +3,11 @@ DEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomc
 DESCRIPTION=A privacy-centric, anonymous network
 EAPI=6
 HOMEPAGE=https://geti2p.net
-IUSE=+ecdsa nls test elibc_FreeBSD elibc_FreeBSD
+IUSE=nls test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
-RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/commons-logging:0 dev-java/slf4j-simple:0 java-virtuals/servlet-api:3.1 ecdsa? ( || ( dev-java/icedtea:8[-sunec] dev-java/icedtea-bin:8 dev-java/oracle-jre-bin dev-java/oracle-jdk-bin ) ) !ecdsa? ( virtual/jre:1.8 ) net-libs/nativebiginteger:0 >=dev-java/java-config-2.2.0-r3
+RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/commons-logging:0 dev-java/slf4j-simple:0 java-virtuals/servlet-api:3.1 virtual/jre:1.8 net-libs/nativebiginteger:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-SRC_URI=https://download.i2p2.de/releases/0.9.37/i2psource_0.9.37.tar.bz2
+SRC_URI=https://download.i2p2.de/releases/0.9.39/i2psource_0.9.39.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cbc66aeaff279d547e0bb30da45c34ac
+_md5_=0f6e6f50c0d3a56ba395acea45fa4c6f
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.24.0 b/metadata/md5-cache/net-vpn/i2pd-2.24.0
new file mode 100644
index 000000000000..35b65001538b
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/i2pd-2.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=!static? ( dev-libs/boost:=[threads] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= >=dev-libs/boost-1.65:= ) upnp? ( net-libs/miniupnpc ) ) static? ( dev-libs/boost:=[static-libs,threads] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] >=dev-libs/boost-1.65:= ) sys-libs/zlib:=[static-libs] upnp? ( net-libs/miniupnpc[static-libs] ) ) websocket? ( dev-cpp/websocketpp ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
+EAPI=6
+HOMEPAGE=https://github.com/PurpleI2P/i2pd
+IUSE=cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=!static? ( dev-libs/boost:=[threads] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= >=dev-libs/boost-1.65:= ) upnp? ( net-libs/miniupnpc ) )
+SLOT=0
+SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.24.0.tar.gz -> i2pd-2.24.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f268530bdc679e7f58934a5a7e9f4454
diff --git a/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.2.12 b/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.2.12
new file mode 100644
index 000000000000..7b792cad1ea2
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.2.12
@@ -0,0 +1,13 @@
+BDEPEND=>=net-misc/networkmanager-1.2[ppp] dev-libs/dbus-glib net-dialup/ppp[eap-tls] net-dialup/xl2tpd >=dev-libs/glib-2.32 net-vpn/libreswan gnome? ( x11-libs/gtk+:3 gnome-base/libgnome-keyring ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DESCRIPTION=NetworkManager L2TP plugin
+EAPI=7
+HOMEPAGE=https://github.com/nm-l2tp/network-manager-l2tp
+IUSE=gnome static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-misc/networkmanager-1.2[ppp] dev-libs/dbus-glib net-dialup/ppp[eap-tls] net-dialup/xl2tpd >=dev-libs/glib-2.32 net-vpn/libreswan gnome? ( x11-libs/gtk+:3 gnome-base/libgnome-keyring )
+SLOT=0
+SRC_URI=https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/1.2.12/NetworkManager-l2tp-1.2.12.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=86191481a36e815c6e9f3b99e2d707ca
diff --git a/metadata/md5-cache/net-vpn/networkmanager-libreswan-1.2.10 b/metadata/md5-cache/net-vpn/networkmanager-libreswan-1.2.10
index d9457edfe9d3..e87eaacd5474 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-libreswan-1.2.10
+++ b/metadata/md5-cache/net-vpn/networkmanager-libreswan-1.2.10
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager libreswan plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/VPN
 IUSE=gtk
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-1.2.0:= net-vpn/libreswan gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) !net-misc/networkmanager-openswan
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-libreswan/1.2/NetworkManager-libreswan-1.2.10.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0f5d8afede32984eb4e9fe3cdfd788a4
+_md5_=db7e51da2e8e3390d327608398d45e05
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10
index e6131b2a67f5..e6fb7da71248 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10
+++ b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager OpenVPN plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=968ae320a01ff7242b2c394ce0c61fe9
+_md5_=91c011bcdc9b2ec5787d932abaf516a8
diff --git a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.4-r1 b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.4-r1
index 661997a91c28..58038529e44c 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.4-r1
+++ b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.4-r1
@@ -5,9 +5,9 @@ DESCRIPTION=NetworkManager StrongSwan plugin
 EAPI=7
 HOMEPAGE=https://www.strongswan.org/
 IUSE=+glib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/libsecret gnome-extra/nm-applet net-misc/networkmanager net-vpn/strongswan[networkmanager] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-1.4.4.tar.bz2
-_md5_=35a70259ae26628406b77f8851c82c5a
+_md5_=1db57a320e6d269a23e76adeccbde106
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.6 b/metadata/md5-cache/net-vpn/openvpn-2.4.6
index 272838624c4e..b12551e8e734 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.6
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) test? ( dev-util/cmocka ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) test? ( dev-util/cmocka ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
 EAPI=6
 HOMEPAGE=https://openvpn.net/
 IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl static systemd test userland_BSD kernel_linux
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
-RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
-REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
+RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
+REQUIRED_USE=static? ( !plugins !pkcs11 ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=https://swupdate.openvpn.net/community/releases/openvpn-2.4.6.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.6/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2452bc39ffe2cf4e0e87f6072488ebac
+_md5_=4fda94ec47e1ee25126229e4c2da94a0
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.6-r1 b/metadata/md5-cache/net-vpn/openvpn-2.4.6-r1
index 4c1c1777a316..44bbc4d43b2d 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.6-r1
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.6-r1
@@ -7,8 +7,8 @@ IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +p
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
-REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
+REQUIRED_USE=static? ( !plugins !pkcs11 ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=https://swupdate.openvpn.net/community/releases/openvpn-2.4.6.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.6/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d81a5b0db4ced03eb7d854566a67e160
+_md5_=bf9cb351c24c5ce5c597bf9096723e0d
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.7-r1 b/metadata/md5-cache/net-vpn/openvpn-2.4.7-r1
index 0b82ce88388e..1216452c3610 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.7-r1
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.7-r1
@@ -7,8 +7,8 @@ IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +p
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
-REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
+REQUIRED_USE=static? ( !plugins !pkcs11 ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/openvpn/archive/v2.4.7.tar.gz -> openvpn-2.4.7.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.7/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dba8dcd7074fcb8fac382b0310307e0e
+_md5_=60bf05fbd6d5f200acc7e37cea40a483
diff --git a/metadata/md5-cache/net-vpn/openvpn-9999 b/metadata/md5-cache/net-vpn/openvpn-9999
index 8dd4c0b1ad6a..6f671f439363 100644
--- a/metadata/md5-cache/net-vpn/openvpn-9999
+++ b/metadata/md5-cache/net-vpn/openvpn-9999
@@ -9,4 +9,4 @@ RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( s
 REQUIRED_USE=static? ( !inotify !plugins !pkcs11 ) lzo? ( !lz4 ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b01d7d3e79ba3e215371844636a035d
+_md5_=7de206ae0fb104078036c3e077668565
diff --git a/metadata/md5-cache/net-vpn/tinc-1.0.35 b/metadata/md5-cache/net-vpn/tinc-1.0.35
deleted file mode 100644
index 12320a72abb4..000000000000
--- a/metadata/md5-cache/net-vpn/tinc-1.0.35
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
-DESCRIPTION=tinc is an easy to configure VPN implementation
-EAPI=6
-HOMEPAGE=http://www.tinc-vpn.org/
-IUSE=libressl +lzo uml vde +zlib
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
-SLOT=0
-SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.0.35.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=878455abff8d4028a5b4605614f34574
diff --git a/metadata/md5-cache/net-vpn/tinc-1.0.35-r1 b/metadata/md5-cache/net-vpn/tinc-1.0.35-r2
index 4c7d5bbae585..708674fe0398 100644
--- a/metadata/md5-cache/net-vpn/tinc-1.0.35-r1
+++ b/metadata/md5-cache/net-vpn/tinc-1.0.35-r2
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
 SLOT=0
-SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.0.35.tar.gz https://dev.gentoo.org/~dlan/distfiles/tinc-1.0.35-upstream-patches-0.tar.xz
+SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.0.35.tar.gz https://dev.gentoo.org/~dlan/distfiles/tinc-1.0.35-upstream-patches-1.tar.xz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=a43802f38cede808a59c86230fbfda54
+_md5_=22b1b6c72dafbe6e6606937311ab0bb2
diff --git a/metadata/md5-cache/net-vpn/tinc-1.1_pre16-r1 b/metadata/md5-cache/net-vpn/tinc-1.1_pre16-r1
deleted file mode 100644
index ec14af713d24..000000000000
--- a/metadata/md5-cache/net-vpn/tinc-1.1_pre16-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=tinc is an easy to configure VPN implementation
-EAPI=6
-HOMEPAGE=http://www.tinc-vpn.org/
-IUSE=+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.1pre16.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=d4b0a6cf7f23fdb2294e97b4ed141ab8
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.0.3_alpha b/metadata/md5-cache/net-vpn/tor-0.4.0.4_rc
index 81b36068d5a7..dab215eaf834 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.0.3_alpha
+++ b/metadata/md5-cache/net-vpn/tor-0.4.0.4_rc
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.4.0.3-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.0.3-alpha.tar.gz
+SRC_URI=https://www.torproject.org/dist/tor-0.4.0.4-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.0.4-rc.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
 _md5_=8499a9d533e2ae44ac2a4de9aaf2ac96
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20190227 b/metadata/md5-cache/net-vpn/wireguard-0.0.20190406
index c9696be446f4..d355b8bd9b07 100644
--- a/metadata/md5-cache/net-vpn/wireguard-0.0.20190227
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20190406
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-2
 RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
-SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20190227.tar.xz
+SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20190406.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9c45b8dbcaadaacf722ad1ffc3d6e5ce