repo/proj/guru:master commit in: www-client/mullvad-browser/

commit:     0043b83d4916d3775350569a7704aa1ed42cb35a
Author:     bakedsnake <bakedsnake <AT> vagrantz <DOT> xyz>
AuthorDate: Sun Aug  2 15:36:25 2026 +0000
Commit:     David Roman <stkw0 <AT> disroot <DOT> org>
CommitDate: Sun Aug  2 15:36:25 2026 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0043b83d

www-client/mullvad-browser: revbump 140.13.0-r1

Signed-off-by: bakedsnake <bakedsnake <AT> vagrantz.xyz>

 www-client/mullvad-browser/Manifest                |  2 +-
 ...0.ebuild => mullvad-browser-140.13.0-r1.ebuild} | 35 +++++-----------------
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/www-client/mullvad-browser/Manifest b/www-client/mullvad-browser/Manifest
index fc8f88553e..eaf804ae82 100644
--- a/www-client/mullvad-browser/Manifest
+++ b/www-client/mullvad-browser/Manifest
@@ -1,6 +1,6 @@
 DIST firefox-140esr-patches-13.tar.xz 15628 BLAKE2B 824c3d42f2f6cf70932fe395cf11dfe9043e09e20d6dfd2bd64ce4567206def45424e82b738f27c71648f0b2d97608746d22565cf7aa35713dedd71a24cde449 SHA512 d4d59818944f6a8213598308a1095a0f3c9818e6c517587e4630056d432a0e9673ad627447ca18dfa884dbb35bc2921e54cfc63f9c5646765e0f66a75279584d
 DIST firefox-153-patches-01.tar.xz 11308 BLAKE2B cfb7e8528f46e780ff10d728d6f2f00215c9cb940f3ba289aafee183199fd2a38cbe866697b5bd89458d8dce7e82e9a7dc6977e817bbeac1a01178a64adb0405 SHA512 11895ae7eba03b12ae60c280c3ea555c2954dd15eaa8a459f9a95b96629723ed599ab4e7738b33f1bdb0d09d19bccb53d511eaac9913a58e6418c11fe93c92bc
-DIST mullvad-browser-140.13.0.tar.gz 799233754 BLAKE2B 3e7c592a4eb87e2a25c6046251a47f6edd2e3e76adb1465a8c4cac021eac13bab98280d230b91d3bf43a1b7ddbb37d6bc2b914f338c8bd431474603af6225fb0 SHA512 743e2649806dd665ea821a01d0ca30cd9a81123711d54c34b0b8446198156c22a4788c5df92533d8a594eb6a931a4cf20139e982f204494de8732cf6e12d7e20
+DIST mullvad-browser-140.13.0.tar.bz2 799233754 BLAKE2B 3e7c592a4eb87e2a25c6046251a47f6edd2e3e76adb1465a8c4cac021eac13bab98280d230b91d3bf43a1b7ddbb37d6bc2b914f338c8bd431474603af6225fb0 SHA512 743e2649806dd665ea821a01d0ca30cd9a81123711d54c34b0b8446198156c22a4788c5df92533d8a594eb6a931a4cf20139e982f204494de8732cf6e12d7e20
 DIST mullvad-browser-153.0.2.tar.bz2 911379618 BLAKE2B be0f0a7f02258b58d2149061af3634e82600eb7b78a63c1437728ed4af763ffa31c800ed46115f5d76c9efc204986fe58baa40ed0eefa28b4f662a64263a286f SHA512 511dd6339774a22b25ff519dc042770f2ef3e433c9a264817bf6e70e6b63e01400d4914a015e8c3d771cd5892c231aa17877bda807548f770d3d4c3df31eb00c
 DIST mullvad-browser-extension-0.9.10.xpi 687004 BLAKE2B 24bea115caf9b1510b43d736adf0a84c0f5554125044697fe965c30b0459d7910f6381c9b5e758ed7d19c778b4b8353f6cba8ecbf81473969a82617fa85f2d07 SHA512 8bfd5f656bc04c7c65633e22a4920db339dc7b0f41c31c28e40b4f284059485d6118b19bcdcf425d0db1f2a61c6244b1e59e569b51974a249c7039e33c68bf03
 DIST uBlock0_1.72.2.firefox.signed.xpi 4585322 BLAKE2B 86d5f46ec0bc31ad8c32604a8f58e654b3b0c2506856e8365f2912bdb47b31e26091dd2b1d1df554839870e81b476e37a3d105376adb641e8b4ad8279561d033 SHA512 644b7d455962372cc7044e6c522246594a248a614ff5745ad2c63a23d0ac047ca78271551c93beda7a04496ce093400aebbfea156e31dfbb298a95589f4e8fe1

diff --git a/www-client/mullvad-browser/mullvad-browser-140.13.0.ebuild b/www-client/mullvad-browser/mullvad-browser-140.13.0-r1.ebuild
similarity index 97%
rename from www-client/mullvad-browser/mullvad-browser-140.13.0.ebuild
rename to www-client/mullvad-browser/mullvad-browser-140.13.0-r1.ebuild
index 7673bf90df..d8175bbff2 100644
--- a/www-client/mullvad-browser/mullvad-browser-140.13.0.ebuild
+++ b/www-client/mullvad-browser/mullvad-browser-140.13.0-r1.ebuild
@@ -14,7 +14,7 @@ RUST_NEEDS_LLVM=1
 # Minimum version required to build.
 # Max version supported by LLVM_COMPAT.
 RUST_MIN_VER=1.82.0
-#RUST_MAX_VER=1.94.1
+RUST_MAX_VER=1.94.1
 
 PYTHON_COMPAT=( python3_{12..15} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -22,6 +22,7 @@ PYTHON_REQ_USE="ncurses,sqlite,ssl"
 VIRTUALX_REQUIRED="manual"
 
 # Mullvad version & extensions
+MULLVAD_P="${P}esr"
 MULLVAD_PV="${PV}"
 MULLVAD_EXT_PV="0.9.10"
 MULLVAD_EXT_XPI="${PN}-extension-${MULLVAD_EXT_PV}.xpi"
@@ -34,6 +35,7 @@ WASI_SDK_VER=32.0
 WASI_SDK_LLVM_VER=22
 
 MOZ_PN="firefox"
+ESR_PV="15.0-1-build2"
 
 DESCRIPTION="The Mullvad Browser is developed to minimize tracking and fingerprinting"
 HOMEPAGE="https://github.com/mullvad/mullvad-browser/ https://mullvad.net/"
@@ -42,13 +44,13 @@ inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multipro
 	optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg
 
 MULLVAD_BASE_URI="https://gitlab.torproject.org/tpo/applications/${PN}"
-MULLVAD_SRC_URI="${MULLVAD_BASE_URI}/-/archive/${P}esr-15.0-1-build2/${PN}-${P}esr-15.0-1-build2.tar.bz2?ref_type=tags"
+MULLVAD_SRC_URI="${MULLVAD_BASE_URI}/-/archive/${MULLVAD_P}-${ESR_PV}/${PN}-${MULLVAD_P}-${ESR_PV}.tar.bz2?ref_type=tags"
 
 PATCH_URIS=(
 	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
 )
 
-SRC_URI="${MULLVAD_SRC_URI} -> ${P}.tar.gz
+SRC_URI="${MULLVAD_SRC_URI} -> ${P}.tar.bz2
 	https://github.com/mullvad/browser-extension/releases/download/v${MULLVAD_EXT_PV}-firefox-beta/${MULLVAD_EXT_XPI}
 	https://github.com/gorhill/uBlock/releases/download/${UBLOCK_PV}/${UBLOCK_XPI}
 	${PATCH_URIS[@]}
@@ -57,7 +59,7 @@ SRC_URI="${MULLVAD_SRC_URI} -> ${P}.tar.gz
 		arm64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-arm64-linux.tar.gz )
 	)"
 
-S="${WORKDIR}/${PN}-${P}esr-15.0-1-build2"
+S="${WORKDIR}/${PN}-${MULLVAD_P}-${ESR_PV}"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1)"
 KEYWORDS="~*"
@@ -1189,28 +1191,7 @@ src_install() {
 		"${BUILD_DIR}"/dist/bin/${PN} \
 		"${BUILD_DIR}"/dist/bin/plugin-container
 
-	#DESTDIR="${D}" ./mach install || die
-	# ./mach install doesn't install the locale information for some reason.
-	# Use packge-multi-locale instead
-	local mymozlangs=()
-	for lang_tuple in "${MOZ_LANG_MAP[@]}"; do
-		IFS=' ' read -r l10n lang <<< "${lang_tuple}"
-
-		if use "${l10n}"; then
-			mymozlangs+=("${lang}")
-		fi
-	done
-
-	if (( ${#mymozlangs[@]} == 0 )); then
-		einfo "Running ./mach package"
-		./mach package || die
-	else
-		einfo "Running ./mach package-multi-locale"
-		./mach package-multi-locale --locale "${mymozlangs[@]}" || die
-	fi
-
-	dodir "${MOZILLA_FIVE_HOME}" || die
-	cp -r "${BUILD_DIR}"/dist/${PN}/* "${ED}"/"${MOZILLA_FIVE_HOME}" || die
+	DESTDIR="${D}" ./mach install || die
 
 	# Upstream cannot ship symlink but we can (bmo#658850)
 	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
@@ -1236,8 +1217,6 @@ src_install() {
 	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
 	insinto "${PREFS_DIR}"
 	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-	# Enable extensions in private ( this is always required for mullvad )
-	#newins "${FILESDIR}"/mullvad-extension-prefs.json extension-preferences.json
 
 	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"