commit: 44a53f5e97b3ea4772e669fdf02b5e8284056c69
Author: Itai Ferber <itai <AT> itaiferber <DOT> net>
AuthorDate: Fri Jan 3 16:02:33 2025 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Fri Jan 3 16:02:33 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=44a53f5e
net-vpn/mullvadvpn-app: add 2025.1, drop 2024.8, 2024.9_beta1
Signed-off-by: Itai Ferber <itai <AT> itaiferber.net>
net-vpn/mullvadvpn-app/Manifest | 6 +-
.../mullvadvpn-app-2024.9_beta1.ebuild | 83 ----------------------
...-2024.8.ebuild => mullvadvpn-app-2025.1.ebuild} | 26 +++----
3 files changed, 15 insertions(+), 100 deletions(-)
diff --git a/net-vpn/mullvadvpn-app/Manifest b/net-vpn/mullvadvpn-app/Manifest
index b8895422d..f10c11690 100644
--- a/net-vpn/mullvadvpn-app/Manifest
+++ b/net-vpn/mullvadvpn-app/Manifest
@@ -1,4 +1,2 @@
-DIST MullvadVPN-2024.8_aarch64.rpm 83171245 BLAKE2B
06b9258fdd72b26637a6ad3e6acb08ad9d38dd5bec8f843560fddc5c812e9ab22312df4b5a8574a162a2b3f2aa45bc46b9d9a09bb3be2b7f20246a4c2e81df58
SHA512
950f5f0840e75b192ff12171c5b93f7820cebe4682bae5ad7e8687cce43449152bd1266d3895883d65f7d4eab1c52f5c902a0b0077e0430d5e32de0045f84094
-DIST MullvadVPN-2024.8_x86_64.rpm 88951337 BLAKE2B
541a52cf23f7de6dee8b03d4c004dc1f2cae6f3b337cfb9fe51782f55cb371fe52f46877c13da53439fd6230096fa0738d485d8a4510cebb3c2536257e8809d1
SHA512
7cd29c7472ce8a23eb737ec73de101b703e5c0c32b9a3c32055d6c874f5e7eb5ef7fb382c95bf1b01267f48936d4bc83012fca5967ca32a000233098964337f4
-DIST MullvadVPN-2024.9-beta1_aarch64.rpm 83133761 BLAKE2B
cf3680d2abceab4fdff38d6b86ea150d22f4734c4f80bffcf5bf53c096d2b250ec77d0b384a3e3ee9a521e3747da657d7d24d15fae43bbff68a7819632e246a3
SHA512
88765fba9115b42b0083e6015ae743525a10bc553dd6f19b434c62898bde3bdac935f539fbc5485c40723a3ec5fe8c2e0cf47aab79c7291a9381494701c503fd
-DIST MullvadVPN-2024.9-beta1_x86_64.rpm 88897153 BLAKE2B
10be174ec661801f7e702ddd529089927626400afa17e6086f23d0ea552862d7dc67aeafe573c24a8ab0ef8017169b7a35c844d6ef672a4fe8947050e7665456
SHA512
1d56d5567e6778439744edc1104c278736dc9687a7af249e9901b26d1e03df607ab97fbe59842c80f8f2c3a758de754e98334853ed5e6c7d03d51b2f10ad95e0
+DIST MullvadVPN-2025.1_aarch64.rpm 83156249 BLAKE2B
7d2f820b578792f3638435773fc3c212c919b65c1358f51085932eada7473cee023c72c4a10156f5cb8e8a2ae8052776d2752a518eefdef4c92fd797dd5680f2
SHA512
1228abbe244020dda530b6b86e36030f46d1d86d009772dac6252c6d6751af780ac845968dc992ff5745c25686290e86a1f2c9c5c402715087f7495c5a04b518
+DIST MullvadVPN-2025.1_x86_64.rpm 88907549 BLAKE2B
f220d20c60f6a1fc13a9ebb16686ef074878444ae7fbe3b45e9c7061ba743ed9af39854381681db6e737f00c1b25a28c7d70d0d05e39c85797038ae8d9da33b9
SHA512
eca7ade4530c6e0e70f91c2630fa203f44e0ad12c59ebb7e518ac349998af5c7c1e283603ba4d9d2eb5d7448987d0fb0a733acf5d71215dd127302143501cbc4
diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2024.9_beta1.ebuild
b/net-vpn/mullvadvpn-app/mullvadvpn-app-2024.9_beta1.ebuild
deleted file mode 100644
index 74b5bde48..000000000
--- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2024.9_beta1.ebuild
+++ /dev/null
@@ -1,83 +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 "${S}"/opt "${D}"/ || die "Failed to copy files"
- fperms +x "/opt/Mullvad VPN/chrome_crashpad_handler"
- fperms 4755 "/opt/Mullvad VPN/chrome-sandbox"
-
- 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
- # 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 "${S}"/usr/lib/systemd/system/mullvad-daemon.service
mullvad-daemon.service
- systemd_newunit
"${S}"/usr/lib/systemd/system/mullvad-early-boot-blocking.service
mullvad-early-boot-blocking.service
-
- newbashcomp "${S}"/usr/share/bash-completion/completions/mullvad mullvad
- newfishcomp "${S}"/usr/share/fish/vendor_completions.d/mullvad.fish
mullvad
- newzshcomp "${S}"/usr/share/zsh/site-functions/_mullvad _mullvad
-
- domenu "${S}"/usr/share/applications/mullvad-vpn.desktop
- local x
- for x in 16 32 48 64 128 256 512 1024; do
- doicon -s ${x}
"${S}"/usr/share/icons/hicolor/${x}x${x}/apps/mullvad-vpn.png
- done
-}
diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2024.8.ebuild
b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.1.ebuild
similarity index 67%
rename from net-vpn/mullvadvpn-app/mullvadvpn-app-2024.8.ebuild
rename to net-vpn/mullvadvpn-app/mullvadvpn-app-2025.1.ebuild
index 91b38137c..6b35baf50 100644
--- a/net-vpn/mullvadvpn-app/mullvadvpn-app-2024.8.ebuild
+++ b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.1.ebuild
@@ -49,15 +49,15 @@ 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 "${S}"/opt "${D}"/ || die "Failed to copy files"
+ 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 "${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
+ 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
@@ -67,16 +67,16 @@ src_install() {
newinitd "${FILESDIR}"/mullvad-daemon.initd mullvad-daemon
- systemd_newunit "${S}"/usr/lib/systemd/system/mullvad-daemon.service
mullvad-daemon.service
- systemd_newunit
"${S}"/usr/lib/systemd/system/mullvad-early-boot-blocking.service
mullvad-early-boot-blocking.service
+ 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 "${S}"/usr/share/bash-completion/completions/mullvad mullvad
- newfishcomp "${S}"/usr/share/fish/vendor_completions.d/mullvad.fish
mullvad
- newzshcomp "${S}"/usr/share/zsh/site-functions/_mullvad _mullvad
+ 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 "${S}"/usr/share/applications/mullvad-vpn.desktop
+ domenu ./usr/share/applications/mullvad-vpn.desktop
local x
for x in 16 32 48 64 128 256 512 1024; do
- doicon -s ${x}
"${S}"/usr/share/icons/hicolor/${x}x${x}/apps/mullvad-vpn.png
+ doicon -s "${x}"
"./usr/share/icons/hicolor/${x}x${x}/apps/mullvad-vpn.png"
done
}
