From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A5E313835B for ; Sat, 3 Oct 2020 18:09:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95808E081A; Sat, 3 Oct 2020 18:09:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F56BE0809 for ; Sat, 3 Oct 2020 18:09:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34475340D01 for ; Sat, 3 Oct 2020 18:09:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B173B38C for ; Sat, 3 Oct 2020 18:09:44 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1601748562.9c6fba02844af3e30cb81d6ec83c769f59494e1b.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/, www-client/firefox/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/files/gentoo-default-prefs.js www-client/firefox/firefox-78.3.1.ebuild www-client/firefox/firefox-81.0.1.ebuild X-VCS-Directories: www-client/firefox/ www-client/firefox/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 9c6fba02844af3e30cb81d6ec83c769f59494e1b X-VCS-Branch: master Date: Sat, 3 Oct 2020 18:09:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aff92bcd-bc7c-483c-8cd1-d50fba814cb3 X-Archives-Hash: abeea2a7f90faf6de4ed2c3b911ac94b commit: 9c6fba02844af3e30cb81d6ec83c769f59494e1b Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Oct 3 16:24:02 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Oct 3 18:09:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6fba02 www-client/firefox: synchronize with www-client/firefox-bin Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> www-client/firefox/files/gentoo-default-prefs.js | 1 - www-client/firefox/firefox-78.3.1.ebuild | 17 +++++++++++------ www-client/firefox/firefox-81.0.1.ebuild | 17 +++++++++++------ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/www-client/firefox/files/gentoo-default-prefs.js b/www-client/firefox/files/gentoo-default-prefs.js index dceaf893e40..0407f5d3d23 100644 --- a/www-client/firefox/files/gentoo-default-prefs.js +++ b/www-client/firefox/files/gentoo-default-prefs.js @@ -4,7 +4,6 @@ pref("browser.urlbar.hideGoButton", true); pref("accessibility.typeaheadfind", true); pref("browser.shell.checkDefaultBrowser", false); pref("browser.EULA.override", true); -pref("general.useragent.vendor", "Gentoo"); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("intl.locale.requested", ""); /* Disable DoH by default */ diff --git a/www-client/firefox/firefox-78.3.1.ebuild b/www-client/firefox/firefox-78.3.1.ebuild index 23022d62897..92ff0b2c883 100644 --- a/www-client/firefox/firefox-78.3.1.ebuild +++ b/www-client/firefox/firefox-78.3.1.ebuild @@ -26,21 +26,24 @@ if [[ -n ${MOZ_ESR} ]] ; then MOZ_PV="${MOZ_PV}esr" fi +MOZ_PN="${PN%-bin}" +MOZ_P="${MOZ_PN}-${MOZ_PV}" + inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \ multiprocessing pax-utils python-any-r1 toolchain-funcs \ virtualx xdg -MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}" +MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}" if [[ ${PV} == *_rc* ]] ; then - MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}" + MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}" fi PATCH_URIS=( https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET} ) -SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz +SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz ${PATCH_URIS[@]}" DESCRIPTION="Firefox Web Browser" @@ -240,7 +243,7 @@ mozilla_set_globals() { fi SRC_URI+=" l10n_${xflag/[_@]/-}? (" - SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${PN}-${MOZ_PV}-${lang}.xpi" + SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P}-${lang}.xpi" SRC_URI+=" )" IUSE+=" l10n_${xflag/[_@]/-}" done @@ -893,7 +896,7 @@ src_install() { local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop" local display_protocols="auto X11" local icon="${PN}" - local name="Mozilla ${PN^}" + local name="Mozilla ${MOZ_PN^}" local use_wayland="false" if use wayland ; then @@ -943,7 +946,7 @@ src_install() { done # Install generic wrapper script - rm "${ED}/usr/bin/${PN}" || die + [[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}" newbin "${FILESDIR}/${PN}.sh" ${PN} # Update wrapper @@ -957,6 +960,8 @@ src_install() { sed -i \ -e "s:@PREFIX@:${EPREFIX}/usr:" \ + -e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \ + -e "s:@APULSELIB_DIR@:${apulselib}:" \ -e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \ "${wrapper}" \ || die diff --git a/www-client/firefox/firefox-81.0.1.ebuild b/www-client/firefox/firefox-81.0.1.ebuild index e79df820254..91b83e6df4f 100644 --- a/www-client/firefox/firefox-81.0.1.ebuild +++ b/www-client/firefox/firefox-81.0.1.ebuild @@ -26,21 +26,24 @@ if [[ -n ${MOZ_ESR} ]] ; then MOZ_PV="${MOZ_PV}esr" fi +MOZ_PN="${PN%-bin}" +MOZ_P="${MOZ_PN}-${MOZ_PV}" + inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \ multiprocessing pax-utils python-any-r1 toolchain-funcs \ virtualx xdg -MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}" +MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}" if [[ ${PV} == *_rc* ]] ; then - MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}" + MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}" fi PATCH_URIS=( https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET} ) -SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz +SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz ${PATCH_URIS[@]}" DESCRIPTION="Firefox Web Browser" @@ -240,7 +243,7 @@ mozilla_set_globals() { fi SRC_URI+=" l10n_${xflag/[_@]/-}? (" - SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${PN}-${MOZ_PV}-${lang}.xpi" + SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P}-${lang}.xpi" SRC_URI+=" )" IUSE+=" l10n_${xflag/[_@]/-}" done @@ -893,7 +896,7 @@ src_install() { local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop" local display_protocols="auto X11" local icon="${PN}" - local name="Mozilla ${PN^}" + local name="Mozilla ${MOZ_PN^}" local use_wayland="false" if use wayland ; then @@ -943,7 +946,7 @@ src_install() { done # Install generic wrapper script - rm "${ED}/usr/bin/${PN}" || die + [[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}" newbin "${FILESDIR}/${PN}.sh" ${PN} # Update wrapper @@ -957,6 +960,8 @@ src_install() { sed -i \ -e "s:@PREFIX@:${EPREFIX}/usr:" \ + -e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \ + -e "s:@APULSELIB_DIR@:${apulselib}:" \ -e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \ "${wrapper}" \ || die