From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8DDB61384B4 for ; Thu, 5 Nov 2015 02:23:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B79E7E0851; Thu, 5 Nov 2015 02:23:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 586EFE0851 for ; Thu, 5 Nov 2015 02:23:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 757F034091A for ; Thu, 5 Nov 2015 02:23:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3ECA0204F for ; Thu, 5 Nov 2015 02:23:19 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1446690165.cfdf79384bbc9e7164a75eea6110642c5cb66a0a.axs@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/firefox-38.4.0.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: cfdf79384bbc9e7164a75eea6110642c5cb66a0a X-VCS-Branch: master Date: Thu, 5 Nov 2015 02:23:19 +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-Archives-Salt: 7ddf3608-781a-4d9d-9e8e-532b04671197 X-Archives-Hash: 1537e999ca277151c07878fe622181ee commit: cfdf79384bbc9e7164a75eea6110642c5cb66a0a Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Nov 5 02:22:45 2015 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Nov 5 02:22:45 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfdf7938 www-client/firefox: remove conflicting patch, force nss/nspr for security bug 564834 Package-Manager: portage-2.2.20.1 www-client/firefox/firefox-38.4.0.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/www-client/firefox/firefox-38.4.0.ebuild b/www-client/firefox/firefox-38.4.0.ebuild index a4db9de..9c008b5 100644 --- 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