[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/

[Ian Stakenvicius]

commit:     c10e7aefae0aca88ec728aa989adeb0284321522
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 13:07:34 2017 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 13:07:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=c10e7aef

firefox: add patch to avoid nICEr implicit declarations on 52.4

...and cleanup testing cruft that was included in the previous commit(s)

 www-client/firefox/Manifest              | 2 +-
 www-client/firefox/firefox-52.4.0.ebuild | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index de4b4a3..531dfb7 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,4 +1,4 @@
-DIST firefox-52.4-patches-01.tar.xz 13216 SHA256 
a3a09e9a273d2cbdb531878768b1bbe54f7571c897d49ee6daee90e50c5ee88c SHA512 
30ad50c15c6d573a491cc3791aad2d6e58aa53fc2cef83bb5a6a924c8b5b41d5010c0e8fa7e89401fc69afda1e59e25d10d63ab5c2edbdbd78b9b72d46b285d0
 WHIRLPOOL 
d66370fb2b7a363a611a01b8e4448cb0a6071c7d1c1f0de054d4c11b7dc3fb714f2b16bf537dfaadcfb6a219c673af6712aff0f676708114e6ff811f642e0287
+DIST firefox-52.4-patches-02.tar.xz 14412 SHA256 
28e63a625cb22cec73fe5efd952566d6bd965dc453f205b0c00b2fb3b580dcdc SHA512 
6befeaefc118bc161ad05eed619142814e5cf31aaeede3fb5618b1f5ace887e9e1fa6914320b513404380a426cfb0f45107435f92b2d7e95d95cd7c44e03ad96
 WHIRLPOOL 
40323ecada75c7ee05ae19cd98bb262937a0d70f5fd7a25ec9454227f33ce81f363b602222b8f0bea879224e9f7c0132de982b2c551e40a0c7c63b8106efca69
 DIST firefox-52.4.0esr-ach.xpi 427641 SHA256 
849534789075ef5a137e2fd37ce49b51a0a2a56b71ef968f0d5c75d37fe58fe0 SHA512 
cd3487f6d9e63fb10c468dec36b3ab0ffed135f0662df7911866dd0aba57e67908a5b39967b206e684348632d11ab336d453f6de5af862365d303e63445da8df
 WHIRLPOOL 
3acbb2ad5a4bf227a7141ecedf6c3c17928919dc45bf440ed4626991b4ee69603c0d391050c4fe9ff043fe5704031398b2b9d047dfc312e050fa3fc6afc5bd37
 DIST firefox-52.4.0esr-af.xpi 436823 SHA256 
4daafb9d024128b8fa15281e0e8cdaeb0302c77acef0e4fe8eff96c521e8258b SHA512 
cb852122f456b6ffd1805e96743051208ad943b5a6ee153b9be2851d68844b3b855b61f637cffed72a04e5ec841201f17da5da4d41923306bec76de7044aee31
 WHIRLPOOL 
83ffa28c8d1ece0bf2174c5de7388abd69dea489b88812f9ef56135dd6e26d5e88648e0cced6aed7bea6491fcd49034c19ea729f5c644da929c6970e90ca3237
 DIST firefox-52.4.0esr-an.xpi 445142 SHA256 
83c3d0a90837484cef7f0e3b3e7060804d0709bac36e65c3cbc4a8ed989f0237 SHA512 
8797f014a7284a0b7907e1d885df2ee1028b948697983cc31cd90a9165ba7937abd6703196e31e59d78a0aedcab598f91df74fb026cc70edda8e14dc2d1c2bb1
 WHIRLPOOL 
6c4f661d0a672a222ac9d6c5a361ce28ca4457604d20d8b4543f2bdb1612fa559eb99e7dd1f674bd0fce6fb2d3a955f97bd0891b0bd53583aa6268d5f9f08671

diff --git a/www-client/firefox/firefox-52.4.0.ebuild 
b/www-client/firefox/firefox-52.4.0.ebuild
index fa7c110..d462498 100644
--- a/www-client/firefox/firefox-52.4.0.ebuild
+++ b/www-client/firefox/firefox-52.4.0.ebuild
@@ -24,7 +24,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-52.4-patches-01"
+PATCH="${PN}-52.4-patches-02"
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases";
 
 MOZCONFIG_OPTIONAL_GTK2ONLY=1
@@ -125,7 +125,6 @@ src_unpack() {
 src_prepare() {
        # Apply our patches
        eapply "${WORKDIR}/firefox"
-       eapply "${FILESDIR}"/nICEr*patch
 
        # Enable gnomebreakpad
        if use debug ; then