commit: 300dc16ab1228ec0a566c3ce0a1abe9523df2dea Author: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com> AuthorDate: Fri Apr 25 09:53:55 2025 +0000 Commit: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com> CommitDate: Fri Apr 25 09:53:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=300dc16a
dev-python/proton-vpn-network-manager: remove call to `apt` Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail.com> ...etwork-manager-0.12.13-remove-call-to-apt.patch | 51 ++++++++++++++++++++++ ...> proton-vpn-network-manager-0.12.13-r1.ebuild} | 1 + 2 files changed, 52 insertions(+) diff --git a/dev-python/proton-vpn-network-manager/files/proton-vpn-network-manager-0.12.13-remove-call-to-apt.patch b/dev-python/proton-vpn-network-manager/files/proton-vpn-network-manager-0.12.13-remove-call-to-apt.patch new file mode 100644 index 000000000..48913bccc --- /dev/null +++ b/dev-python/proton-vpn-network-manager/files/proton-vpn-network-manager-0.12.13-remove-call-to-apt.patch @@ -0,0 +1,51 @@ +From c4e7ffaaf2d9ef97051875d96e426b03b5d33607 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?= + <[email protected]> +Date: Fri, 25 Apr 2025 11:40:29 +0200 +Subject: [PATCH] remove call to `apt` +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In Gentoo, `apt` is a part of the Java upstream and is installed by +`app-eselect/eselect-java`. This executable is not the `apt` package manager of +Debian. Its call has to be removed to avoid an annoying notification. + +Signed-off-by: Mattéo Rossillol‑‑Laruelle <[email protected]> +--- + .../killswitch/default/nmkillswitch.py | 21 ------------------- + 1 file changed, 21 deletions(-) + +diff --git a/proton/vpn/backend/linux/networkmanager/killswitch/default/nmkillswitch.py b/proton/vpn/backend/linux/networkmanager/killswitch/default/nmkillswitch.py +index 6650a97..a2e2cfd 100644 +--- a/proton/vpn/backend/linux/networkmanager/killswitch/default/nmkillswitch.py ++++ b/proton/vpn/backend/linux/networkmanager/killswitch/default/nmkillswitch.py +@@ -101,25 +101,4 @@ class NMKillSwitch(KillSwitch): + logger.error("NetworkManager is not running.") + return False + +- # libnetplan0 is the first version that is present in Ubuntu 22.04. In Ubuntu 24.04 +- # the package name changes to libnetplan1, and it's not compatible with this kill +- # switch implementation when IPv6 is disabled via the ipv6.disabled kernel option. +- try: +- result = subprocess.run( +- ["/usr/bin/apt", "show", "libnetplan1"], +- capture_output=True, +- check=True, shell=False +- ) # nosec B603:subprocess_without_shell_equals_true +- except (FileNotFoundError, subprocess.CalledProcessError): +- pass +- else: +- stdout_decoded = result.stdout.decode("utf8").split("\n") +- for package_info_line in stdout_decoded: +- if package_info_line.startswith("Version: 1.0.0"): +- logger.warning( +- "Kill switch is not compatible with libnetplan1 v1.0.0. " +- "Please upgrade libnetplan1 package to v1.1.1" +- ) +- break +- + return True +-- +2.49.0 + diff --git a/dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13.ebuild b/dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r1.ebuild similarity index 95% rename from dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13.ebuild rename to dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r1.ebuild index 3b6fbec69..967f2144a 100644 --- a/dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13.ebuild +++ b/dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r1.ebuild @@ -32,6 +32,7 @@ RDEPEND=" " CONFIG_CHECK="~DUMMY ~WIREGUARD" +PATCHES=( "${FILESDIR}/${P}-remove-call-to-apt.patch" ) distutils_enable_tests pytest
