12 files changed, 15 insertions, 234 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index eb5fd6fb5d9c..3945dbec2642 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 13fe8ffb2ff0..a02b7f87c25b 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,8 +1,6 @@
 AUX i2p-0.9.47-DataHelper-decompress-fix-length-check.patch 1110 BLAKE2B 9e34a568f94baed130c6f9dd3cda2f6ae6e409d7c41bff8fca5226fa6e84d989b46e84672440c8dcfb861d237075093c8a7bfab50d7b2385ca376e11524bc876 SHA512 204150b938fafe5b521d381ed6c517624cec3b47d564d84ae21e7884d87348a3fd4387b193e466df5c152f6262e29e1e88f9f970a78cf516839099b16fd5938a
 AUX i2p.init 391 BLAKE2B e62a23021db61ba93adaf1ff9c2f0bb9372cee3921544c9ca498f3472dc64c700a0fb78d2fed9dafc0fa98c97670f67266a2e0f8c594c7c1352d15e1b23d7586 SHA512 12c69b2c5918a23219d84f2c1ded286ced6f78564241372bead318ddcb77876e90c800735f7ed6e92c03f69dfeb990ec43e40efd1e9ee32888b404d1e2e9643a
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9
 DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
-EBUILD i2p-0.9.47.ebuild 6219 BLAKE2B f8f9dec30525d43bad24a7972fa9df12746fc70b4bce1931eacb07eab7dfe771d50ccb7d651452e37ab88aeda25e7d40254fc55b1723b8496e6e90279f16dd22 SHA512 e5a3ff6e87e53baf70f9e1f77302b500572345d42bea2a6706a39d422c2529162d7678237e7decd6a4f873f8e38141d98763fbbfefe6c7d5eddc0ad9d91b05b1
 EBUILD i2p-0.9.48.ebuild 4767 BLAKE2B afe3a7ff68167e428630be309ee2aaa7241c8b07318ac0e736040f33366183dbdf49e2bdc0e80e9579b83c06e3373a0e7397d0aa16e82411d203a979031037e4 SHA512 dab89bf22336afad01ba285b64b893a22b627122c675697ca9d73fc9a9132b99cf0cc44fd3e009fdcdc1e819be5a3be2bf1b219a9b9133f0ef0560348fd3db6a
 MISC metadata.xml 739 BLAKE2B 68bcb6a0d90cad753651e15a66cf169d6a7649eecb25917bd03ca1489d7cfc7e49bf54f84ec05149689802f9ddedd4d6421a0c0281a4684a55b854e04e6c0734 SHA512 e161bd04600c577d14beef7e95a58da20661555a481a9993a56daaa0f219b15d1e2f5502464a407645973d84ed0092cefb172d8565ac4fca3b592dd412bf96b5
diff --git a/net-vpn/i2p/i2p-0.9.47.ebuild b/net-vpn/i2p/i2p-0.9.47.ebuild
deleted file mode 100644
index a775e06556d9..000000000000
--- a/net-vpn/i2p/i2p-0.9.47.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="A privacy-centric, anonymous network"
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
-
-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"
-SLOT="0"
-
-# Until the deps reach other arches
-KEYWORDS="~amd64 ~x86"
-IUSE="nls test"
-RESTRICT="!test? ( test )"
-
-# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_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/commons-logging:0
-	dev-java/slf4j-simple:0
-	java-virtuals/servlet-api:3.1
-"
-
-DEPEND="${CP_DEPEND}
-	dev-java/eclipse-ecj:*
-	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/jdk:1.8
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-	)
-"
-
-RDEPEND="${CP_DEPEND}
-	acct-user/i2p
-	acct-group/i2p
-	virtual/jre:1.8
-	net-libs/nativebiginteger:0
-"
-
-EANT_BUILD_TARGET="pkg"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET="junit.test"
-JAVA_ANT_ENCODING="UTF-8"
-
-PATCHES=(
-	"${FILESDIR}/${P}-DataHelper-decompress-fix-length-check.patch"
-)
-
-src_prepare() {
-	if use test; then
-		# no *streaming as requiring >dev-java/mockito-1.9.5
-		sed -e "/streaming.*junit\.test/d" \
-			-i build.xml ||
-			die "unable to remove ministreaming tests"
-	fi
-
-	# as early as possible to allow generic patches to be applied
-	default
-
-	java-ant_rewrite-classpath
-
-	java-pkg-2_src_prepare
-
-	# We're on GNU/Linux, we don't need .exe files
-	echo "noExe=true" > override.properties || die
-	if ! use nls; then
-		echo "require.gettext=false" >> override.properties || die
-	fi
-
-	# avoid auto starting browser
-	sed -i "s|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|" \
-		"installer/resources/clients.config" || die
-
-	# generate wrapper classpath, keeping the default to be replaced later
-	i2p_cp="" # global forced by java-pkg_gen-cp
-	java-pkg_gen-cp i2p_cp
-	local lib i=2
-	local cp="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n"
-	for lib in ${i2p_cp//,/ }
-	do
-		cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
-	done
-
-	# add generated cp, hardcode system VM, setting system's conf
-	sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${cp}|" \
-		-e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
-		-e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/$(get_libdir)/java-service-wrapper|" \
-		-e "s|\(wrapper\.java\.library\.path\)\.2=.*|\1.2=${EPREFIX}/usr/share/i2p/lib\n\1.3=/usr/$(get_libdir)|" \
-		-e "s|\(wrapper\.java\.additional\.1=-DloggerFilenameOverride\)=.*|\1=${EPREFIX}/var/log/i2p/router-@|" \
-		-e "s|\(wrapper\.logfile\)=.*|\1=${EPREFIX}/var/log/i2p/wrapper|" \
-		-e "/wrapper\.java\.additional\.2\(\.stripquote\|\)/d" \
-		-i installer/resources/wrapper.config ||
-		die "unable to apply gentoo config"
-	local prop i=2
-	for prop in \
-		"i2p.dir.base=${EPREFIX}/usr/share/i2p" \
-		"i2p.dir.app=${EPREFIX}/var/lib/i2p/app" \
-		"i2p.dir.config=${EPREFIX}/var/lib/i2p/config" \
-		"i2p.dir.router=${EPREFIX}/var/lib/i2p/router" \
-		"i2p.dir.log=${EPREFIX}/var/log/i2p" \
-		"i2p.dir.pid=${EPREFIX}/tmp" \
-		"i2p.dir.temp=${EPREFIX}/tmp"
-	do
-		echo "wrapper.java.additional.$((i++))=-D$prop" >> installer/resources/wrapper.config ||
-			die "unable to apply gentoo config"
-	done
-}
-
-src_test() {
-	# store built version of jars, overwritten by testing
-	mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
-		die "unable to save jars before tests"
-
-	# generate test classpath
-	local cp
-	cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)"
-	EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test
-
-	# redo work undone by testing
-	mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
-		die "unable to restore jars after tests"
-}
-
-src_install() {
-	# cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# we remove system installed jar and install the others
-	rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
-		die "unable to remove locally built jar already found in system"
-	java-pkg_dojar lib/*.jar
-
-	# create own launcher
-	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-
-	# Install main files and basic documentation
-	insinto "/usr/share/i2p"
-	doins blocklist.txt hosts.txt *.config
-	dodoc history.txt INSTALL-headless.txt LICENSE.txt
-	doman man/*
-
-	# Install other directories
-	doins -r certificates docs eepsite geoip scripts
-	java-pkg_dowar webapps/*.war
-
-	# Install daemon files
-	newinitd "${FILESDIR}/i2p.init" i2p
-	systemd_dounit "${FILESDIR}/i2p.service"
-
-	# setup log
-	keepdir /var/log/i2p
-	fowners i2p:i2p /var/log/i2p
-
-	# setup user
-	keepdir /var/lib/i2p
-	fowners i2p:i2p /var/lib/i2p
-}
-
-pkg_postinst() {
-	local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
-
-	[ -e "${old_i2pdir}" ] || return
-
-	elog "User is now delegated to acct-user, ${new_i2pdir} is split"
-	elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
-
-	migrate() {
-		local dest="${1}"
-		shift
-
-		local ret=true
-		for src
-		do
-			[ -e "${src}" ] || continue
-			mv "${src}" "${dest}" || ret=false
-		done
-
-		$ret
-	}
-
-	ebegin "Migrating"
-	local ret=0
-	chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
-	migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
-	migrate "${new_i2pdir}/config" \
-		"${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
-		ret=1
-	migrate "${new_i2pdir}/router" \
-		"${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
-		ret=1
-	migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
-		ret=1
-	rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
-	rmdir "${old_i2pdir}" || ret=1
-
-	if ! eend $ret
-	then
-		ewarn "There was some file remaining in ${old_i2pdir}."
-		ewarn "Please check it there is something of value there."
-		ewarn "remove it when migration is done."
-	fi
-}
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index e69d9c448266..63ae6257aca7 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -4,5 +4,5 @@ DIST strongswan-5.9.1.tar.bz2 4590867 BLAKE2B 1515764352e7473c47f853a5aa68e582d1
 DIST strongswan-5.9.2.tar.bz2 4607281 BLAKE2B 84f5457bc970f49c9bc99d0ef41182d815e39b8a88be349ad0a78b531a983d3b3919d5c9f3b97793b0b2569f2c6b151cc3b5d9b145a8bfd663db6f79d8ff3dd6 SHA512 dca30b9be7847e0af59d1526c2e38d440b6729055cb3f0f0637d50d7381df465c7b59e79662efe63870a7a5a44eef696c02231274d2764f9e3c430ce2fd694f6
 EBUILD strongswan-5.9.0.ebuild 9527 BLAKE2B 2ef6b0a313b9fccdd5b389f09fc0cb46f1bdbcf72888ee026e194aa7abd595e034591ffd10db3e75109c18a1779cde184e2e51572a3e1aaedcf1ceaa841ea1f0 SHA512 ae80168f8334a9ea110a3e7ea87e083a530f4219f1d687dd0559318ef189d08333872758f0987bdb8f2e2e538a8cd4c434d1bc8ea07aa427bf6de77803daf1ae
 EBUILD strongswan-5.9.1.ebuild 9473 BLAKE2B fce96a09c5ea4b6c9466f82b9707914ad6333a414b9866634827c4fbb6e02c67988e518140ce82c7fb2156d53f59cc9e45dbb8eacd4c6f93387ad7cccf0153b4 SHA512 657a5d92574c578cb14d9c0b34998681d57a86f1b9fc4b2edc98c056f3a98a0eb594b7c7e8e867172872515fae04367ab55a11583564588d9e3c580e0f072a1a
-EBUILD strongswan-5.9.2.ebuild 9477 BLAKE2B 5c349ef3bd082d1355a2cf351b9a7e2c396784d523fbd087774bcd66ea8f8921375dff66e25a947a795aa9f451fe800fb555c899f7f845f40d7ebe19b02a89b8 SHA512 36ad69b00784154ea907d1b5e1b3f28b8923ab6238d351bd41eeb2ab9463d9706bf2fe00b6afc9b6f87f05685091fc7ccaa745941b8d77d9262e8841cbffbc11
-MISC metadata.xml 4228 BLAKE2B 113700b03d706f7ca76cfb67c45dbd5a703f6c45aca08784f7665807c30d5539a9f60d42beb96b72618bbf3587238a3fa7f5a21c8c34550e8bd7f30f72e84cbb SHA512 86c2718a8db2da6f00f9c15bb3b0c7f72af5d6f86e977aae46a3f6a4bbd861e4d30dba15459cfa21fbb484a5818fc32183bd935acce29f30accdcca8b7ae31c9
+EBUILD strongswan-5.9.2.ebuild 9473 BLAKE2B fce96a09c5ea4b6c9466f82b9707914ad6333a414b9866634827c4fbb6e02c67988e518140ce82c7fb2156d53f59cc9e45dbb8eacd4c6f93387ad7cccf0153b4 SHA512 657a5d92574c578cb14d9c0b34998681d57a86f1b9fc4b2edc98c056f3a98a0eb594b7c7e8e867172872515fae04367ab55a11583564588d9e3c580e0f072a1a
+MISC metadata.xml 4148 BLAKE2B cee80f9768668f9c455b812471498725970cef329ab4e36d727d3a2201980944a251286cf1d26ff3195c770a2709b3b8a484f5c473bf75acf4d9b9eb82325d60 SHA512 1a093806557dc1f9d40c2221dd1fe11900830008026218864e6cdd463218c5d876911ef78d5c21b6d9f9226dcce1c71acdc270f9a8eabdf1847e61c975ae24ad
diff --git a/net-vpn/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml
index 8cb9dd1387bc..06508eada0bf 100644
--- a/net-vpn/strongswan/metadata.xml
+++ b/net-vpn/strongswan/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		StrongSwan is direct descendant of the discontinued FreeS/WAN project.
 		As an IPsec based VPN solution which is focused on security and ease of
diff --git a/net-vpn/strongswan/strongswan-5.9.2.ebuild b/net-vpn/strongswan/strongswan-5.9.2.ebuild
index 04835d9001d0..b7b28afa8ea2 100644
--- a/net-vpn/strongswan/strongswan-5.9.2.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 2d54c1ca0cc3..474e6da63729 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,16 +6,16 @@ AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c19
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
 AUX tor.service 1050 BLAKE2B 7f6553b9f4b928f0c924d73ee6f9df8a99ee75ec1801f6b865a7d8e40ff30290bf836907b561586d0f429b7ddf05286ab51974d207906a0fe52cb2fbcc8e160f SHA512 786481b20d7cab9696656c5136ff74c9c2aaa73ca3d63b163a294b9b3c4b628da387cb5ec3ada81277ca81cff16ead5162f3b4d64cb0d773c22f2e4607c3194b
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
-DIST tor-0.4.4.8.tar.gz 7699461 BLAKE2B 4d314cefdcf49d41367764028ed38b5acb320dae73601632c7ed8275d65f84e98cd34cbb2c3ee9c89782473d380a3c9d196bd6283800d031812b8a0ed3b4f89c SHA512 5a0063afa7ab89e4b3a8ec281650e947c445fbad709fb79aa155ae6a487a8131b98ed6246f0a6c2902c8bb6749551c1e80016f710e3cb3d3a380d3f8b365d8c3
-DIST tor-0.4.4.8.tar.gz.asc 833 BLAKE2B b69ab73743b5c18eb006113fe0ac561f6b44536bd6e320015dc1aada7592fdab9a5d5a36efe5e878623f424154fe67475424d3572446ee546c25b22494ad82bb SHA512 50280a788a1751c85f22080e933b6c80820f01003b23e9eb788b952ed0a6ced5374b2e927cec4d287cef7ff27ca8d86da93d3e7af7351fc6e1a8160fbb49c60a
+DIST tor-0.4.4.9.tar.gz 7723996 BLAKE2B 4d24335592a53f06040425cdca71a0efb15da475255f8aa33bee6e802847713a45f74866c59e2d5ce91f79153032bf21bf362c35d9b5ac8c17a1ad78a44525c7 SHA512 c2864c8c81c5bf0c6825841bfd6be3c1879e29b4796921b12304f094c9e889fbc60c3e0c2ca23838ecc9e153b7c9ba47052f3d692ce2e0f408f0a7b708961877
+DIST tor-0.4.4.9.tar.gz.asc 833 BLAKE2B d47cc35a6d6766e98d7c486aec63c1c407ef1f5464c5718eabdc3c26f03ffa011889e569bce5a3914ee8857ddcdd7bc8f4163ebcec5bd7100bfb07983b3cd6ab SHA512 0e2c5cb6667fd5f786c19e47f6f8d146e93e74496585fb89f33b546eb7dbddea268a89d049c929e694e6114034341624a67ed0e0926fd634cf3ecd1b8a5da584
 DIST tor-0.4.5.7.tar.gz 7816158 BLAKE2B 839a81b237e29f12ace8be518d6aed87dce8cc162f8e0701480676996ebe76ad1093f785c8148484e3f14c6bae01499a1a3434d07c465aa6130c18fcbf66236c SHA512 1ca0e35eff5b344ee416de4cb958d7f04d4e5e9f2efff524576b1fc3c2882dbc068d35f25670e7efe5fcb51308b165393b1078fc46585ec6d40052daa0628a05
 DIST tor-0.4.5.7.tar.gz.asc 833 BLAKE2B ede473bd1083acf96c05a1469651a89bc38147f8cb82eaaa4bf2eea8731b1a7a05ccf7d26c59bda51cb46e3a9e762c93a813d05a9e07f24b6d8edb65c4a4e079 SHA512 f41009b3683584a2a6df2609f2bd6b134d5cd02547f53a60aa18a847f3aa8e9a1b0edbd45a52930ba15b19e48c7d6d80a94f8be69a3e4b4e1c39acc810cfacee
-DIST tor-0.4.5.8.tar.gz 7826458 BLAKE2B f81f690922ce2e46083706dcf8173720e95274878c17e2b2754d347cdfb4324d2c3ac50c787b501b37e00dc8387a7d6d44dc2d4e85b7afeb61964fbcdcf4d7b1 SHA512 f5cb32f5d0fc333aa1607370e290e6be85230896bd26e00072a68db4b32293d5dd38cccb57e92941fbe6ac17fb4207c38d11e3095ede289c3a6ebbd64ed70119
-DIST tor-0.4.5.8.tar.gz.asc 833 BLAKE2B 80be1b4981771c797b15cf695299c32e68acc4fd5e880d794479956fa75604088cd26f7e99e1a11e10290786b00ffa40f099ac11b9a75d6bd557ed30caf3d605 SHA512 3fd05701f908434eed13970abe989182b9b6af0e4824d1d258a74ce29230a928b06d88d5c398d7031d71048fbeb46185a9d76d8a5d239ee3c58cf41f90ae08c7
-DIST tor-0.4.6.3-rc.tar.gz 7734759 BLAKE2B 13f96813db9aa77416b0c5a9031b84ea4a42ebd1d4c6b2740f009bbf10fea3f49591a307fa8992007d6b92413d755875d74d478e8192284f32e692f448180bc3 SHA512 0d9d400e0d61a15ef801b430e0acb7eee369fdd62b78e450759d2fa08363e78bd2a301ce87796a37ab8630ce4669021b5100dedc1ffb983159893b1769d01a61
-DIST tor-0.4.6.3-rc.tar.gz.asc 833 BLAKE2B 15b614758f719916ba38a1a70f99aff3d14d8b38105963edf708987dc383d9157024b1dfbf7e248a6275bab33cc1a8d599a14a08e29d4d9986b9b0ffbd3e93d6 SHA512 1fc31fd4cd4c1d40e25797b0bdf2408bc81ea664e31ec21961b81f25d13b4ddbe7e6db9a50c52e6f5492d7177817e753d7bd3383ac6486e6f8d6c01bdbb2ce8c
-EBUILD tor-0.4.4.8.ebuild 2794 BLAKE2B 561a2af6b4e64dd50cd04f30a8fb5a67e56d6759a5d6144c19db21b914e9d5be44947d897769a4f8f3d2b6ba7faa73e9d0f36caff73ff14e10934014f0481059 SHA512 3b6b96b82ba712d4258818cce58a51baaa097ac2c249ba51ed53e9c689ccc85fa7e43ee44c62919911c8474eb106ea1ae5384272e2751cb6331954b315221dfc
+DIST tor-0.4.5.9.tar.gz 7840294 BLAKE2B 75babcbf7929fa34034ad706df1189ca7988e8c5db30f7051a5a006d8bb61afa7ebf7d0f7441e3ef1df1bc777cd80dc165c1d481d65a695c315b8820f8be392a SHA512 b3c3b5cce30c881fb1e705ec6183513f625ddb9d076671b9cd6299e81a410bc12f59a30677636371c336e397211432f0831bdcb2105c9aed8dcb608eae54e2b2
+DIST tor-0.4.5.9.tar.gz.asc 833 BLAKE2B fca3769b683e8bb90540026dda6d2f302d499262c806f7c7215e7a30908cd46b807717fd130380d114660380166852f6a0cbb702966c6930004d04098718d582 SHA512 df538981aa19a2fa730a1e357f277f22b3cae769a1d13fa1d920a5e949d5b3770a8de9883eeaf2522c8b24327f73505569ac0f6ecf77139ddb5ef1e2418924b6
+DIST tor-0.4.6.5.tar.gz 7754823 BLAKE2B bdff61863f8b48381cc52d66c54f417e90177118d6cdd1402f3ecca9783f32141f74bb979b4f8c919d9e2c6cd4373fd9a5e0e84498a26470af1fbc6eb2c7caed SHA512 62bcd8d446199cdd397a688d454730a057ef20be4152e6d0632f64df27c993c70be0dbde0a2e7679a8a20850371a503b8daf777296d555760d8aae3286e48050
+DIST tor-0.4.6.5.tar.gz.asc 833 BLAKE2B 966ab724e37dd341c3ef45f2aeb7e1c928270831ea790cb6cb0e77084a0c813d66ce35c5d31d49bf9d1e9a6ecfb3d4fb6ee4424fd83183d654016d22fcb90d7e SHA512 1cf9111ba08594c716874a2b6f35a7959c5c391518ec1e5b1491d84454f3fe1c705e06dfcfd23f30e0eb619063304c430cbebc9827190df0b03ec09cecd1773c
+EBUILD tor-0.4.4.9.ebuild 2794 BLAKE2B 561a2af6b4e64dd50cd04f30a8fb5a67e56d6759a5d6144c19db21b914e9d5be44947d897769a4f8f3d2b6ba7faa73e9d0f36caff73ff14e10934014f0481059 SHA512 3b6b96b82ba712d4258818cce58a51baaa097ac2c249ba51ed53e9c689ccc85fa7e43ee44c62919911c8474eb106ea1ae5384272e2751cb6331954b315221dfc
 EBUILD tor-0.4.5.7.ebuild 2785 BLAKE2B 806c5ed6f41d3f7e792127dfdd92d7d015a6f5b9cfdf182523896503ef86bc72a239abfd20f2badca408254a04e8b440e4d1f405794c02385a5ffcd9270bcbe5 SHA512 42a07d094edff6560f6b20c588ae6ec41ccbf20a5bc8dd3255badbfe2f09c07bb739356120ea4b6d4287b4b03652c17d32f46a511111d6040b6a8d8074676f18
-EBUILD tor-0.4.5.8.ebuild 2547 BLAKE2B c92a1e8d85cee22ca2f23781c433154fe7b2276e506adacb5213ba0262ab997b6d2c5b261895c1da3dba21c805483e475ce320f6c3cbd7ea627130aa9f4f4b3e SHA512 7d225ab54bce43b0d1028129141aae604092ec3a2a6f35ac4bf6a4ac107067a0c4b68266b3df75134065cdf38778a95b6c277175ea3074b727f15fc6ed1a546b
-EBUILD tor-0.4.6.3_rc.ebuild 2739 BLAKE2B e9f1b852aed9b3124be411c407f4c5686ed8645957b31acf1aedc349b3290cb0a745b7c28801fe19415c2a5531064fa596af50e3db0e0143aa0a883cb983ac31 SHA512 ae8ca192172d72aa4829a4760a6d4734e0895153eeb6fc785a98aea4fdbd77c094af1b288f3b5feec6db8a897a1d23cc59a5e842488bb3678c91b6e8175e864a
+EBUILD tor-0.4.5.9.ebuild 2547 BLAKE2B c92a1e8d85cee22ca2f23781c433154fe7b2276e506adacb5213ba0262ab997b6d2c5b261895c1da3dba21c805483e475ce320f6c3cbd7ea627130aa9f4f4b3e SHA512 7d225ab54bce43b0d1028129141aae604092ec3a2a6f35ac4bf6a4ac107067a0c4b68266b3df75134065cdf38778a95b6c277175ea3074b727f15fc6ed1a546b
+EBUILD tor-0.4.6.5.ebuild 2739 BLAKE2B e9f1b852aed9b3124be411c407f4c5686ed8645957b31acf1aedc349b3290cb0a745b7c28801fe19415c2a5531064fa596af50e3db0e0143aa0a883cb983ac31 SHA512 ae8ca192172d72aa4829a4760a6d4734e0895153eeb6fc785a98aea4fdbd77c094af1b288f3b5feec6db8a897a1d23cc59a5e842488bb3678c91b6e8175e864a
 MISC metadata.xml 549 BLAKE2B af6257c0e04c7487b23edb1f5c6fce91fbb76aedf9c0357bb4f214ff4af9d6055e0c6bb32fef5c9906f461f34b5631891a681a039612c73feecff8ff77a0a3c2 SHA512 2b9d9c20a9691dd67cb5ef98e386bea8cff9ba79208373922c5a379ca8c96e021e94748d7b85e860a24063f1fc439a3adee59b3dde70cf6b35401d18518b5689
diff --git a/net-vpn/tor/tor-0.4.4.8.ebuild b/net-vpn/tor/tor-0.4.4.9.ebuild
index bdb635b77531..bdb635b77531 100644
--- a/net-vpn/tor/tor-0.4.4.8.ebuild
+++ b/net-vpn/tor/tor-0.4.4.9.ebuild
diff --git a/net-vpn/tor/tor-0.4.5.8.ebuild b/net-vpn/tor/tor-0.4.5.9.ebuild
index b89880165801..b89880165801 100644
--- a/net-vpn/tor/tor-0.4.5.8.ebuild
+++ b/net-vpn/tor/tor-0.4.5.9.ebuild
diff --git a/net-vpn/tor/tor-0.4.6.3_rc.ebuild b/net-vpn/tor/tor-0.4.6.5.ebuild
index b58b53b2f97b..b58b53b2f97b 100644
--- a/net-vpn/tor/tor-0.4.6.3_rc.ebuild
+++ b/net-vpn/tor/tor-0.4.6.5.ebuild
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest
index d0fe9d1c6738..b905d048f6d3 100644
--- a/net-vpn/wireguard-modules/Manifest
+++ b/net-vpn/wireguard-modules/Manifest
@@ -1,3 +1,3 @@
-DIST wireguard-linux-compat-1.0.20210424.tar.xz 264200 BLAKE2B e1d96786d60489e85312f2927c0c5f8d43cccef9c4929856d9e892c91351f091e6a457e4673dd0c4987a614b9c13be4a4d9d485390c3a45fdefdad5dc7131213 SHA512 f3485978fdd5a1cccdd8ee269c223e805bc533b79189765324a383142934b12f4f6bf476147a09703fa674da4a1eaca13fe400553b27843dbf8da133ce19207b
-EBUILD wireguard-modules-1.0.20210424.ebuild 3565 BLAKE2B 60951d7183ea718b731a9a8d46f4a14ee699fccaed6f5aef151545cc37b7d9adb505a59105c697c8819fc0436ac0212284a2c45d63d953585c8d7c54993fa285 SHA512 31eb0a567b3480110f1d41a569acf705ed1f8e53e05529b12e2a21a74ae1cb78578f8769c00e219c788ccd6dce624ce58b57b0efeae370245ad1bb28723a26a6
+DIST wireguard-linux-compat-1.0.20210606.tar.xz 264952 BLAKE2B cc8368cf764826bbf9f76246faa8b1a366df0e2e65b14ddb52b663cc75ac5edf89e8da7646aa6b0ae952000289ba18174bcfdf0fa7ee5f6d9c81e2f5f3d6e114 SHA512 ef8ec9f3d87982bf24b7934d9eabe605391888955110b655baf26867c80b619f549edc5527cbc6098c1f385b977a5b5d580ccaa82129571a64133a40d072c9b6
+EBUILD wireguard-modules-1.0.20210606.ebuild 3565 BLAKE2B 60951d7183ea718b731a9a8d46f4a14ee699fccaed6f5aef151545cc37b7d9adb505a59105c697c8819fc0436ac0212284a2c45d63d953585c8d7c54993fa285 SHA512 31eb0a567b3480110f1d41a569acf705ed1f8e53e05529b12e2a21a74ae1cb78578f8769c00e219c788ccd6dce624ce58b57b0efeae370245ad1bb28723a26a6
 MISC metadata.xml 661 BLAKE2B bb9a48b3a4f3162f8ccec522734cbc8ffdc7a92868cc7dc32adc1f7ef89f7b2eab1df573bed421d4b76204f9f38ad4fee45f9db4b41c7dc3b86d9d9bb3120a8f SHA512 e9daa3bb8fa72cc60373a3187610231cf396bc5014f33412b65d069ffd02caa659c426819aa76d46a0dd15e8cb579325b46df5296a3b2136d020ec378e5f98a5
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20210424.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20210606.ebuild
index ce3824f93de5..ce3824f93de5 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20210424.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20210606.ebuild