gentoo resync : 24.07.2021

7 files changed, 33 insertions, 24 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index d9eaeabdb4ee..b467f86a7a6a 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-openconnect/Manifest b/net-vpn/networkmanager-openconnect/Manifest
index b248668a048d..89f00dfabbe4 100644
--- a/net-vpn/networkmanager-openconnect/Manifest
+++ b/net-vpn/networkmanager-openconnect/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-openconnect-1.2.6.tar.xz 713464 BLAKE2B 7837d2e825b8e962a960bfd00d3e9a9ed247d20d3628d8242c86cb145f8aa3fa8e748126785f067f348a661867436fa5f6e529e4dfefdcb07eec273a807206b0 SHA512 8e6f0af6bcc275d5afff6388b75700c35a5b65773118876203a30ad42a5758cef5d27af8954e8c47bdc46c2b5dfd70262d894aca3d3a62bcab6d240c03eb6fb2
-EBUILD networkmanager-openconnect-1.2.6.ebuild 959 BLAKE2B dc1e1a263744965691d184d22a2fc2f104e635e8d34a2c73321be26f631300ceceaf7f1ad82c61ba19c8adcf772aedb682d865c5919ac43a0a826d9a4d2d58be SHA512 2aec5ce09f3c93232e091b31e76f11128662c5ad0d9ddcd5c157eeadccef23dfa5c1904bd4d2c372cfd3a164bc4dec6e4431b0a9a2ad360047c6ca0223b073e7
+EBUILD networkmanager-openconnect-1.2.6-r1.ebuild 948 BLAKE2B de63d4917e5c832cb4ceb67adc8e54c78a676de017c8c4e411a73eda2f25722fc79bc04a02b9b57bc12974ac3b81e34e73dc90e42398745ac913052a98e9b604 SHA512 d3e6092eaa041501d4848fdf1dd9e99eb4eabe766652c405ff578af17a22325c6be76378bb590c3f8ecd3a7ed2c4557c69e0a41719bb07c15ded8508e86c3aa8
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6.ebuild b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild
index c738e1b28505..b03a1ae535e8 100644
--- a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6.ebuild
+++ b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
 
-inherit gnome2 user
+inherit gnome2
 
 DESCRIPTION="NetworkManager OpenConnect plugin"
 HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
@@ -14,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 IUSE="gtk"
 
-RDEPEND="
+DEPEND="
 	>=net-misc/networkmanager-1.2:=
 	>=dev-libs/glib-2.32:2
 	>=dev-libs/dbus-glib-0.74
@@ -25,7 +26,14 @@ RDEPEND="
 		>=app-crypt/libsecret-0.18
 		>=x11-libs/gtk+-3.4:3 )
 "
-DEPEND="${RDEPEND}
+
+RDEPEND="
+	${DEPEND}
+	acct-group/nm-openconnect
+	acct-user/nm-openconnect
+"
+
+BDEPEND="
 	sys-devel/gettext
 	dev-util/intltool
 	virtual/pkgconfig
@@ -42,6 +50,4 @@ src_configure() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	enewgroup nm-openconnect
-	enewuser nm-openconnect -1 -1 -1 nm-openconnect
 }
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index b208d1831272..5b455b79a936 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-openvpn-1.8.12.tar.xz 597216 BLAKE2B 55ccb3139b1be9d1894d3651d60ce0f2167a24efbb24a9870eb4bb683a91603ae5f5149ed9aca8307cf608140c075a7b19bdfef68b1dbfe0729c117f084bb904 SHA512 1b8adf926426f866f7509a07c24203d6b584627aba4f8e2b1b00fa897bf0d7155009d566c3440565d1ee0e938694dd8d6746f37f62d493864d16eae007590b22
-EBUILD networkmanager-openvpn-1.8.12.ebuild 1309 BLAKE2B 4f43d1a63291d1ee63608ac24fcf196e008acbc42bac665be4cd8e33854ec806b5aa5e1b8cf9fc1ca405a30b6dc9135b14d2030756f1e821dde49f2acdf7823d SHA512 07a4fdca208573de39314aef0cd7e1b1afc8e69ffe522b630acfa036c38d8d52ef35caf95f21881f96037e44b760099ef5963d0bce87d0da3949b2324c43615c
+EBUILD networkmanager-openvpn-1.8.12-r1.ebuild 1285 BLAKE2B c4faf61c0046a69574c734cfa7d993f64e130ca57b18280b45595968b48cbafb99d38423c4faf2694b2fcda81fdf38ffab9489d390d6340c842444daf302f325 SHA512 94e87c8733b4295892a180afc3495a62834373a90ba18f3d19dade67cb4d2768413c59c01c0223c0133b518260cb595c098771b7b20c5524e908f7a1a67b5e6a
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12-r1.ebuild
index 61b13e607235..0087339898bb 100644
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
 
-inherit gnome2 user
+inherit gnome2
 
 DESCRIPTION="NetworkManager OpenVPN plugin"
 HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
@@ -15,8 +16,9 @@ KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
+DEPEND="
 	>=dev-libs/glib-2.32:2
+	dev-libs/libxml2:2
 	>=net-misc/networkmanager-1.7.0:=
 	>=net-vpn/openvpn-2.1
 	gtk? (
@@ -25,18 +27,19 @@ RDEPEND="
 		>=x11-libs/gtk+-3.4:3
 	)
 "
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
+
+RDEPEND="
+	${DEPEND}
+	acct-group/nm-openvpn
+	acct-user/nm-openvpn
+"
+
+BDEPEND="
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
 "
 
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
 src_prepare() {
 	# Test will fail if the machine doesn't have a particular locale installed
 	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 3669e652fae4..106339d582c1 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -20,5 +20,5 @@ EBUILD tor-0.4.4.9-r1.ebuild 2797 BLAKE2B 2b37de0b894e2b7088fad0463bb173a08139ca
 EBUILD tor-0.4.5.7-r1.ebuild 2788 BLAKE2B 7c390e7a4789c967ce7b63b6a9505d487fc5dc7eba3b3d11d929f37a4bb4768dbd00c9547263d051aee401f8016f1abb69189acec02fa22616bfe8b3fb1cbc48 SHA512 746c9462ee787c860d3cee7deb8435b310cd1488c11dd385895fa891a43043bcacc15ed2c3df6905242f132111dbb2ac64850f21397e392e80bd09f851322fca
 EBUILD tor-0.4.5.9-r1.ebuild 2544 BLAKE2B 840d53158ed06452c125ac933253d01f79996b73a24293890dcd25011c969da7dd6e6a8b87bd94f7c0e9426a180e74515a29cade4702dcd14e946a6be2134cc6 SHA512 76f2944e47441bc85be06bdf05c943f5032f344d6aaa28710c79c26ff4f293879e40d463764cb03e44319d6ca7faa743456084d51f8ae3476e912b4daca00266
 EBUILD tor-0.4.6.5-r1.ebuild 2742 BLAKE2B ded94096f45ce9dd6be3ed15c762f80086aff5f2590ae83b94850ef1a2827d0c436313ee27f661dc190c89ef36417c3b2e8deb89817351b8b82d6e28e3d51eb5 SHA512 489760dbb35167c927ba53f061a767d03f17d90168010907e4a89db62a394029f3ed88f86e127d13c9720f8b875832531545aee4f5fee24522554602a973c692
-EBUILD tor-0.4.6.6.ebuild 2742 BLAKE2B ded94096f45ce9dd6be3ed15c762f80086aff5f2590ae83b94850ef1a2827d0c436313ee27f661dc190c89ef36417c3b2e8deb89817351b8b82d6e28e3d51eb5 SHA512 489760dbb35167c927ba53f061a767d03f17d90168010907e4a89db62a394029f3ed88f86e127d13c9720f8b875832531545aee4f5fee24522554602a973c692
+EBUILD tor-0.4.6.6.ebuild 2748 BLAKE2B 58f5ada5baad900c2693a457cee8d02163ff7e67cdfcb75f23476d838ac3241995b260f0241787c65d095a8fb28e206c2056c6af6e4532d5f92cd3c2bbf226b5 SHA512 4337b7031c3e51a8842cf3e6586d6aa701fafda7d49e9c259b573f83647a08147af530745720a93b273c299a9dcf92d22c02ba325873b5d608d6fe7ca05361f1
 MISC metadata.xml 549 BLAKE2B af6257c0e04c7487b23edb1f5c6fce91fbb76aedf9c0357bb4f214ff4af9d6055e0c6bb32fef5c9906f461f34b5631891a681a039612c73feecff8ff77a0a3c2 SHA512 2b9d9c20a9691dd67cb5ef98e386bea8cff9ba79208373922c5a379ca8c96e021e94748d7b85e860a24063f1fc439a3adee59b3dde70cf6b35401d18518b5689
diff --git a/net-vpn/tor/tor-0.4.6.6.ebuild b/net-vpn/tor/tor-0.4.6.6.ebuild
index 5b9be817185e..a02b230e9c79 100644
--- a/net-vpn/tor/tor-0.4.6.6.ebuild
+++ b/net-vpn/tor/tor-0.4.6.6.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
 
 MY_PV="$(ver_rs 4 -)"
 MY_PF="${PN}-${MY_PV}"
 DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
+HOMEPAGE="https://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
 	verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )"
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
 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