commit: 5aedee76797000cc121bba24805f683ae40faacc
Author: Itai Ferber <itai <AT> itaiferber <DOT> net>
AuthorDate: Wed Feb 26 16:39:56 2025 +0000
Commit: Itai Ferber <itai <AT> itaiferber <DOT> net>
CommitDate: Wed Feb 26 16:39:56 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5aedee76
net-vpn/mullvadvpn-app: add 2025.4, drop 2025.3, 2025.4_beta1
Signed-off-by: Itai Ferber <itai <AT> itaiferber.net>
net-vpn/mullvadvpn-app/Manifest | 6 +-
...-2025.3.ebuild => mullvadvpn-app-2025.4.ebuild} | 0
.../mullvadvpn-app-2025.4_beta1.ebuild | 152 ---------------------
3 files changed, 2 insertions(+), 156 deletions(-)
diff --git a/net-vpn/mullvadvpn-app/Manifest b/net-vpn/mullvadvpn-app/Manifest
index 24882bde6..d96db547e 100644
--- a/net-vpn/mullvadvpn-app/Manifest
+++ b/net-vpn/mullvadvpn-app/Manifest
@@ -1,4 +1,2 @@
-DIST MullvadVPN-2025.3_aarch64.rpm 84731941 BLAKE2B
c451aea5846a20ba9674eabaa0041206aceebd584652ebc9e964162b451c602d92c71f8fb50d9582cc985b196dda2752da26134b2b692b7bc17605c3a4a52b50
SHA512
62c641e8a0bb8289f6132dcb3283a9a0e0cc066e9efd86af5b6cb6f9f5f7331762ec8a584a75a9c3f4d587164ee58636e918956fb38076dfce0fac7e9663da5a
-DIST MullvadVPN-2025.3_x86_64.rpm 90403641 BLAKE2B
5b39424cdfc344c66cda16f0669a4ce69bd935f318bf0d21be7b5bf4ce20649bc210e828332b63d1557b375786fe0f9c3f65dd2718361600685fe0e3f9f5b205
SHA512
2c644bbbf5e522b23676d523505844196e3afc682ca52d294953a8c4d89dba43acf6eb3d50fdb240e00d09610863fe860dc552e3f56b189294a0ed2c8d0d7aef
-DIST MullvadVPN-2025.4-beta1_aarch64.rpm 84719365 BLAKE2B
96cea1af819dc94960e27eb68742d45a02ac160dc887698aaea7099c1bfa90b7f83c91fadcd9cda2a762074294a5db885ecb8ebed5d8b43d8c94ee7fe6d5b2eb
SHA512
0657b2f6bcbaac4ef10acbd2cba8c938a8e79128744678328fc3aaf69ac8cfe6a487443bd45cf52fadb66454ab31e17bc35ac3cc4c8594e16329a186023367ad
-DIST MullvadVPN-2025.4-beta1_x86_64.rpm 90397397 BLAKE2B
44f364036b05ea6f6579561aa208818b529f790723fe5904e48713ae83df4f61c46fc85e0fad5e2e508dcb1adc79ccf73627185eae3f6a41968e83e4d75cb168
SHA512
1509ee802b5bb41c388b4f8bda9e255f5979e14bb7d900a57340fbaf3fba565e7c810f6a6b598146c210637ed96a3fd369675e51553fe02e212be8fad3771efa
+DIST MullvadVPN-2025.4_aarch64.rpm 84730077 BLAKE2B
3366b8e041f2d298b53f8b04f97fc483ff3982d983f64ba88da3db8121dd24ce12dffc497d4b8d92b1b75a4830987ddf198417211c00056094c8fcf09ef3615e
SHA512
e54ac6393253d2a536aca671a66c2a1b9e0b7540e69ee1743689e770fbea2d32bd8fedea2a35f2fccd962f5bc7664ee5f1551a2f120fd8095dbec270298202b1
+DIST MullvadVPN-2025.4_x86_64.rpm 90398321 BLAKE2B
ec68991ef26e3c3a68391a54165eafe85cae56fb5210485c8b88ba1925cc0cc097a70945f75c77e5c4ab38f058466f93b96c9b7e878a508b85e38241ac2794ed
SHA512
af5db62b4bee13cbd9444b3316d59646c7c978214db36a1b2a64de06dc4765bffdab2037e57d41906370505e5ca0b36211f73f85b0bca3881fcdafa1fd50e877
diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3.ebuild
b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.4.ebuild
similarity index 100%
rename from net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3.ebuild
rename to net-vpn/mullvadvpn-app/mullvadvpn-app-2025.4.ebuild
diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.4_beta1.ebuild
b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.4_beta1.ebuild
deleted file mode 100644
index 8d1312be6..000000000
--- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.4_beta1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop rpm systemd shell-completion xdg
-
-MYPV="${PV/_beta/-beta}"
-DESCRIPTION="Tool used to manage daemon setup"
-HOMEPAGE="https://github.com/mullvad/mullvadvpn-app https://mullvad.net/";
-SRC_URI="
- amd64? (
https://github.com/mullvad/mullvadvpn-app/releases/download/${MYPV}/MullvadVPN-${MYPV}_x86_64.rpm
)
- arm64? (
https://github.com/mullvad/mullvadvpn-app/releases/download/${MYPV}/MullvadVPN-${MYPV}_aarch64.rpm
)
-"
-
-S="${WORKDIR}"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
-
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
- app-accessibility/at-spi2-core:2
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- media-libs/alsa-lib
- media-libs/mesa
- net-print/cups
- sys-apps/dbus
- x11-libs/cairo
- x11-libs/gtk+:3
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libxkbcommon
- x11-libs/libXrandr
- x11-libs/pango
-"
-
-QA_PREBUILT="*"
-
-src_install() {
- sed -i "s|SCRIPT_DIR=.*|SCRIPT_DIR=\"/opt/Mullvad VPN/\"|g"
"${S}/opt/Mullvad VPN/mullvad-vpn" || die
-
- # Using doins -r would strip executable bits from all binaries
- cp -pPR opt "${D}"/ || die "Failed to copy files"
- fperms +x "/opt/Mullvad VPN/chrome_crashpad_handler"
- fperms 4755 "/opt/Mullvad VPN/chrome-sandbox"
-
- dobin ./usr/bin/mullvad
- dobin ./usr/bin/mullvad-daemon
- dobin ./usr/bin/mullvad-exclude
- dosym -r "/opt/Mullvad VPN/mullvad-vpn" /usr/bin/mullvad-vpn
- dosym -r "/opt/Mullvad VPN/resources/mullvad-problem-report"
/usr/bin/mullvad-problem-report
-
- # mullvad-exclude uses cgroups to manage exclusions, which requires
root permissions, but is
- # also most often used to exclude graphical applications which can't or
shouldn't run as root
- # (i.e., can't be run under `sudo/doas /usr/bin/mullvad-exclude ...`,
because `sudo`/`doas`
- # change user). The setuid bit allows any user to exclude executables
under their own UID.
- fperms 4755 /usr/bin/mullvad-exclude
-
- newinitd "${FILESDIR}"/mullvad-daemon.initd mullvad-daemon
-
- systemd_newunit ./usr/lib/systemd/system/mullvad-daemon.service
mullvad-daemon.service
- systemd_newunit
./usr/lib/systemd/system/mullvad-early-boot-blocking.service
mullvad-early-boot-blocking.service
-
- newbashcomp ./usr/share/bash-completion/completions/mullvad mullvad
- newfishcomp ./usr/share/fish/vendor_completions.d/mullvad.fish mullvad
- newzshcomp ./usr/share/zsh/site-functions/_mullvad _mullvad
-
- domenu ./usr/share/applications/mullvad-vpn.desktop
- local x
- for x in 16 32 48 64 128 256 512 1024; do
- doicon -s "${x}"
"./usr/share/icons/hicolor/${x}x${x}/apps/mullvad-vpn.png"
- done
-}
-
-MULLVAD_IS_BEING_UPDATED=false
-
-pkg_preinst() {
- xdg_pkg_preinst
-
- [[ -n "$(best_version "${CATEGORY}/${PN}")" ]] &&
MULLVAD_IS_BEING_UPDATED=true
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-
- if [[ ${MULLVAD_IS_BEING_UPDATED} = "false" ]]; then
- if ! command -v pgrep &>/dev/null || pgrep -f
"mullvad-(daemon|gui)"; then
- elog "Mullvad has been uninstalled. To stop the
service,"
- elog "1. Quit the Mullvad app"
- elog " * Manually: 'Disconnect & quit' from the
Mullvad menu"
- elog " OR"
- elog " * Command line: pkill -f mullvad-gui"
- elog "2. Stop the daemon"
- elog " * OpenRC: rc-service mullvad-daemon stop"
- elog " OR"
- elog " * systemd: systemctl stop mullvad-daemon"
- elog " OR"
- elog " * other: pkill -f mullvad-daemon"
- fi
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if [[ ${MULLVAD_IS_BEING_UPDATED} = "true" ]]; then
- if command -v pgrep &>/dev/null && pgrep -f
"mullvad-(daemon|gui)" &>/dev/null; then
- elog "Mullvad has been updated. To restart the service,"
- elog "1. Restart the daemon"
- elog " * OpenRC: rc-service mullvad-daemon restart"
- elog " OR"
- elog " * systemd: systemctl restart mullvad-daemon"
- elog "2. Restart the app"
- elog " * Manually: 'Disconnect & quit' from the
Mullvad menu and relaunch using"
- elog " your preferred desktop launcher"
- elog " OR"
- elog " * Command line: pkill -f mullvad-gui &&
'/opt/Mullvad VPN/mullvad-vpn' & disown"
- else
- elog "Mullvad has been updated. To start the service,"
- elog "1. Start the daemon"
- elog " * OpenRC: rc-service mullvad-daemon start"
- elog " OR"
- elog " * systemd: systemctl start mullvad-daemon"
- elog "2. Launch the app"
- elog " * Manually: use your preferred desktop
launcher"
- elog " OR"
- elog " * Command line: '/opt/Mullvad VPN/mullvad-vpn'
& disown"
- fi
- else
- elog "Mullvad has been installed. To start the service,"
- elog "1. Enable and start the daemon"
- elog " * OpenRC: rc-update add mullvad-daemon default"
- elog " rc-service mullvad-daemon start"
- elog " OR"
- elog " * systemd: systemctl enable mullvad-daemon"
- elog " systemctl start mullvad-daemon"
- elog "2. Launch the app"
- elog " * Manually: use your preferred desktop launcher"
- elog " OR"
- elog " * Command line: '/opt/Mullvad VPN/mullvad-vpn' &
disown"
- fi
-}
