From: Nick Bowler Date: Sun, 2 Apr 2023 17:17:52 +0000 (-0400) Subject: www-client/firefox: Update firefox-52.9.0 to EAPI 8. X-Git-Url: http://git.draconx.ca/gitweb/gentoo-fixes.git/commitdiff_plain/157fa9c3e4a987416eb85205c632d8220b00c4d1 www-client/firefox: Update firefox-52.9.0 to EAPI 8. --- diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass index 96efaa7..fe2cb69 100644 --- a/eclass/mozconfig-v6.52.eclass +++ b/eclass/mozconfig-v6.52.eclass @@ -7,11 +7,12 @@ # The modifications are: # # * Update libffi dependency (2022-12) +# * Update to EAPI 8 (2023-04) # # @ECLASS: mozconfig-v6.52.eclass # @MAINTAINER: # mozilla team -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6 # @DESCRIPTION: # This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey) @@ -26,12 +27,9 @@ # and so ebuilds inheriting this eclass do not need to inherit that. case ${EAPI} in - 0|1|2|3|4) + 0|1|2|3|4|5|6) die "EAPI=${EAPI} not supported" ;; - 5) - inherit multilib - ;; esac inherit flag-o-matic toolchain-funcs mozcoreconf-v5 @@ -172,15 +170,15 @@ if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then )" fi -DEPEND="app-arch/zip +BEPEND="app-arch/zip app-arch/unzip - >=sys-devel/binutils-2.16.1 - sys-apps/findutils - pulseaudio? ( media-sound/pulseaudio ) - ${RDEPEND}" + sys-apps/findutils" + +DEPEND="$RDEPEND + pulseaudio? ( media-libs/libpulse )" RDEPEND+=" - pulseaudio? ( || ( media-sound/pulseaudio + pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )" diff --git a/eclass/mozcoreconf-v5.eclass b/eclass/mozcoreconf-v5.eclass index ce0e2a4..feb7b1a 100644 --- a/eclass/mozcoreconf-v5.eclass +++ b/eclass/mozcoreconf-v5.eclass @@ -7,6 +7,8 @@ # The modifications are: # # * Avoid python eclasses which no longer support python2 (2022-12) +# * Remove versionator inherit which seems unused (2023-04) +# * Update to EAPI 8 (2023-04) # # @DEAD # @ECLASS: mozcoreconf-v5.eclass @@ -24,12 +26,12 @@ if [[ ! ${_MOZCORECONF} ]]; then -inherit multilib toolchain-funcs flag-o-matic versionator +inherit multilib toolchain-funcs flag-o-matic IUSE="${IUSE} custom-cflags custom-optimization" -DEPEND="virtual/pkgconfig - dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)]" +BDEPEND="dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] + virtual/pkgconfig" # @FUNCTION: mozconfig_annotate # @DESCRIPTION: diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index d961a05..52fa9e4 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -101,4 +101,4 @@ DIST firefox-52.9.0esr-xh.xpi 441173 BLAKE2B 3e1b907a7659c639d17d25a1825f4728532 DIST firefox-52.9.0esr-zh-CN.xpi 461679 BLAKE2B 745b2cfb86e93a379e13fa73b7e3721bae06694768316e31a2aed608e3050f585a9603375cd35b90affca11b3e5e44401b1e676f9c8050ade287ed0feb442a7a SHA512 ca62e0e2ab075086741159b185b5eba44c6bdfc29fd9ba1cf25808f127c1aed8875ea61c1c33e4f742fa26af4455a8873730f96ad9c7bec1f66aed0595f253f1 DIST firefox-52.9.0esr-zh-TW.xpi 453068 BLAKE2B 84e08ea4fd119db1f1c6f84b212fbbb5d6999c5ac6010c0e7836d8734726d281107f3d91ba7bac1aeaf855dc36d3b018ae3913dccdbe2b11aad02a8d8aaa893c SHA512 a99042ef7d00820e341dfcf2c45a8b5bd77eaf2cc8ecf0ff5ee982b7bd9beac7cb4bf051c57ef3b7a5d9b67cd35858dca396d21e65718e248f3b1fdba5273999 DIST firefox-52.9.0esr.source.tar.xz 214087304 BLAKE2B eba5305ae3fc9a4306cbcbcd8d4610272ca5b75e369367961e9d94919b003de8aae8f3c58fe1c628787d98105a85fab575ae2b051e92a0b35bbb8b402c100766 SHA512 bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9 -EBUILD firefox-52.9.0-r2.ebuild 13549 BLAKE2B 281f186f41637bfb17ebefe56ee09b2da3c2fce051bb62fed0bfdacc390e1f69b50b50e9fc581aac90782e083bf3e0e18d8e049b3234684dcadb201eaf21b239 SHA512 f15de8a23a8e6350b93d49a773b664361752f2971b865e1e9b9464883c5df59f5f717fabfb2ad5ba42d208da2fae3876a9205a68303daa6a82d729a85992ba60 +EBUILD firefox-52.9.0-r3.ebuild 13505 BLAKE2B 4f56743732f815d442b68237a166ffcc5d1ce87cca4c11d0c2f2d731b3589ff09dc7940cedc6ffcaa34b61644abc0b6a373d32289358df3c23eab4fe7cc88979 SHA512 15db6300858d841a3ec643c11a675ea2880768f1c24016ba5aced9585c0040343c23e7de58c7b10a56ad1d0f009b3a131e53e58b359a1c56a482b3784753e3ec diff --git a/www-client/firefox/firefox-52.9.0-r2.ebuild b/www-client/firefox/firefox-52.9.0-r3.ebuild similarity index 97% rename from www-client/firefox/firefox-52.9.0-r2.ebuild rename to www-client/firefox/firefox-52.9.0-r3.ebuild index f60ba25..5c08255 100644 --- a/www-client/firefox/firefox-52.9.0-r2.ebuild +++ b/www-client/firefox/firefox-52.9.0-r3.ebuild @@ -7,8 +7,9 @@ # The modifications are: # # * Apply patches to build on modern systems (2022-12) +# * Update to EAPI 8 (2023-04) -EAPI=6 +EAPI=8 VIRTUALX_REQUIRED="pgo" WANT_AUTOCONF="2.1" MOZ_ESR=1 @@ -37,7 +38,7 @@ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" MOZCONFIG_OPTIONAL_GTK2ONLY=1 MOZCONFIG_OPTIONAL_WIFI=1 -inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.52 pax-utils xdg-utils autotools virtualx mozlinguas-v2 +inherit check-reqs flag-o-matic toolchain-funcs desktop mozconfig-v6.52 pax-utils xdg-utils autotools virtualx mozlinguas-v2 DESCRIPTION="Firefox Web Browser" HOMEPAGE="https://www.mozilla.org/firefox" @@ -130,6 +131,8 @@ src_unpack() { } src_prepare() { + xdg_environment_reset + # Apply our patches rm -f "${WORKDIR}"/firefox/2007_fix_nvidia_latest.patch eapply "${WORKDIR}/firefox" @@ -264,8 +267,6 @@ src_compile() { if use pgo; then addpredict /root addpredict /etc/gconf - # Reset and cleanup environment variables used by GNOME/XDG - gnome2_environment_reset # Firefox tries to use dri stuff when it's run, see bug 380283 shopt -s nullglob @@ -381,8 +382,6 @@ PROFILE_EOF } pkg_preinst() { - gnome2_icon_savelist - # if the apulse libs are available in MOZILLA_FIVE_HOME then apulse # doesn't need to be forced into the LD_LIBRARY_PATH if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then @@ -403,7 +402,7 @@ pkg_preinst() { pkg_postinst() { # Update mimedb for the new .desktop file xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update if ! use gmp-autoupdate && ! use eme-free ; then elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or" @@ -420,5 +419,6 @@ pkg_postinst() { } pkg_postrm() { - gnome2_icon_cache_update + xdg_desktop_database_update + xdg_icon_cache_update }