gentoo resync : 23.09.2020

8 files changed, 11 insertions, 102 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 87c49d8d8c3f..cfebe9457d4c 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/corkscrew/Manifest b/net-vpn/corkscrew/Manifest
index 0bbcb5b297bc..c82f12dfae83 100644
--- a/net-vpn/corkscrew/Manifest
+++ b/net-vpn/corkscrew/Manifest
@@ -1,5 +1,5 @@
 AUX corkscrew-2.0-crlf-with-authfile.patch 666 BLAKE2B 589586fdc113c5e7467c591dd3cc9300dcc536cfa230fdfe272c931e830d889ebcd43aaf0f0eb4dd245c04daad8cb195bbe53ca93dcbaa6183940d27dc349a75 SHA512 030e5a0b176e9f7180bf737b70e230b06565a80e10106c4bcd444a9e7293286068a0192401dda8886479fe68b6c644350aa2d047f655e846b22204a248605b9e
 DIST corkscrew-2.0.tar.gz 56749 BLAKE2B 4685b373af3a6d19cbd50b42c7fb421cd1c9b872d9682280aba52933869ba723940e959619f6f6d31d93f117d8d1803c79bcd50a86edadcd66a9ffd1df84b3f0 SHA512 bfea81064601cdf67ba1730b49e3a5f7aa377423edbfb052ff0f6b2776b49e104852b7f126f4668d37541a706313ef37d9b4535126e94bb202db4ac38f693e6f
-EBUILD corkscrew-2.0-r1.ebuild 1246 BLAKE2B e41b238395dd4c0dadb4c59d3525e732bdc03cca09f7cb2ba371182cb4110ad2a4afae162bcde704f027b4f7bbe6991cfac01836313c77a0a0c777dc00b579c8 SHA512 a35120c8eee1b4f865a93b08900f2c398002163b089b9708ac0c71bc5eca23cf36483d65a654808973d728fc46aec693ee2b9deb39cc4a7793a86571e58fe1ac
+EBUILD corkscrew-2.0-r1.ebuild 1245 BLAKE2B 43d68a47533f65e2dbce0a54db76e533f09aa7a7e98824326f87b1957d419176717674f8e404564eee78cb2acbf0d97f88a70541b1b4935ab6ae26b2d1a1fbe5 SHA512 1a5db9413b97892978cfaa73cb00a359dd688a3b0d6a6153f9738b38c8b3921ac6c68361a673ae12dd8468086370335189c20ce95baf18f2706e622feb3d440d
 EBUILD corkscrew-2.0.ebuild 985 BLAKE2B 156f288df81e6d554f4c34a548d6bfa074e0042e75c261ad0bb5e5843c555a394e04dacfc840b090245c45c496b19010e76e56fd9c5f94cef6df0cf3589eca36 SHA512 f8bee38825cf415c8af32936cb6537968198c1b5a9e3619e6863b8e3bd41b1b8e6ed58943878be84077ee3220d328fa7c9afc6de812fd870e95aa79e0d12523b
 MISC metadata.xml 393 BLAKE2B 24208f0e307707f49ad8ad3c9f24f5e4b21c3b8750f29607ea2a644c4998fab9d6e27b30a95a9d37d10d5662d70c796b842bd3c8cc13a9435beed09b79f4676e SHA512 3a8fb57c70452056885eae869d55a49d29edb4c23f524cfc5b35b9ab8023a1084cbc11c3f16dea27d9f153845d27bcc1b1539f59b5fd4c2e4aac87e6b322b8d6
diff --git a/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild b/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
index cd46ea513c7d..3731eacafb6e 100644
--- a/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
+++ b/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.agroman.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
 IUSE=""
 
 DOCS="AUTHORS ChangeLog README TODO"
diff --git a/net-vpn/logmein-hamachi/Manifest b/net-vpn/logmein-hamachi/Manifest
index 68cd76668581..c9e08149ee4d 100644
--- a/net-vpn/logmein-hamachi/Manifest
+++ b/net-vpn/logmein-hamachi/Manifest
@@ -1,10 +1,10 @@
 AUX logmein-hamachi.confd 412 BLAKE2B 64ad81629295dc1130a71160c19add6b6d59b22d500d9a06e8dbe77ed617496a6a96fc06f81009d7243b29959cbbdc87f8f76ce928e0177bcb8ad875c967270f SHA512 b1f654eee311edc9436d80f1b2edef0ce6ff4f7258cdf84cf7abbb211ddd9cc177f974d60a80592ecfb284ecd7ffd6ff32e5e976b07655beaee530b7605c140e
 AUX logmein-hamachi.initd 1583 BLAKE2B cf5a41f00458b24d69e8ed37af03b7bfe85f41a3ceb9501fddf8c5a0a53363efdcf3043b06a6c6fbf060001ace726586a220e13e044813a07185dc89b77f3bda SHA512 9c366c76c5cce88127cb7c2ef2128b34c84b77f15e840163a7c5452787ea02e41c297ee79a7f8db3fe9ac1efd9673fa7cb8f0a2493b3b1c359a99806976c8496
 AUX logmein-hamachi.service 185 BLAKE2B cca9768ae21fc29e072914f1d83020676e67b3f92d3d2591545ece49cd11020d3bb4e804f2d15af6a7eccde4ff04a663a83e1827fe1746feb91f3ef16a69d614 SHA512 cdd5b2f2f2c7df88322c22eec7c050eb5fb2495b57a47526063f0f529d9cc51fffac7ecd19fa9c20ff3da95741008f4ea583d87b45f4267bb204b0342e8eee90
-DIST logmein-hamachi-2.1.0.174-x64.tgz 1367599 BLAKE2B 338ccdcf8ab6d94bd689908dd22522c34a3a40206181dd175d9e40c42bbb6d7d2073378955e37ec1e884dcdc0013c8a9eb8ee83978d93b8fabc3218bf16a181f SHA512 d1d81a15f209361f66636035f7fd8a010657dbc0712a56ae240e102f083e9b04629c852cbd4259229166c297a1cd116da07e5bdeac63795cacba8fd7e3021050
-DIST logmein-hamachi-2.1.0.174-x86.tgz 1290587 BLAKE2B efcb3629097822360c126a4951293f43a885925f9c273e0f70b71f6613b6c7b8d78253e5d0d1a9f63218536359d92095b60ceacff2579854f0102c44c8dd7d66 SHA512 0f8da40d6508dab71680a74065649d51288c345849f74c7e2682040b720536f5324d142690aa879f9c5e8f1717654ab93357f4b960a567f5b584609bd814e82f
 DIST logmein-hamachi-2.1.0.198-x64.tgz 1332004 BLAKE2B 72447c4a87e32aaafc424abcfece72645881e8da0cfd20f12e6e4f9470005c9f735588269541c1ef12cc92cf287cd7804f14ec32e56ac860e6d034271f688b9d SHA512 7ac7fb64c2ae1864f023138778f05681f852a5b4289638ca4905bf9c4ef7612e657b3641193abf33900e145c667391e9d438aadfcdbc710c0be5790816777d8f
 DIST logmein-hamachi-2.1.0.198-x86.tgz 1242014 BLAKE2B 41c2efc83f2dac62b18286a10f219e9df479473b403f10ac2306350694435804725e91053c841ac06b4414264071e39dbc26caaeea500de8815dce681a01aa5b SHA512 67a465359ebe11c572308f38d6a0221bbd61b1a96eddb5235c112db6c060f392a9d05cb88b7ef82d6011b468e89bc72269e39bf421b656a815df4c9c1ff19113
-EBUILD logmein-hamachi-2.1.0.174.ebuild 1669 BLAKE2B b4b031ce5e00c633952744c35a443b04f2ca60133774037517b925b30ef3f5bfc9e560f4d2f6454dfec9e9bc9c2b7d9c70826135d562943067ca2416e3a2aa23 SHA512 16f838c84b2263ff54b145327d7cecf6911a199cea6fe2931bd9fbae35ad24798601933168ccd28b9e991a4455cfaef19da4ef2613f9d44b4539f6262381bf95
+DIST logmein-hamachi-2.1.0.203-x64.tgz 1622719 BLAKE2B 7be3e4a496adaf5a42c1d16fd8a50c9d079da8d729de4cd1c7c203ffd5315423c222f5ccdbd54058a547168f2bae32df80f8f191e2f91e4dd77aa8516eeaaf0a SHA512 f34d65792162003f230d0531faf7c64aeacf6b7014c1266f07657d81c6f9d9bcda78e08c7d2569bc358574017a5f43ff99c247c86439739114b821ad5e40110e
+DIST logmein-hamachi-2.1.0.203-x86.tgz 1368703 BLAKE2B 686149ccf57683d1a6ecae5d8f8dd16d793156fd5c3e95556ca4e12e9138f4bbc0eee1f4785ff684138a99e38a95156afa9e48e7587ed02d9fccbae7e8c9043a SHA512 b153dba334cf04abb9662c4c1fc576388bebdf0af303549e25c65536b3601f9c90e2a4c986898979d2abfc9fca2d31943e787d4ff3b59fc7147c2a1a1a1fdad9
 EBUILD logmein-hamachi-2.1.0.198.ebuild 1664 BLAKE2B cb03a1abd93e042fd0d2e21a4cf47660a3b7e4ce14eeaf3fca072a8ddd6c36b6ace2e553e0a206b89c59811a6deb8b956bc4b788a8b28f6bc7137cd66c109a19 SHA512 1e927d49e4ab0011d72dcdaf991ea47c654214d551a9b6f3e2d183c7476e5b9a217ccc692164eee17edc113053965df57215cda687ac60e5cb2027267e54e6d9
+EBUILD logmein-hamachi-2.1.0.203.ebuild 1657 BLAKE2B e847ff57a7b19bcbed8e820734a97684b67895d93546b17e5e430e2103368677dfe5d3f509101b03c28528328bda40a0818337b067de7178f3b74e735843fa23 SHA512 ffb6235dc8a0fe623beea21e413c005134e8f8d4e378f915cae675ef7c6de123d4e8b4b409b7a05fdd6fc8ccae0b9d88beb41dcc76b7f62800cf4f9fd18f6bd1
 MISC metadata.xml 369 BLAKE2B fe6662dd57c22af1cc6f1457203b94700d4aaa9823a69190a0d5e48ddc9f373d3ea4b82db3aa74d9f988aa9bd7e72b440b5098260c251623ceded717c5be3f19 SHA512 4fb68bdec268ebddb8fe16a71631f9e42c1ff45ee77e658840e5a336284f72b8dc4c0cc9ea3fc7157dcf9f78a5d5ddc885caaf5f549a699629aef42796a529f3
diff --git a/net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.174.ebuild b/net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.203.ebuild
index edef3a07d1af..e1358b40444d 100644
--- a/net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.174.ebuild
+++ b/net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.203.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit linux-info systemd
 
 DESCRIPTION="LogMeIn Hamachi VPN tunneling engine"
@@ -9,7 +10,7 @@ HOMEPAGE="https://www.vpn.net/"
 SRC_URI="x86?	( https://www.vpn.net/installers/${P}-x86.tgz )
 	amd64?	( https://www.vpn.net/installers/${P}-x64.tgz )"
 
-LICENSE="LogMeIn-2013"
+LICENSE="LogMeIn"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 6e3beee35970..c0f3c4bf635e 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -4,10 +4,8 @@ AUX tor-0.3.3.2-alpha-tor.service.in.patch 305 BLAKE2B 6ed92587a7f4ba3e40837e911
 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
-DIST tor-0.4.2.8.tar.gz 7610427 BLAKE2B 5b637047f4944e97350ef1354f61ed6ac611a1660a61a4a44d3706abb0ec12af121d35ee10023c627a1a7d175490ef854c0a99d17268756eaa7d626926ef245f SHA512 599ec5acd51a84b56f023458f71d35ea622390c4500e77f8a7ff416930e76f2ef3ec76402e971eca366d1f03aac4c1f6ccb8e9ab69e98f1d4b111d52731b45f2
 DIST tor-0.4.3.6.tar.gz 7745954 BLAKE2B 3b04b2c79281483ef72421f8f5bfbc4f48358b6d38c151470eea7ea9bd2666e7098fe3fb0887d551f796443718791a3a464b007669c96e6bbcce7d7fc4c25d3a SHA512 f4ab0788d27b3eab40853dde31eaf087ac84616fc3488973e7d01f4dbd3e71ba6ce3a3afcf0c6272223897d0a9c1556aa26dbc4d9b98cc5b43dd729d20a2fcca
-DIST tor-0.4.4.4-rc.tar.gz 7795842 BLAKE2B 0e6774815208a6f5531671bf270caa009a6336f38f611e34244835c2f8fba7d884cf60a53221984665a44229e8b828330b258c9dd3b5ac99c80c5c801d159f31 SHA512 73ebc346ba3deb118efbd4d8f1a48fdb700c65723acb211a7ec16d756c12c9171f4d5bb8ae07862a337c77cc7e20f44dbeef5c2232b4973f0a47be623d9feb6b
-EBUILD tor-0.4.2.8.ebuild 2281 BLAKE2B feb38bdd43a223cdad0544ccb9c3b6bfa090070d7653fd01679b2a271237074715bf5da25f2d9304c66d03a69a274c9c9d2273d37e484ffc228a58c66634822a SHA512 f2801fd1f4b739df5ec280925b1a3f83ea2436d3afed1abbdce1e7750f5d6f3dfd647b865fba460524b3b18b1692a47c152b934fa750c60365592420587308ab
+DIST tor-0.4.4.5.tar.gz 7808696 BLAKE2B b1c7342d5f1998b372529a8da1719a4f31c4e2516f9b666755b0edf29c7d66fa84a730fceed11e5c0bd1346f6fe06d7c96dd6a2161b0b2c3824468cd2f88f077 SHA512 8b7bedf998c66b33cb7b248ef33eb551dd75cca7eabf2133f716948d5bc83408d0be2ec1968e1c860b1067746b5645ea6e8f23478458b5eb2f5573ea7ecaecb7
 EBUILD tor-0.4.3.6.ebuild 2363 BLAKE2B e42103419090a96fde8c77b9ab4df41cc69d1411cea21d409b298b8c1913afe2c01bb88e8fca09a095a8c5ab0cee1dd6f2c7f1d5eacd223881bab5c58eb33ac9 SHA512 92bbb573a3303350652300beee5f870e083176397e7ce5f486544ec2e228e7e97829e445a38c72bb3a53d2588d5a2493b0a33a223e5a14fa830201d6da28af0e
-EBUILD tor-0.4.4.4_rc.ebuild 2402 BLAKE2B 2ddd16fb2589331bdca30872700afe444bc8f7b6165b190dd359b7b1d064fd63895e226b2759e72be088b7ba03ec753f9d3c258d96cdeab3de4bfcea4a072e95 SHA512 94d4a5287088bd3a4bcd700e983091d0c11d917a001194049d87ed85f0ac21c487c420f95302caeb69ebab7e434df4ea45a4b4d84a4fa1d2696652b482b22b85
+EBUILD tor-0.4.4.5.ebuild 2402 BLAKE2B 2ddd16fb2589331bdca30872700afe444bc8f7b6165b190dd359b7b1d064fd63895e226b2759e72be088b7ba03ec753f9d3c258d96cdeab3de4bfcea4a072e95 SHA512 94d4a5287088bd3a4bcd700e983091d0c11d917a001194049d87ed85f0ac21c487c420f95302caeb69ebab7e434df4ea45a4b4d84a4fa1d2696652b482b22b85
 MISC metadata.xml 603 BLAKE2B ec373768719960730196a7c66d762b8fb1d4b215d98ff963bb610f4eb2ccb5dde4134306bf467af9463de4640d1da50364dbeee31ac1b3facba0c484519d1f86 SHA512 c7877f120e63daf302fe3cf0b153a6a3488dffab7c05cb254a9a0c95a8b578bc72623bf12ed32790ef8abc02c692b445c068645bd1fb45b8478e6daa4e0a4542
diff --git a/net-vpn/tor/tor-0.4.2.8.ebuild b/net-vpn/tor/tor-0.4.2.8.ebuild
deleted file mode 100644
index 9002a59e9007..000000000000
--- a/net-vpn/tor/tor-0.4.2.8.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic readme.gentoo-r1 systemd
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86 ~ppc-macos"
-IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
-
-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 )"
-RDEPEND="
-	acct-user/tor
-	acct-group/tor
-	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=()
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--enable-system-torrc \
-		--disable-android \
-		--disable-html-manual \
-		--disable-libfuzzer \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-rust \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable man manpage) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
-		$(use_enable zstd)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit contrib/dist/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/net-vpn/tor/tor-0.4.4.4_rc.ebuild b/net-vpn/tor/tor-0.4.4.5.ebuild
index 75110bc4eea4..75110bc4eea4 100644
--- a/net-vpn/tor/tor-0.4.4.4_rc.ebuild
+++ b/net-vpn/tor/tor-0.4.4.5.ebuild