commit:     9b59b019166a637a92a0fa20ef5b8dcbb035281f
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 14:15:27 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 14:22:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b59b019

www-client/firefox: update the icu patch logic to be consistent

Closes: https://bugs.gentoo.org/917700
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-client/firefox/firefox-120.0.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/www-client/firefox/firefox-120.0.ebuild 
b/www-client/firefox/firefox-120.0.ebuild
index cb30d6d39a34..fa5d4105f8f4 100644
--- a/www-client/firefox/firefox-120.0.ebuild
+++ b/www-client/firefox/firefox-120.0.ebuild
@@ -661,9 +661,10 @@ src_prepare() {
        fi
 
        # Workaround for bgo#917599
-       if use system-icu && ! has_version ">=dev-libs/icu-74.1" ; then
-               rm -v 
"${WORKDIR}"/firefox-patches/0028-bmo-1862601-system-icu-74.patch || die
+       if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+               eapply 
"${WORKDIR}"/firefox-patches/0028-bmo-1862601-system-icu-74.patch
        fi
+       rm -v "${WORKDIR}"/firefox-patches/0028-bmo-1862601-system-icu-74.patch 
|| die
 
        eapply "${WORKDIR}/firefox-patches"
 

Reply via email to