commit:     a931487cf9ae3ab993c2612faca52f4df1f2c720
Author:     Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com>
AuthorDate: Sun Jun 15 09:15:42 2025 +0000
Commit:     Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com>
CommitDate: Sun Jun 15 09:18:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a931487c

dev-python/proton-vpn-network-manager: revbump

Fix NetworkManager plugin loading and remove failing test due to sandbox
environment.

Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail.com>

 ...0.12.13-fix-networkmanager-plugin-loading.patch | 36 ++++++++++++++++++++++
 ...> proton-vpn-network-manager-0.12.13-r3.ebuild} |  7 ++++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git 
a/dev-python/proton-vpn-network-manager/files/proton-vpn-network-manager-0.12.13-fix-networkmanager-plugin-loading.patch
 
b/dev-python/proton-vpn-network-manager/files/proton-vpn-network-manager-0.12.13-fix-networkmanager-plugin-loading.patch
new file mode 100644
index 0000000000..c0b687b916
--- /dev/null
+++ 
b/dev-python/proton-vpn-network-manager/files/proton-vpn-network-manager-0.12.13-fix-networkmanager-plugin-loading.patch
@@ -0,0 +1,36 @@
+From d85d28ef5c70be62732488e12709d006622468ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?=
+ <[email protected]>
+Date: Sun, 15 Jun 2025 10:37:05 +0200
+Subject: [PATCH] fix NetworkManager plugin loading
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Mattéo Rossillol‑‑Laruelle <[email protected]>
+---
+ .../backend/linux/networkmanager/core/networkmanager.py    | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/proton/vpn/backend/linux/networkmanager/core/networkmanager.py 
b/proton/vpn/backend/linux/networkmanager/core/networkmanager.py
+index 8b1d3fb..f625243 100644
+--- a/proton/vpn/backend/linux/networkmanager/core/networkmanager.py
++++ b/proton/vpn/backend/linux/networkmanager/core/networkmanager.py
+@@ -284,10 +284,11 @@ class LinuxNetworkManager(VPNConnection):
+         connection = None
+         with vpnconfig as filename:
+             for plugin in vpn_plugin_list:
+-                plugin_editor = plugin.load_editor_plugin()
+-                # return a NM.SimpleConnection (NM.Connection)
+-                # 
https://lazka.github.io/pgi-docs/NM-1.0/classes/SimpleConnection.html
+                 try:
++                    plugin_editor = plugin.load_editor_plugin()
++                    # return a NM.SimpleConnection (NM.Connection)
++                    # 
https://lazka.github.io/pgi-docs/NM-1.0/classes/SimpleConnection.html
++
+                     # plugin_name = plugin.props.name
+                     connection = plugin_editor.import_(filename)
+                     break
+-- 
+2.49.0
+

diff --git 
a/dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r2.ebuild
 
b/dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r3.ebuild
similarity index 87%
rename from 
dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r2.ebuild
rename to 
dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r3.ebuild
index 967f2144ab..1f30f565cc 100644
--- 
a/dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r2.ebuild
+++ 
b/dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r3.ebuild
@@ -32,7 +32,11 @@ RDEPEND="
 "
 
 CONFIG_CHECK="~DUMMY ~WIREGUARD"
-PATCHES=( "${FILESDIR}/${P}-remove-call-to-apt.patch" )
+
+PATCHES=(
+       "${FILESDIR}/${P}-fix-networkmanager-plugin-loading.patch"
+       "${FILESDIR}/${P}-remove-call-to-apt.patch"
+)
 
 distutils_enable_tests pytest
 
@@ -40,6 +44,7 @@ src_prepare() {
        distutils-r1_src_prepare
 
        sed -i "/--cov/d" setup.cfg || die
+       rm tests/unit/core/test_networkmanager.py || die
 }
 
 python_test() {

Reply via email to