www-client/firefox: remove conflicting patch, force nss/nspr for security bug 564834

Package-Manager: portage-2.2.20.1

diff --git a/www-client/firefox/firefox-38.4.0.ebuild b/www-client/firefox/firefox-38.4.0.ebuild
index a4db9de21cfd3543441c1df2ee10e4ac30f6818f..9c008b59c85ff35dee4837dbb6de5321af062ee7 100644 (file)
--- a/www-client/firefox/firefox-38.4.0.ebuild
+++ b/www-client/firefox/firefox-38.4.0.ebuild
@@ -55,8 +55,8 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 # Mesa 7.10 needed for WebGL + bugfixes
 RDEPEND="
-       >=dev-libs/nss-3.19.2
-       >=dev-libs/nspr-4.10.8
+       >=dev-libs/nss-3.20.1
+       >=dev-libs/nspr-4.10.10
        selinux? ( sec-policy/selinux-mozilla )"
 
 DEPEND="${RDEPEND}
@@ -139,6 +139,7 @@ src_prepare() {
        # Apply our patches
        EPATCH_SUFFIX="patch" \
        EPATCH_FORCE="yes" \
+       EPATCH_EXCLUDE="8011_bug1194520-freetype261_until_moz43.patch" \
        epatch "${WORKDIR}/firefox"
 
        # Allow user to apply any additional patches without modifing ebuild