commit:     24473ad405ad1be46e08480185d42274d9cbbc71
Author:     Itai Ferber <itai <AT> itaiferber <DOT> net>
AuthorDate: Wed Mar 26 16:18:10 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Mar 26 16:18:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=24473ad4

net-vpn/mullvadvpn-app: add 2025.5, drop 2025.4, 2025.5_beta1

Signed-off-by: Itai Ferber <itai <AT> itaiferber.net>

 net-vpn/mullvadvpn-app/Manifest                    |   6 +-
 ...-2025.4.ebuild => mullvadvpn-app-2025.5.ebuild} |   0
 .../mullvadvpn-app-2025.5_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 c689b95c0..d202660a1 100644
--- a/net-vpn/mullvadvpn-app/Manifest
+++ b/net-vpn/mullvadvpn-app/Manifest
@@ -1,4 +1,2 @@
-DIST MullvadVPN-2025.4_aarch64.rpm 84730077 BLAKE2B 
3366b8e041f2d298b53f8b04f97fc483ff3982d983f64ba88da3db8121dd24ce12dffc497d4b8d92b1b75a4830987ddf198417211c00056094c8fcf09ef3615e
 SHA512 
e54ac6393253d2a536aca671a66c2a1b9e0b7540e69ee1743689e770fbea2d32bd8fedea2a35f2fccd962f5bc7664ee5f1551a2f120fd8095dbec270298202b1
-DIST MullvadVPN-2025.4_x86_64.rpm 90398321 BLAKE2B 
ec68991ef26e3c3a68391a54165eafe85cae56fb5210485c8b88ba1925cc0cc097a70945f75c77e5c4ab38f058466f93b96c9b7e878a508b85e38241ac2794ed
 SHA512 
af5db62b4bee13cbd9444b3316d59646c7c978214db36a1b2a64de06dc4765bffdab2037e57d41906370505e5ca0b36211f73f85b0bca3881fcdafa1fd50e877
-DIST MullvadVPN-2025.5-beta1_aarch64.rpm 83182669 BLAKE2B 
96ebdf263c4e8115c3af417bd17823324a545de8b3883f8757457bcbeb53cc6fb5346c1e7174e79bd528543d553840bf550e4212c2bd4f5ab20c49a8f8ddbb39
 SHA512 
1066a8b872182b198b618e992379c3beb6cd07bc8da0832a18bbea7f5d7d0e12e668d3b89352d1e860af32d994dc0bb8074f3ebb9230a7d30e12d41f6515b2ee
-DIST MullvadVPN-2025.5-beta1_x86_64.rpm 88593697 BLAKE2B 
01af37045df39d1ad8458e2da6b2dcdf8c332a154676060111faefdab0872882d6126a7a7c007a0e00db65e8c20648f28e212caedf827c0d85f32ffda1b9d5ea
 SHA512 
fcb33f977a92b1ab539dd770a0b0974d73a3772062224f9c52f7f91afb76d78c1d4a270eb32fe8b3043cee13119fc6e6989eddab5d34790237eb0be613752775
+DIST MullvadVPN-2025.5_aarch64.rpm 83196461 BLAKE2B 
4543f963147978016c3e0827c9d537e1ab8926db45e027df9b9c3267dae8aa1fe89876dd7e09fe7e3ddad75ff03b3039957234479cfbc151a8c82974fb07c52b
 SHA512 
e02bc60a4c3b725b548f499437eaa5a2860cff02a99b6b2d6f87604dd456581e7dded20d1219e5c06b5ee460a2b2bc268eb32d1b171112e6e262ed08687846ea
+DIST MullvadVPN-2025.5_x86_64.rpm 88596417 BLAKE2B 
380755f0935eb98426f4b212f14fb57242f84ede3eabc56aaf85a2b40cf5498f68be0101c5af93be7eac02becee5743d80cc23dd735e6ccac4e840d892e23901
 SHA512 
12e87f627d3cc6e86e32b781c758893dcaffbacf3bfd6956b2e006deabdbcd0f04d4af99445370948e39084d1be54297b445f3b0bfaec4d72325f0749aefc19c

diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.4.ebuild 
b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.5.ebuild
similarity index 100%
rename from net-vpn/mullvadvpn-app/mullvadvpn-app-2025.4.ebuild
rename to net-vpn/mullvadvpn-app/mullvadvpn-app-2025.5.ebuild

diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.5_beta1.ebuild 
b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.5_beta1.ebuild
deleted file mode 100644
index ed23aab17..000000000
--- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.5_beta1.ebuild
+++ /dev/null
@@ -1,152 +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"
-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
-}

Reply via email to