gentoo resync : 13.11.2021

9 files changed, 116 insertions, 12 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 88ed7fb38ceb..8cc4117929db 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index 57c907708ee7..37450810c6fe 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,5 +1,7 @@
 DIST NetworkManager-openvpn-1.8.12.tar.xz 597216 BLAKE2B 55ccb3139b1be9d1894d3651d60ce0f2167a24efbb24a9870eb4bb683a91603ae5f5149ed9aca8307cf608140c075a7b19bdfef68b1dbfe0729c117f084bb904 SHA512 1b8adf926426f866f7509a07c24203d6b584627aba4f8e2b1b00fa897bf0d7155009d566c3440565d1ee0e938694dd8d6746f37f62d493864d16eae007590b22
 DIST NetworkManager-openvpn-1.8.14.tar.xz 611084 BLAKE2B c986f85a6af93b88bc73a0e111cf712948e1434aff35b1df5c86a7afa6092acfc637e0e9031f170107c2856cf4f907bcc36543769ee531a1407bef69a9fbd0a3 SHA512 6775be9667c722cb2eec23354b950ff29b739119615a3f8c9730ad597427def716e9911a4232d014df78e88f5e4968f359e0aecacd81183db65586e2bc6ca0e7
+DIST NetworkManager-openvpn-1.8.16.tar.xz 613848 BLAKE2B 17d01a83181eef42b30181bfc54c45dbedf6275c0112d5d24b5873e82cb41727d1ea79486b690f62229a59559e568d7d9186bd85c743b0f5b118445a35d6b595 SHA512 970b8a5aa6cbe29bab8c079657921f836d8b12234eaf378e6ead9ededee80b1ee97f315ef1037de49699e3cf9498cc667b60812892b857fbce2782a774d8caaf
 EBUILD networkmanager-openvpn-1.8.12-r1.ebuild 1285 BLAKE2B c4faf61c0046a69574c734cfa7d993f64e130ca57b18280b45595968b48cbafb99d38423c4faf2694b2fcda81fdf38ffab9489d390d6340c842444daf302f325 SHA512 94e87c8733b4295892a180afc3495a62834373a90ba18f3d19dade67cb4d2768413c59c01c0223c0133b518260cb595c098771b7b20c5524e908f7a1a67b5e6a
-EBUILD networkmanager-openvpn-1.8.14.ebuild 1286 BLAKE2B c8ea9f14328e79d512b1145e2a44930d037629e87ce0843fd81b1a4cb3155ae7a2a845506c8d080c1382cb047a1e9dc7d56fdd864313851a26d378040e8226c9 SHA512 819ca5504ac9b89e68732c18cb4aecab5da443c63a6f08a4da26b1ebced71363e46a8a77e4b14ae1f39bab59e24b4286b6a5a0a23d5fa546b546e1866b9c275c
+EBUILD networkmanager-openvpn-1.8.14.ebuild 1285 BLAKE2B c4faf61c0046a69574c734cfa7d993f64e130ca57b18280b45595968b48cbafb99d38423c4faf2694b2fcda81fdf38ffab9489d390d6340c842444daf302f325 SHA512 94e87c8733b4295892a180afc3495a62834373a90ba18f3d19dade67cb4d2768413c59c01c0223c0133b518260cb595c098771b7b20c5524e908f7a1a67b5e6a
+EBUILD networkmanager-openvpn-1.8.16.ebuild 1294 BLAKE2B 66803cc7d69c2051475205e05ea26fb336acfed69b9b00506bde83c0b944219d5a42bb04074a0c5a1bf7fc7fdfda02346b287071f0cca53e63ff450f3c78a7e4 SHA512 288059710f9bc9a1237a5ed23d6b61c632047fe48d9c9784cb3d7ea7de1f6b16695b25373f8c6bf63eefdfd227e96609fd43fe57107571a938deb1b192e08171
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild
index 817ffd23ee83..0087339898bb 100644
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.16.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.16.ebuild
new file mode 100644
index 000000000000..118fb831651d
--- /dev/null
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.16.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/NetworkManager-openvpn"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gtk test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libxml2:2
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=net-libs/libnma-1.7.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/nm-openvpn
+	acct-user/nm-openvpn
+"
+
+BDEPEND="
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+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
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome) \
+		--without-libnm-glib
+}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index bc5a972d7c0b..27b98db7bdb4 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -5,6 +5,6 @@ AUX openvpn-2.5.0-auth-pam-missing-header.patch 339 BLAKE2B 8aa56f7d475c4d7a1f0d
 AUX openvpn-2.5.2-detect-python-rst2man.patch 554 BLAKE2B e379af57dcc25766803043c40ac2128e2649acb4594ba6c4f55967e5d38dc6fd3190d519b6e9ea81656eb9e5344043e6cb84e155059337282913b60a58d09eca SHA512 e09307c2841a8836d12e1973baaa5e61fd9371e6628dcc858cfa9111b8907f8e6ad73073552655292f0f9d23b8850aa821d3a1520b4b11c312a8beb2225c6ae9
 AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6b67450cf8b397dba8fd735931790648c1d485c149a55ffcbf095623b491b8a827eccab9 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd
 DIST openvpn-2.5.2.tar.gz 1830763 BLAKE2B d1c5fa97b3a9168e8715a7cf926b581e054d1d8ac905dcb78e91b9e7f2ea2abf2f03a02e6b4ee10184e810ebb871f4fc638834848eb3b4a9122b177705382fe8 SHA512 5811d26b32e7f258dc1f7ed704d28f9eb03200b54a128e4cb5dfa37ace5113d7841830fc04e1c5f69a138141d0f6f0ca6cb7fc3c39d67456e476eb4c45102be1
-EBUILD openvpn-2.5.2-r2.ebuild 5073 BLAKE2B 6e5af48ff12ad50db367e306e38055254196e389a6f4a5cc6b997d13ed86c16f3b19365b83cca7171a63bf3e2ee307d5c91b7a055abeb61196eeb33b02e753fc SHA512 2723e6954ddaa4bf2e62f53901267f59bf845443b5cb9ff0bdf15f15d4cdc197c52c98a50869db7e9f91f32cb56c83556e0ceda21c455afbf176e91f1d3e9177
-EBUILD openvpn-9999.ebuild 5027 BLAKE2B ee349a52108d8e8952b3f1053893f85a37486628e58fe88d1574137a9bc7abbe8972e6cdc117b36588e53ce2cc9a0edb848a960258f02189c45302158b7080b8 SHA512 8b4d1b69f7a5a223d33e51fa3edf1328ae5a15eca3040be1fc1c609865bc23dec2571eda4a92b2c32465979dba286d6ccc69bc7f0f452e40a274330d5d015ee2
+EBUILD openvpn-2.5.2-r2.ebuild 5080 BLAKE2B 663bb19848cb44ec344d2782af8eba5903168f54bb539d7c18ef1fd94c95d68f83e0157ba3b75167e51c764d48239001827e50ec7210bb6d910b30b4acd57fcb SHA512 1678862e0284779b1d992ea925c93413cf8066e04b2e9f9a087e249fc1ead141b35b191cfeba51635333f0b66e6de5b8c919392e5c3e1286e5bba8214974746b
+EBUILD openvpn-9999.ebuild 5086 BLAKE2B 03729f6f2dc3ff368b36aedf1d8e576ddcb68e9826a780197c3f15a4485acf67e875b7d18522ddd6798b8f6e2f492950c1a64fd37ce67351a49b587cf1beb003 SHA512 ac4ecbb819eb23e294cb77e71eeccc14dcf516c8ee75cb3a3a4aa69a72ef8fcb0fd727ac78690846d94f615afa73d9123645fbe39ead384ce6f0ccd6f1631f32
 MISC metadata.xml 1084 BLAKE2B 7033412d6507615f6c62a19e23b5519b9b37e9f9e31c364a8fd3fcf366338e586a7b25040f591af60383985efdcfcca9ae1732bb05d25766682406cbe0582050 SHA512 b965606f58fa9a1616210cca127a58867f30049eb8bf6e63d7f0b0943e5c9259d54e3e11763f89d7e1b4f453fc2eee356f4a18ac5354b4bad710dda4f23bed60
diff --git a/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild b/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild
index e09e6ac634dc..f3520516410b 100644
--- a/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild
@@ -72,6 +72,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
@@ -83,6 +84,7 @@ src_configure() {
 			$(use_enable pkcs11)
 		)
 	fi
+
 	myeconfargs+=(
 		$(use_enable inotify async-push)
 		--with-crypto-library=$(usex mbedtls mbedtls openssl)
@@ -94,6 +96,7 @@ src_configure() {
 		$(use_enable down-root plugin-down-root)
 		$(use_enable systemd)
 	)
+
 	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
 		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
 		IPROUTE=$(usex iproute2 '/bin/ip' '') \
@@ -103,9 +106,12 @@ src_configure() {
 src_test() {
 	local -x RUN_SUDO=false
 
-	make check || die "top-level tests failed"
+	elog "Running top-level tests"
+	emake check
+
 	pushd tests/unit_tests &>/dev/null || die
-	make check || die "unit tests failed"
+	elog "Running unit tests"
+	emake check
 	popd &>/dev/null || die
 }
 
@@ -142,12 +148,12 @@ src_install() {
 pkg_postinst() {
 	tmpfiles_process openvpn.conf
 
-	if use x64-macos; then
+	if use x64-macos ; then
 		elog "You might want to install tuntaposx for TAP interface support:"
 		elog "http://tuntaposx.sourceforge.net"
 	fi
 
-	if systemd_is_booted ||  has_version sys-apps/systemd; then
+	if systemd_is_booted || has_version sys-apps/systemd ; then
 		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
 		elog  ""
 		elog "server:"
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index d5d643edb2fb..1dfab6f2d9f7 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
@@ -72,6 +72,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
@@ -83,6 +84,7 @@ src_configure() {
 			$(use_enable pkcs11)
 		)
 	fi
+
 	myeconfargs+=(
 		$(use_enable inotify async-push)
 		--with-crypto-library=$(usex mbedtls mbedtls openssl)
@@ -94,6 +96,7 @@ src_configure() {
 		$(use_enable down-root plugin-down-root)
 		$(use_enable systemd)
 	)
+
 	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
 		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
 		IPROUTE=$(usex iproute2 '/bin/ip' '') \
@@ -103,9 +106,12 @@ src_configure() {
 src_test() {
 	local -x RUN_SUDO=false
 
-	make check || die "top-level tests failed"
+	elog "Running top-level tests"
+	emake check
+
 	pushd tests/unit_tests &>/dev/null || die
-	make check || die "unit tests failed"
+	elog "Running unit tests"
+	emake check
 	popd &>/dev/null || die
 }
 
@@ -129,7 +135,8 @@ src_install() {
 
 	# install examples, controlled by the respective useflag
 	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
+		# (is the below comment relevant anymore?)
+		## dodoc does not supportly support directory traversal, #15193
 		docinto examples
 		dodoc -r sample contrib
 	fi
diff --git a/net-vpn/protonvpn-cli/Manifest b/net-vpn/protonvpn-cli/Manifest
index c2f17ac7fa3a..a5ca06c592ac 100644
--- a/net-vpn/protonvpn-cli/Manifest
+++ b/net-vpn/protonvpn-cli/Manifest
@@ -1,3 +1,5 @@
+DIST protonvpn-cli-2.2.11.tar.gz 641106 BLAKE2B 916560e32716e1d29dbfa3ae513df3976dbe4bb667ad9b541f96caefba89636f74f2c13dc8b7d08b22dcc90b380904aa497cc529af8c6ca5865fad67f885acd9 SHA512 95d1681ccdd91ad43d4b0e4976c10e0d9c99bc6264fe9324a59d3495235a8439450574a18ed38c86dc4513cf754684328f2d060389e0a49bd61b5ce81356cfcb
 DIST protonvpn-cli-2.2.6.tar.gz 640528 BLAKE2B 546fbea204b9809035dae7c8e29094ad09ab70aea7eeb3e80c5c554c642a48d2823ff9aef04a5253ded9d131e560e5216d4f3985abd8f55d0a1a453760aaa296 SHA512 553cc6fa1ddadb50318b4430de6fb743d44078ca0b64b8c3ef86ed43d5b274fc527d0dd94eee882157dc7823611d305047df62ba8ea1c415affc5a0abf581ed3
+EBUILD protonvpn-cli-2.2.11.ebuild 709 BLAKE2B 2e68649518189dcd81cfea4b47a2ed09ecfe5b03c8f42c4387a06bffd75e5dd1c0ce0b43d4be3337b3cf020d95584266394ff28da49913e4074cfa02175bbd4c SHA512 fc92dba7a46a01cf9d75ff253639459d7ff02188c02842663e116ae2af17647dee526562dc6543c76ee9ec326f18e1ae10d9481858eb681f42f9fa7ba9ac99ac
 EBUILD protonvpn-cli-2.2.6.ebuild 725 BLAKE2B 1f8954c156b802ab37bc6abb0222688cf5f225dbfc2e87d3e965a2b236951f8ca7321995712dd80252a01665446357cf4566767552e22fa15621c0398d6a5a24 SHA512 97b62a78bef8ad5ffbfae05a8bf10d6eecbc1b174d9bf4710e7d7917aef6a1bc94b818a59483affc4e0aacd6e04b5efb0576f9a151dae1961df310752d1ddaa8
 MISC metadata.xml 367 BLAKE2B 89d5f6cdcf9023b4c400d5f699d1509b5cf90976d4406e13e8b17c1b2e599b6936a35d9155dba46c8d2cc9c06e35d83549fb4ac47cf8dc56892a6b94d4f1b146 SHA512 b0de06efe1a8258b2118a12949926fc8f8723775a932814701fdd13c632d51b3515de0a995813d43e467f8891bf62050e53196b2ca56a148c9f1dfef13eb1495
diff --git a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.11.ebuild b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.11.ebuild
new file mode 100644
index 000000000000..e0cef7730859
--- /dev/null
+++ b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.11.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A VPN command-line tool from protonvpn - python rewrite"
+HOMEPAGE="https://protonvpn.com https://github.com/ProtonVPN/protonvpn-cli-ng"
+SRC_URI="https://github.com/ProtonVPN/linux-cli-community/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/pythondialog:0[${PYTHON_USEDEP}]
+	net-vpn/openvpn"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/linux-cli-community-${PV}"
+
+DOCS=( CHANGELOG.md README.md USAGE.md )