gentoo resync : 22.12.2021

13 files changed, 28 insertions, 44 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index c46e2c871fde..d57346bbdda1 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 7489d70a138b..a34ba2f66bbf 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,7 +1,7 @@
 AUX i2p.init 391 BLAKE2B e62a23021db61ba93adaf1ff9c2f0bb9372cee3921544c9ca498f3472dc64c700a0fb78d2fed9dafc0fa98c97670f67266a2e0f8c594c7c1352d15e1b23d7586 SHA512 12c69b2c5918a23219d84f2c1ded286ced6f78564241372bead318ddcb77876e90c800735f7ed6e92c03f69dfeb990ec43e40efd1e9ee32888b404d1e2e9643a
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
 DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec
-EBUILD i2p-0.9.48.ebuild 4767 BLAKE2B afe3a7ff68167e428630be309ee2aaa7241c8b07318ac0e736040f33366183dbdf49e2bdc0e80e9579b83c06e3373a0e7397d0aa16e82411d203a979031037e4 SHA512 dab89bf22336afad01ba285b64b893a22b627122c675697ca9d73fc9a9132b99cf0cc44fd3e009fdcdc1e819be5a3be2bf1b219a9b9133f0ef0560348fd3db6a
+DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
 EBUILD i2p-0.9.50.ebuild 4799 BLAKE2B 895096a59bffbff9345f8c8250ad92b5bbe30c58c515bf8be1f2380c1acf2cbd718a51d57a6406e217af969fe1838a7c51f6f517a09cf2c25d717551b92b0306 SHA512 e76c98981e9e17046d30ba626a01a30ed2e5be9335bea79417baac0a618a5c0b70b9e8c6696be30a0f88f38414e36ddfc112dc796a11ed6ccb48850eb34221c5
+EBUILD i2p-1.6.1.ebuild 4456 BLAKE2B 3900132797092a6277511c5c8ac435305b8f117caad8712163ab3fa5b0cd0ca3b2047d10b5e0332544c82ddc5a6d8efefefda94a72c0eb4d6e02a731c8b4a15c SHA512 162c9802f96f1a1845d08ec52e68925d8c7767e1ec06426243a2b2acade213e9fb347e3229cac6d355b15a0f4167431b60617ef4e925a6e71d2b626493bed579
 MISC metadata.xml 740 BLAKE2B 06a3a1b273cd25dacdedfb1e9dbb1a1ef5c32cf44bb76101ba521ac3b387533c10e111b76182a04e55d50a9bdf7e03f15101db768a63d03c02190c5aebe1f4ac SHA512 b598a77193edf843a205f4fdf22e779b978e26d1b3fcec9adc19e78783bbda15d53c66a55ef0b14fe3c25601f167e5f5f299fa0472ef3620dc46fd47c97ff909
diff --git a/net-vpn/i2p/i2p-0.9.48.ebuild b/net-vpn/i2p/i2p-1.6.1.ebuild
index 23715c60adf5..56ba991f558a 100644
--- a/net-vpn/i2p/i2p-0.9.48.ebuild
+++ b/net-vpn/i2p/i2p-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,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"
+SRC_URI="https://files.i2p-projekt.de/${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"
@@ -18,29 +18,26 @@ IUSE="nls test"
 RESTRICT="!test? ( test )"
 
 # dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_DEPEND="
-	dev-java/commons-logging:0
-	dev-java/java-service-wrapper:0
-	dev-java/tomcat-servlet-api:4.0
-"
+CP_DEPEND="dev-java/java-service-wrapper:0"
 
+#dev-java/eclipse-ecj:*
 DEPEND="${CP_DEPEND}
-	dev-java/eclipse-ecj:*
-	nls? ( >=sys-devel/gettext-0.19 )
 	virtual/jdk:1.8
+	nls? ( >=sys-devel/gettext-0.19 )
 	test? (
 		dev-java/ant-junit4:0
 		dev-java/hamcrest-core:1.3
 		dev-java/hamcrest-library:1.3
 		dev-java/junit:4
+		dev-java/mockito:0
 	)
 "
 
 RDEPEND="${CP_DEPEND}
 	acct-user/i2p
 	acct-group/i2p
-	virtual/jre:1.8
 	net-libs/nativebiginteger:0
+	virtual/jre:1.8
 "
 
 EANT_BUILD_TARGET="pkg"
@@ -71,20 +68,20 @@ src_prepare() {
 
 	# avoid auto starting browser
 	sed -i "s|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|" \
-		"installer/resources/clients.config" || die
+		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"
+	local classpath="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"
+		classpath+="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}|" \
+	# add generated classpath, hardcode system VM, setting system's conf
+	sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${classpath}|" \
 		-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)|" \
@@ -109,18 +106,9 @@ src_prepare() {
 }
 
 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"
+	local classpath="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3,mockito)"
+	EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${classpath}" java-pkg-2_src_test
 }
 
 src_install() {
@@ -128,7 +116,7 @@ src_install() {
 	cd "${S}/pkg-temp" || die
 
 	# we remove system installed jar and install the others
-	rm lib/{commons-logging,javax.servlet,wrapper}.jar || \
+	rm lib/wrapper.jar || \
 		die "unable to remove locally built jar already found in system"
 	java-pkg_dojar lib/*.jar
 
diff --git a/net-vpn/networkmanager-l2tp/Manifest b/net-vpn/networkmanager-l2tp/Manifest
index 37ce98df565f..a05a86164747 100644
--- a/net-vpn/networkmanager-l2tp/Manifest
+++ b/net-vpn/networkmanager-l2tp/Manifest
@@ -4,4 +4,4 @@ DIST NetworkManager-l2tp-1.8.6.tar.xz 446780 BLAKE2B d1cc532a5aafab6c3876c74ad88
 EBUILD networkmanager-l2tp-1.8.0.ebuild 1012 BLAKE2B 1beecaeb16823ca7bc7fcca4f237616e642279876192b171a9822375c24f56aeef99c2720faaaf904bb968a1c9fda241e0b398fc9be91c18a2c04251babc6c2f SHA512 0b5ee5a8ef5ca4b17db896ca4424e1427e12cb104707fdc1fab4c2b319b5c5bbea29ebc4de68e87740b2ec31ff588511c6d068511647509ff4701c34b8b16b3a
 EBUILD networkmanager-l2tp-1.8.2-r1.ebuild 1262 BLAKE2B c0f60d71ed6f56b2d224c9b242a9df450534ec30972a7af7d6e70fd6196af017254b017719ab3b8f880864004a6821a137a9465d6e3d87c4711aed7338d1dbe1 SHA512 8dba4d68f5cc7a9e603b718c73a4582cf76f3888cb83acc2b717f6468b6641191ecd4fde113e9f0c1e9646c18f9b5ed400c972f0a0c4a5ba4d615f99c25c9005
 EBUILD networkmanager-l2tp-1.8.6.ebuild 1262 BLAKE2B c0f60d71ed6f56b2d224c9b242a9df450534ec30972a7af7d6e70fd6196af017254b017719ab3b8f880864004a6821a137a9465d6e3d87c4711aed7338d1dbe1 SHA512 8dba4d68f5cc7a9e603b718c73a4582cf76f3888cb83acc2b717f6468b6641191ecd4fde113e9f0c1e9646c18f9b5ed400c972f0a0c4a5ba4d615f99c25c9005
-MISC metadata.xml 362 BLAKE2B d600efcc671a3c2d771b8f4a1ef2c7e3689256c8edcd012e1b0aa5f9e80dac83ab5cdac8daa2e2b0c88a3b7bbce6956380731fad221c07ad18ba5c78e4381ed2 SHA512 0f607950c52a84d9beadec48361ecd8016cc13d78a163d8414e51ece90daf0ef1c3d48273885f7bc3a0db845e5589849f1ff75b31109b90878a5860e8251b1b3
+MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265
diff --git a/net-vpn/networkmanager-l2tp/metadata.xml b/net-vpn/networkmanager-l2tp/metadata.xml
index 4e215cf3f71e..34f42ecf020c 100644
--- a/net-vpn/networkmanager-l2tp/metadata.xml
+++ b/net-vpn/networkmanager-l2tp/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 9c132a5b7559..ef444694be6d 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -4,5 +4,5 @@ DIST openfortivpn-1.17.0.tar.gz 166943 BLAKE2B f6372eac056ce0b9c1d3ea46d6af3d5da
 DIST openfortivpn-1.17.1.tar.gz 167127 BLAKE2B 4b8f9fb82c4f7c8ffcecf9f14c576d73c999712b7b183b74f9d60d59c67017080a3d16d95ae74fa7f07188e9b28bdf8384f9b41ea7a4ce8e24813044d27216b9 SHA512 9d8be1043833bfa0eba6e4032c767946e88d079d329f8039964ea659c4dffb54a5a3b2a6431b66bd86590eaca8bf598a110c368714ecd7ea00312ee97f329085
 EBUILD openfortivpn-1.16.0.ebuild 694 BLAKE2B f64b845c7ad2e3b71757e0ed2c0ec8dce68cf144e201979ac3a89cb9bf1267fc0e34277b1233c44ccd3e9f62e4f6c2189abf44815207c19c4bd98c15c858a80f SHA512 4d92182d916e1b732b9a973429a63d5dd66aa74dc43188da1795e4f80575adc286cf7b45af5401c8ed7d50f9f6dcaba036a4a31c42a086462378933601f6971f
 EBUILD openfortivpn-1.17.0.ebuild 695 BLAKE2B 3454dcfd7632f8754b0867ec187b4d36049c59ebbb9147493e3c2f499b0ac49f2e347916f229bea18ca235c4432fe7ace8477c37e9bc2c1957068b5b2c41eae4 SHA512 5d54c16219eea51d4700749cc635b6be09727cffb858695dfca028e8ef2ac979b1f64486387dc43e53b5a24d01c8312d6fa2e1a9fb982274e3d1ed847e8b3885
-EBUILD openfortivpn-1.17.1.ebuild 771 BLAKE2B 52693a48ffcc0c89f6043b7d0acc15a817a8881bd0f1613a926fd469626285f4399cece75935e71a67bad4ed7702ed1e2fb1c4fef33a105237c9575d90e8530a SHA512 c0bcc220a493d91c20d5be104a205cfa68a4081784b5fa9b1b8aca88cae26e1a31697d009d75d228fdf1a9bdba625647786eb662d45ed7b923daa0be6d9bff2c
+EBUILD openfortivpn-1.17.1.ebuild 770 BLAKE2B bac4a88892ed1fff57c2ac8d4a92c9085a700cee8b237beb47c68b5bdaad4c9b5851ab54a089a45c8a21bc8566cf748402695f16773ee395413a7e02220894b8 SHA512 29200739dd930e2719bf61a346ca074923322f757786c5b9f078788c49d8f96a323d0dd046807dbf3ca4b0503cbe129e8e82ea09c5da9a13b2474fc0c30ebd1a
 MISC metadata.xml 257 BLAKE2B f87135c9aedf98ef822404eb43e8214ed1e6d3cfc71db8d1aece9c3f8c30fda5b63f1de77b8d8d98b9b6b8d671e164199bcd810a34fe71939b836b164261ec2e SHA512 7719a7bd4abd3115b6279c4446e87c0c552f8b7dadd7429cbd8844ee2fe2509b712287f2d2e5926d6711dbe21efaebb289d187ebc297be770bb538f8bf799d31
diff --git a/net-vpn/openfortivpn/openfortivpn-1.17.1.ebuild b/net-vpn/openfortivpn/openfortivpn-1.17.1.ebuild
index 634f0884bc80..41301ba7f84e 100644
--- a/net-vpn/openfortivpn/openfortivpn-1.17.1.ebuild
+++ b/net-vpn/openfortivpn/openfortivpn-1.17.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${
 
 LICENSE="GPL-3-with-openssl-exception openssl"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	net-dialup/ppp
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 810d682c1659..cc6a78fa72fc 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -10,7 +10,7 @@ DIST tor-0.4.6.8.tar.gz 7796485 BLAKE2B 3475597c9f46c83c736bf5f3db2a4f44a38c4f4c
 DIST tor-0.4.6.8.tar.gz.asc 833 BLAKE2B 6f1825e3f5e2d70c5078d27990633137c7551fa80f5d202e56cfcb2a88d6b5b653ec6c349c7dc152f6c7313e6330182ce22a42be3f7aa63aced0586ee673addf SHA512 5000c111688d76d357c371532f7edbb01280273e5dc9bc18fa524517fcb1efda1403071536f06d61b8b8a73e26505d6e74cd84bd611f63f2a56e4b944f76b2e9
 DIST tor-0.4.7.2-alpha.tar.gz 7821412 BLAKE2B 04c4b8ed6378580a10d30738e8b85765e3daa7942c2bea0de9fe0103df47989477a41cb98e548a2a5392aefeab3667164a834b41d4d6025b3fcac0e03739bdf1 SHA512 b2f94f267f2fdab37211dbd1e00427532909bf9859d64abcebf45b28ed39cb781468445c48fc774f9028eb8551ca083d80ee407d9132f645765a9b4337215335
 DIST tor-0.4.7.2-alpha.tar.gz.asc 833 BLAKE2B cabd93d394e98a9013dbc2af983214effe89dd4dd7702dd17f1065c75d7da84bad6d493141e2c00576f8d9d119bbc4bb96ae6038139d72c3818e4ba79fe80f5a SHA512 00a32d0e8ee580d769a09a660f3c80674b6f70366bf426329a1c17a807a7dcd09b5f00aef1643f54d6a203bc928bd36d88793f2684665ac22841285d13c8bee5
-EBUILD tor-0.4.6.7.ebuild 2742 BLAKE2B f76a7e441ced00d2c5f8e935468b27c79eac0c15689c84cd6dd3946ab604d481f808b110d5854d7e4a6e6496e656595169b79c7e348a19999fa619a3bb747091 SHA512 1c2aed487ca4c116216ece04af1a71806f51c4858737b2aead93d3be2d40daeb56eeee5c15b5e68e127f6224646a77f8a2eb8b856f8d4aded89df4bddd45a4fb
-EBUILD tor-0.4.6.8.ebuild 2748 BLAKE2B 58f5ada5baad900c2693a457cee8d02163ff7e67cdfcb75f23476d838ac3241995b260f0241787c65d095a8fb28e206c2056c6af6e4532d5f92cd3c2bbf226b5 SHA512 4337b7031c3e51a8842cf3e6586d6aa701fafda7d49e9c259b573f83647a08147af530745720a93b273c299a9dcf92d22c02ba325873b5d608d6fe7ca05361f1
-EBUILD tor-0.4.7.2_alpha.ebuild 2729 BLAKE2B 5ee6a192a5bd2b07bef963adbb0b0827fec687b9c97060e354d508ecad774b1dedc28a01452608d38a772adb7d28b4287028f853f94ab9ccf5390d3ced1ecee1 SHA512 2b5154ccfd8b8006ae1ae13f9cbd28021cb1f302866623e8dd69acd451898dc5f59a5bf6f4f31fecd5d51833f6e92ff5c80b8751ad2e2401529d73e2f588afce
+EBUILD tor-0.4.6.7.ebuild 2741 BLAKE2B 8eb904dcb68d1e65d025f5a212c98ecd94f0cc9ddcd73b2efc80bf70aa44a967c600fd17c7ad909e5818263226fc0d82635b2fb4a1add8b0745dfa642140c479 SHA512 38a62d9b70588301762806663fa680c6fb5bddbe50504ed1aba0dc54b64c2d124780cccdc254d9140626e646eb10200741c85e7f6b6caa03c3c722b507c0532c
+EBUILD tor-0.4.6.8.ebuild 2747 BLAKE2B a7aca64064eadc60687b1595eb61e3a4fe7472eb74bb206d795bc7996742455302f5f1b3be3fae7aa2e229cda1ccbfd90abe903fcae4b44e1058c4aed5aa8784 SHA512 78dc27be6f1c05a53605e1e95c46cd96d9dd5c550878157ba48a7b50b7381c7c41d710b3e3d787f85e3e2f891dc80bdf054eec6d2c36df303a7cdcc663e38de0
+EBUILD tor-0.4.7.2_alpha.ebuild 2728 BLAKE2B 064fb06b75cc6c6f9457e207f3d3daf056f16927566c2f8f0e816db315c0f726ceb73ebc644e5b5258bdefb5eae527a765813a2ed23f186071e639434d05ab42 SHA512 d7ab11a79ff0b8213d53d88f3bead21af3f3c3310118a5741583d236c21c8cc76bbcfc16e5b048369d72049b78dcd1d154f1ff8b780fdff3adca746e88a1dc74
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.6.7.ebuild b/net-vpn/tor/tor-0.4.6.7.ebuild
index 2a8eecb56134..919dc32f7fa3 100644
--- a/net-vpn/tor/tor-0.4.6.7.ebuild
+++ b/net-vpn/tor/tor-0.4.6.7.ebuild
@@ -23,7 +23,7 @@ fi
 IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
 
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-tor )"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tor )"
 DEPEND="
 	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
diff --git a/net-vpn/tor/tor-0.4.6.8.ebuild b/net-vpn/tor/tor-0.4.6.8.ebuild
index a02b230e9c79..7eb05f3e6404 100644
--- a/net-vpn/tor/tor-0.4.6.8.ebuild
+++ b/net-vpn/tor/tor-0.4.6.8.ebuild
@@ -23,7 +23,7 @@ fi
 IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
 
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-tor )"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tor )"
 DEPEND="
 	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
diff --git a/net-vpn/tor/tor-0.4.7.2_alpha.ebuild b/net-vpn/tor/tor-0.4.7.2_alpha.ebuild
index 85681b689bd8..44410e9bac9e 100644
--- a/net-vpn/tor/tor-0.4.7.2_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.7.2_alpha.ebuild
@@ -23,7 +23,7 @@ fi
 IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
 
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-tor )"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tor )"
 DEPEND="
 	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest
index 123066a176c5..11467512e8f7 100644
--- a/net-vpn/wireguard-modules/Manifest
+++ b/net-vpn/wireguard-modules/Manifest
@@ -1,3 +1,3 @@
-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
+DIST wireguard-linux-compat-1.0.20211208.tar.xz 264500 BLAKE2B 06261ea746e28cb738b487232e3e0ba6e5f3f6cebaf42c821a3dac0119da8586bfc06d88ae6652f941327103a9de5804a1b8785afbf4653f75f340c5db306be9 SHA512 c162ca7c3fc1d05908f4ccf5d9eea2706c62b1ddda4b30b74126404db20817a7592ce0961d96728587cc36da7c311ee9237dbf95477fbc111d6c7e3fa513b16f
+EBUILD wireguard-modules-1.0.20211208.ebuild 3565 BLAKE2B 60951d7183ea718b731a9a8d46f4a14ee699fccaed6f5aef151545cc37b7d9adb505a59105c697c8819fc0436ac0212284a2c45d63d953585c8d7c54993fa285 SHA512 31eb0a567b3480110f1d41a569acf705ed1f8e53e05529b12e2a21a74ae1cb78578f8769c00e219c788ccd6dce624ce58b57b0efeae370245ad1bb28723a26a6
 MISC metadata.xml 662 BLAKE2B 1fb10b96eb242b02d800a0ff9b4847ffe557ae911b5bc0f9761f6887f716ec8843bce2a8cedd5987b18cf065c93271c3c2049e2ce1dd3f23103022b8632d7b34 SHA512 c7a73c72d02dbe7a6d1e30b2016d689a78bf57f7accef40d4c43202bbfb9acd6407b20303a55ba9198e88d24b03e447519a0993bfa965e28d55bd8a5b41a7464
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20210606.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20211208.ebuild
index ce3824f93de5..ce3824f93de5 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20210606.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20211208.ebuild