gentoo resync : 28.11.2020

5 files changed, 6 insertions, 34 deletions

diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 44a8bcdc0ae5..493356762476 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/openvpn-2.5.0-r1 b/metadata/md5-cache/net-vpn/openvpn-2.5.0-r1
index 6242327be742..eaf9d3308880 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.5.0-r1
+++ b/metadata/md5-cache/net-vpn/openvpn-2.5.0-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=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
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) libressl? ( dev-libs/libressl:0= ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( >=dev-libs/openssl-0.9.8:0= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) test? ( dev-util/cmocka )
+DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( !libressl? ( >=dev-libs/openssl-0.9.8:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) test? ( dev-util/cmocka )
 DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
 EAPI=7
 HOMEPAGE=https://openvpn.net/
-IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls +openssl pam pkcs11 +plugins selinux +ssl systemd test userland_BSD kernel_linux
+IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls +openssl pam pkcs11 +plugins selinux systemd test userland_BSD kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
-RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) libressl? ( dev-libs/libressl:0= ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( >=dev-libs/openssl-0.9.8:0= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) acct-group/openvpn acct-user/openvpn selinux? ( sec-policy/selinux-openvpn )
-REQUIRED_USE=^^ ( openssl libressl mbedtls ) pkcs11? ( !mbedtls ) !plugins? ( !pam !down-root ) inotify? ( plugins )
+RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( !libressl? ( >=dev-libs/openssl-0.9.8:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) acct-group/openvpn acct-user/openvpn selinux? ( sec-policy/selinux-openvpn )
+REQUIRED_USE=^^ ( openssl mbedtls ) pkcs11? ( !mbedtls ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://build.openvpn.net/downloads/releases/openvpn-2.5.0.tar.gz -> openvpn-2.5.0-r1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=465f615abae736d9f78520154596157c
+_md5_=a9082a5cec48ea5547882c386afbcf1d
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.4.5 b/metadata/md5-cache/net-vpn/tor-0.4.4.5
deleted file mode 100644
index 3d4e53ce1a58..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.4.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd )
-DESCRIPTION=Anonymizing overlay network for TCP
-EAPI=7
-HOMEPAGE=http://www.torproject.org/
-IUSE=caps doc libressl lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd
-KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 x86 ~ppc-macos
-LICENSE=BSD GPL-2
-RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.4.4.5.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.4.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5d4cc994d846f9a7c10d7bcae844db51
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.5.1_alpha b/metadata/md5-cache/net-vpn/tor-0.4.5.2_alpha
index 4cd9d084f765..9c36a89084ef 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.5.1_alpha
+++ b/metadata/md5-cache/net-vpn/tor-0.4.5.2_alpha
@@ -10,6 +10,6 @@ LICENSE=BSD GPL-2
 RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.4.5.1-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.5.1-alpha.tar.gz
+SRC_URI=https://www.torproject.org/dist/tor-0.4.5.2-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.5.2-alpha.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fed13de8b6e4d700007f31bec93f9e16
diff --git a/metadata/md5-cache/net-vpn/vtun-3.0.3 b/metadata/md5-cache/net-vpn/vtun-3.0.3
deleted file mode 100644
index fe0f3e55bee2..000000000000
--- a/metadata/md5-cache/net-vpn/vtun-3.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=ssl? ( dev-libs/openssl:0 ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante ) sys-devel/bison
-DESCRIPTION=Create tunnels over TCP/IP networks with shaping, encryption, and compression
-EAPI=5
-HOMEPAGE=http://vtun.sourceforge.net/
-IUSE=lzo socks5 ssl zlib kernel_linux
-KEYWORDS=~alpha amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0 ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante )
-SLOT=0
-SRC_URI=mirror://sourceforge/vtun/vtun-3.0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7aeb9ef7bfd0eba0532a7b92332ea6ca