commit: 0ad7b67a3776197d6aba111ed55f577dd4b112c1 Author: Itai Ferber <itai <AT> itaiferber <DOT> net> AuthorDate: Fri Feb 7 14:22:39 2025 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Fri Feb 7 14:22:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0ad7b67a
net-vpn/mullvadvpn-app: add 2025.3, drop 2025.2, 2025.3_beta1 Signed-off-by: Itai Ferber <itai <AT> itaiferber.net> net-vpn/mullvadvpn-app/Manifest | 6 +- .../mullvadvpn-app/mullvadvpn-app-2025.2.ebuild | 82 ------------ ...eta1-r1.ebuild => mullvadvpn-app-2025.3.ebuild} | 5 +- .../mullvadvpn-app-2025.3_beta1.ebuild | 146 --------------------- 4 files changed, 4 insertions(+), 235 deletions(-) diff --git a/net-vpn/mullvadvpn-app/Manifest b/net-vpn/mullvadvpn-app/Manifest index 0e3d48b64..2c7b73f5d 100644 --- a/net-vpn/mullvadvpn-app/Manifest +++ b/net-vpn/mullvadvpn-app/Manifest @@ -1,4 +1,2 @@ -DIST MullvadVPN-2025.2_aarch64.rpm 83143873 BLAKE2B 62654b9090b112ec70998462ab47c63674f914a471997c11b6405c3dac7ea185a2f8b0e3a245072d3a30a0c339ededed6563d781593894f2396e8ad0c26f131e SHA512 e50abcd2a477411f728a299833c530f7ae2554c0c3ec24ed387c9154106f85cfa718a349ba734126ffef8d5f370c009964eb9fa0bba23397b9acda170befec71 -DIST MullvadVPN-2025.2_x86_64.rpm 88898741 BLAKE2B c01cb2a15ccf23d8191802933982b85bcf8b0f83c1a04fb65dea406f7e29a18f7fb71f1319876041f4a092d42a92d7fceb22d41ed70560d222f55e4e22ecc39d SHA512 10159e64e574fc0d71ecc77bfc8bc342a4e6eaf360120343e3a34f1ec2da9da2f9051e85bb816419faca2f60d11d3f70eea3d3c9634f206d7fa04444376246e7 -DIST MullvadVPN-2025.3-beta1_aarch64.rpm 84734929 BLAKE2B fa9181e3d403b4d022cd22e9437c721cd7b2b560bc2108bba0263b0b102ce94374dd5eda9bf7d614a079c02c2a0e120d64bf611abae32c1e3b471f092ee16b0b SHA512 8419b585448fb1bc904bab96a54862deee68bb91af2ee588e237685be8ec8bb6f3e64ded7c3e1e14c1211eaeeb5dcb73c173b91a975fd3e4c29d3924dc5b401f -DIST MullvadVPN-2025.3-beta1_x86_64.rpm 90412465 BLAKE2B 98b5be660da6add2891a33155119d5b6e1bd0472ba1d3d3b93fac16081c36e4883e162001d7b549e784c698c674b731a8dc57d9b55398d0b38ee1cf45fc015da SHA512 5429d3f12f044eb7409a311f3e0a70f47ab05de2f711704b6bae194bc27462b9a4d913f3e6bbb4d3937e802d84c5ae33d17937c2891b948da852714f9a178455 +DIST MullvadVPN-2025.3_aarch64.rpm 84731941 BLAKE2B c451aea5846a20ba9674eabaa0041206aceebd584652ebc9e964162b451c602d92c71f8fb50d9582cc985b196dda2752da26134b2b692b7bc17605c3a4a52b50 SHA512 62c641e8a0bb8289f6132dcb3283a9a0e0cc066e9efd86af5b6cb6f9f5f7331762ec8a584a75a9c3f4d587164ee58636e918956fb38076dfce0fac7e9663da5a +DIST MullvadVPN-2025.3_x86_64.rpm 90403641 BLAKE2B 5b39424cdfc344c66cda16f0669a4ce69bd935f318bf0d21be7b5bf4ce20649bc210e828332b63d1557b375786fe0f9c3f65dd2718361600685fe0e3f9f5b205 SHA512 2c644bbbf5e522b23676d523505844196e3afc682ca52d294953a8c4d89dba43acf6eb3d50fdb240e00d09610863fe860dc552e3f56b189294a0ed2c8d0d7aef diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.2.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.2.ebuild deleted file mode 100644 index 6b35baf50..000000000 --- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.2.ebuild +++ /dev/null @@ -1,82 +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 - -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/${PV}/MullvadVPN-${PV}_x86_64.rpm ) - arm64? ( https://github.com/mullvad/mullvadvpn-app/releases/download/${PV}/MullvadVPN-${PV}_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 -} diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3_beta1-r1.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3.ebuild similarity index 97% rename from net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3_beta1-r1.ebuild rename to net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3.ebuild index 8d1312be6..8cd7f20a6 100644 --- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3_beta1-r1.ebuild +++ b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3.ebuild @@ -5,12 +5,11 @@ 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 ) + amd64? ( https://github.com/mullvad/mullvadvpn-app/releases/download/${PV}/MullvadVPN-${PV}_x86_64.rpm ) + arm64? ( https://github.com/mullvad/mullvadvpn-app/releases/download/${PV}/MullvadVPN-${PV}_aarch64.rpm ) " S="${WORKDIR}" diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3_beta1.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3_beta1.ebuild deleted file mode 100644 index 32a62556c..000000000 --- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3_beta1.ebuild +++ /dev/null @@ -1,146 +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() { - [[ -n "$(best_version "${CATEGORY}/${PN}")" ]] && MULLVAD_IS_BEING_UPDATED=true -} - -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() { - 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 -}
