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

["Itai Ferber" <itai@itaiferber.net>]

commit:     2d60b2f1914f62a0b90308461592292f5723ae9a
Author:     Itai Ferber <itai <AT> itaiferber <DOT> net>
AuthorDate: Thu Jul 25 14:25:45 2024 +0000
Commit:     Itai Ferber <itai <AT> itaiferber <DOT> net>
CommitDate: Thu Jul 25 14:26:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2d60b2f1

net-vpn/mullvadvpn-app: add 2024.4, drop 2024.4_beta1

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

 net-vpn/mullvadvpn-app/Manifest                          |  3 ++-
 ...-2024.4_beta1.ebuild => mullvadvpn-app-2024.4.ebuild} | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/net-vpn/mullvadvpn-app/Manifest b/net-vpn/mullvadvpn-app/Manifest
index a026738bd..047afd24f 100644
--- a/net-vpn/mullvadvpn-app/Manifest
+++ b/net-vpn/mullvadvpn-app/Manifest
@@ -1,2 +1,3 @@
 DIST MullvadVPN-2024.3_x86_64.rpm 88010345 BLAKE2B 8335327427e3033eca1219f16e340b0a5e9aac399e1d54f9abd771a0c02a5a6451dff89af7d9bc977ef2aca744259e99ba5ada1014eae6a69c38c384d1762d03 SHA512 4feec0521cd3a52b7d3aa82f851694ff8a27ab63188d673d6ce8b62d5485acbd8eefc6d35f99da6c40c6b6fce0e9c735d121329d97589a6869138aafafd62fd9
-DIST MullvadVPN-2024.4-beta1_x86_64.rpm 90815893 BLAKE2B 276d5194f5588e204ea7a50a7c64b637300d72c1ff6f5eff8b76c842324a6ce1e815548a5e128ec536586e53ccc8b1333e3ba8383f97d4572a8c96b010896d5b SHA512 3ba9f4593db906f7ee48f121ba6e961f7f7e43e41fc6f5e5d49ceef9b66513cc59429900501561e90bf486bac57463d7a5add57792097bd0f1797ea71d320d2f
+DIST MullvadVPN-2024.4_x86_64.rpm 90830721 BLAKE2B c9ac8bc13fc2f4789ba3e08cd8d4fe23c71b759313afed4fd7c1f3dd2f5f8d535aa48da4526e7039a64c6863747392c3537bff39cca9a9cbbfd3174a485ad4b5 SHA512 4d46bd92f5f4cbd95bfbd7e0e311ee7c2a88012b465bfe51f9d3cf760d23026dc8300511f1cef9486d70b6a10578057493afe93c98688087149bd381460b813d
+DIST MullvadVPN-2024.4_aarch64.rpm 84958649 BLAKE2B 173f9675a64f16e3d1473022dee0c543faa3ce1f5a996504b3ab814a8db3efa3103ab055292e58d1c74a5b2f1283f3404dbd85695dc25f449acfb2bfff879de3 SHA512 1abcb5df358cdc1c18ea0d3e366241b2f875391eeb240af2955a907faed427655682d9e594bff1e314137711f5c141d4036e6f8eccc3178aefd9e7e65c415f51

diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2024.4_beta1.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2024.4.ebuild
similarity index 82%
rename from net-vpn/mullvadvpn-app/mullvadvpn-app-2024.4_beta1.ebuild
rename to net-vpn/mullvadvpn-app/mullvadvpn-app-2024.4.ebuild
index e6ee527fe..4740ca85e 100644
--- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2024.4_beta1.ebuild
+++ b/net-vpn/mullvadvpn-app/mullvadvpn-app-2024.4.ebuild
@@ -5,17 +5,19 @@ 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 )"
+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"
+KEYWORDS="-* ~amd64 ~arm64"
 
-RESTRICT="bindist mirror test strip"
+RESTRICT="bindist mirror strip"
 
 RDEPEND="
 	app-accessibility/at-spi2-core
@@ -37,17 +39,17 @@ RDEPEND="
 QA_PREBUILT="*"
 
 src_install() {
+	sed -i "s|SCRIPT_DIR=.*|SCRIPT_DIR=\"/opt/Mullvad VPN/\"|g" "${S}"/opt/Mullvad\ VPN/mullvad-vpn
+
 	# Using doins -r would strip executable bits from all binaries
 	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
 	fperms +x "/opt/Mullvad VPN/chrome_crashpad_handler"
 	fperms 4755 "/opt/Mullvad VPN/chrome-sandbox"
 
-	# tbh I don't know if all next lines are needed or we can just do cp -pPR "${S}"/usr "${D}"/"
-
-	local i
 	dobin "${S}"/usr/bin/mullvad
 	dobin "${S}"/usr/bin/mullvad-daemon
 	dobin "${S}"/usr/bin/mullvad-exclude
+	dosym "../../opt/Mullvad VPN/mullvad-vpn" /usr/bin/mullvad-vpn
 	dosym "../../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