From e53711ec563024c1f867be5348e4211cdbcbb608 Mon Sep 17 00:00:00 2001 From: Itai Ferber Date: Tue, 28 Apr 2026 09:54:34 -0400 Subject: [PATCH] net-vpn/mullvadvpn-app: add 2026.2, drop 2026.1, 2026.2_beta1 Signed-off-by: Itai Ferber --- net-vpn/mullvadvpn-app/Manifest | 6 +- ....1.ebuild => mullvadvpn-app-2026.2.ebuild} | 0 .../mullvadvpn-app-2026.2_beta1.ebuild | 155 ------------------ 3 files changed, 2 insertions(+), 159 deletions(-) rename net-vpn/mullvadvpn-app/{mullvadvpn-app-2026.1.ebuild => mullvadvpn-app-2026.2.ebuild} (100%) delete mode 100644 net-vpn/mullvadvpn-app/mullvadvpn-app-2026.2_beta1.ebuild diff --git a/net-vpn/mullvadvpn-app/Manifest b/net-vpn/mullvadvpn-app/Manifest index e7a021dc07..145085fc18 100644 --- a/net-vpn/mullvadvpn-app/Manifest +++ b/net-vpn/mullvadvpn-app/Manifest @@ -1,4 +1,2 @@ -DIST MullvadVPN-2026.1_aarch64.rpm 86835665 BLAKE2B 6ae83ade986e76577adedf592af096bb3a843525ab27e19563d917228e3a7c2c476e6b2dd9bef24652c6a3e773cd288f114a8cac57728e352f9f4e69a6394ecf SHA512 09a31d65512b55ee63519f9a7873c933372e155f0678afdcf88d6d48909caca5802b39a0919ecff32a2f09c7475fd2ed2bcea768e0504e420a871bd9a71a030b -DIST MullvadVPN-2026.1_x86_64.rpm 92671665 BLAKE2B 76b3e5e1250e69add6f828d1df69444358aa23b276166372678e0e3f5289b98312d908c569ea5c7edf0da8f838d2b41b61d42bb6186ec3960dc3a9c13d3943f6 SHA512 616c7071095acfc8773f678e62e29653228e7a1f5b38a4062fbcd111cf78b4dedd66cb36e6511c849f01cd2d4bd65f65b6d1692f349f29b5331cea63b9884c9b -DIST MullvadVPN-2026.2-beta1_aarch64.rpm 86636369 BLAKE2B 0c21912962568988482dd279bcb3595561b47517a0b2f94fbcb3323bfea3f0d862a3d43644ea81d2b2510b9c836b8aafbf06fae27a931983ed7658bb32ecf965 SHA512 14afe6b74e7d3462d514769baad46b0cc84c47ca2c276565caa094517ca189e818e0071bb917254eeb4fc4c45bb42ae2290cf52e21ff7ad31fa423c63f97e72d -DIST MullvadVPN-2026.2-beta1_x86_64.rpm 92468393 BLAKE2B e5918f5707aa907417453088893f04f9083a33e9af30241ec5e8a26697ebf4fba1f11a6e0254d4b000445e6f9eedec17f7a1ebb1226b3a4e204454f2a0c47836 SHA512 e96dd62c03dbcf810fee97bfd9a824cc25da3fd015e8dbefee284d0767df6fb47661288c0edc91ad46ae8247120b802fd5f93d7537867b7adfff69a4bd7a958f +DIST MullvadVPN-2026.2_aarch64.rpm 86648725 BLAKE2B 444f0c0fbacd152f9b9f8370fb9dc6317bd4145cade6f1de80d2ea80f1296a7c3514f850aefbcef1f6393134b40fdcee316d48662db0bc44ef52ca041ac5faf5 SHA512 11466107e37d8fcf4c0b6dec4d10c4adc45f942b0a88e16fc101d47892ccacd4f641f36393b96c88a356638533ce1b9d29119338f0d31d942ad16671fd62d2b8 +DIST MullvadVPN-2026.2_x86_64.rpm 92476557 BLAKE2B a8f8ef36443c6626339f212653a560ca88faf67f46ff3dcd679a9d96fb9cb08e957e6aec706750a13a003dd405ff89375c7f3ca08f8d78ab28746700722b2edc SHA512 8fc1adc375be15a1ae174064adf141b77e5dc74f86b139515b83df22008e9eb5154cdc47a87cdc4401ff068ecdb340030c9ac082b779feb24cbca21393c650c9 diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2026.1.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2026.2.ebuild similarity index 100% rename from net-vpn/mullvadvpn-app/mullvadvpn-app-2026.1.ebuild rename to net-vpn/mullvadvpn-app/mullvadvpn-app-2026.2.ebuild diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2026.2_beta1.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2026.2_beta1.ebuild deleted file mode 100644 index c14365654e..0000000000 --- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2026.2_beta1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2025 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" - -# Betas are kept unkeyworded; users can opt in to testing by accepting '**' instead of '~amd64'/ -# '~arm64' keywords. -# -# See https://bugs.gentoo.org/966989 -if [[ "${PV}" != *_beta* ]]; then - KEYWORDS="-* ~amd64 ~arm64" -fi - -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 - || ( - net-firewall/nftables - net-firewall/iptables[nftables] - ) -" - -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 -} - -pkg_postrm() { - xdg_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; 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 [[ -n ${REPLACING_VERSIONS} ]]; 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 -}