[gentoo-commits] repo/proj/guru:dev commit in: net-vpn/mullvadvpn-app/

["Joe Kappus" <joe@wt.gd>]

commit:     1baa2554f3f3d1ac240dc7ee7e91b02dd1b04a4e
Author:     Joe Kappus <joe <AT> wt <DOT> gd>
AuthorDate: Mon May 19 06:49:01 2025 +0000
Commit:     Joe Kappus <joe <AT> wt <DOT> gd>
CommitDate: Mon May 19 06:49:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1baa2554

net-vpn/mullvadvpn-app: add 2025.6, drop 2025.5, 2025.6_beta2

Signed-off-by: Joe Kappus <joe <AT> wt.gd>

 net-vpn/mullvadvpn-app/Manifest                    |   6 +-
 ...-2025.5.ebuild => mullvadvpn-app-2025.6.ebuild} |   2 +-
 .../mullvadvpn-app-2025.6_beta2.ebuild             | 152 ---------------------
 3 files changed, 3 insertions(+), 157 deletions(-)

diff --git a/net-vpn/mullvadvpn-app/Manifest b/net-vpn/mullvadvpn-app/Manifest
index 9526868ab..ba2977471 100644
--- a/net-vpn/mullvadvpn-app/Manifest
+++ b/net-vpn/mullvadvpn-app/Manifest
@@ -1,4 +1,2 @@
-DIST MullvadVPN-2025.5_aarch64.rpm 83196461 BLAKE2B 4543f963147978016c3e0827c9d537e1ab8926db45e027df9b9c3267dae8aa1fe89876dd7e09fe7e3ddad75ff03b3039957234479cfbc151a8c82974fb07c52b SHA512 e02bc60a4c3b725b548f499437eaa5a2860cff02a99b6b2d6f87604dd456581e7dded20d1219e5c06b5ee460a2b2bc268eb32d1b171112e6e262ed08687846ea
-DIST MullvadVPN-2025.5_x86_64.rpm 88596417 BLAKE2B 380755f0935eb98426f4b212f14fb57242f84ede3eabc56aaf85a2b40cf5498f68be0101c5af93be7eac02becee5743d80cc23dd735e6ccac4e840d892e23901 SHA512 12e87f627d3cc6e86e32b781c758893dcaffbacf3bfd6956b2e006deabdbcd0f04d4af99445370948e39084d1be54297b445f3b0bfaec4d72325f0749aefc19c
-DIST MullvadVPN-2025.6-beta2_aarch64.rpm 84111209 BLAKE2B 3d01478025bb93d3884c76bfb078abe35de66d7d1ac52f546515fdf786a7cbb76b0838b923bfbe8393039dafc971d8ba37b59808d0432ccef413cb000ece1dc1 SHA512 7f704d18f5b770090a00fb184fd7c7614f9caa49220472e7878a9a95734ec8086ec876c98ba45305d5501817bf8e156ab53be15f0e51840bd54b44194db29c32
-DIST MullvadVPN-2025.6-beta2_x86_64.rpm 89415893 BLAKE2B efef3a87050afc597c61e4ab75fc7c25477225e4d3bbade47aaaf3d18ad08add5ec8ac6614325db93052bf92a9851e4a9beece8bd0bf4322b4da7a43318c9822 SHA512 b4e910cc2e156ff48debf10a992c3c0350581a84c0d6e6028c794546b1ab3d04e04b58cf671b7e676b0b8dfad7ba992bf69b4453c8def4925b896af716f4dbe2
+DIST MullvadVPN-2025.6_aarch64.rpm 84081953 BLAKE2B 73219680ff5ed792d54af3003a8ccec4995879bf945250e91ffce807e2cdca26867f66d0ae13115fd995b4d6009e0c840649a6f3f6b77301bb495d029df46fbb SHA512 dc6ef9f30b752a451dc011b33dbd49073627f621994b51d85396bf76f457ecf4589dedf36684d6c75c3908869604fb3ccf113fad9a8935e41f516680c7b82fcd
+DIST MullvadVPN-2025.6_x86_64.rpm 89423673 BLAKE2B 6c8fcd6a9a05f1ba3ef31c6b9421398b21f8649484337a425168abe01e954cdd01e7b85c8a54b6839ddae712dd4e8b5b66767b1647b7faa9ca642ab4cebb8753 SHA512 6bec6a3116d21f0dd3185c21a5ae14bec5c969ea1e4472d41a7761fcce918bb689e913c822c2eeb6f55c077c048bd95a561a77e9dacac570e0fd09da24c6829d

diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.5.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.6.ebuild
similarity index 99%
rename from net-vpn/mullvadvpn-app/mullvadvpn-app-2025.5.ebuild
rename to net-vpn/mullvadvpn-app/mullvadvpn-app-2025.6.ebuild
index 8cd7f20a6..e0d57780a 100644
--- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.5.ebuild
+++ b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.6_beta2.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.6_beta2.ebuild
deleted file mode 100644
index 8d1312be6..000000000
--- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.6_beta2.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
-}