commit:     5f632520df871004c8d41c77f25dce8987cdb875
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  5 04:43:03 2015 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Jan  5 04:43:03 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=5f632520

Revert "Enable -pie support in firefox-35.0_beta8, backport -pie support for 
esr"

This reverts commit 87bc2065a2bf7e8cb58a38b26f9e69c23f587356.

---
 mail-client/thunderbird/Manifest                  | 4 ++--
 mail-client/thunderbird/thunderbird-31.3.0.ebuild | 6 ++----
 www-client/firefox/firefox-35.0_beta8.ebuild      | 2 --
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index b88c706..1292e0e 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,8 +1,8 @@
 DIST enigmail-1.7.2.tar.gz 1420346 SHA256 
7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6 SHA512 
e121308127d25d658db804bcd49e37b609fe7a52c2b2f4b0e5cd5c90106157642e164b7f9e31ef419e89a60326af93ce007e6d04ecea714e4b933b01007fee10
 WHIRLPOOL 
8e226445556cbf31dc55c924f8d2367d4a497eff385fb31128be03dd0650d32251e37a99aba9806b1a019cc124b717f2e97a8341bd4e01dcc39be6580fe27a24
-DIST firefox-31.3-patches-0.1.tar.xz 5704 SHA256 
63ccfb9d6b5b1dafb77353739f0aad799394bdc2a2fb8a771e58cc3df3478afe SHA512 
7ee37bd0805376e4743dad7e745c3e33946a767cd8eda4d630120350451293846fba0d21ebb6291b28b487e13aefaf85de7e7a71740a2aec3a1e6235a8f4fc29
 WHIRLPOOL 
26c4cc87314887721024d62afa9699fa8675eb3664a0ce8c2949b88c57fc1c2365257302882e338f04c55a47a7b699fa2fb0ed1e9d6f5e71a5b0892990bfd161
+DIST firefox-31.0-patches-0.2.tar.xz 4636 SHA256 
fdcd4e68093fb905af06cd89aad7042f8a4e695dea9c184351945fcb5872a062 SHA512 
2fee84ac6027a1e1317470112df54fef411596a522bca756f82c525b13ba952015e71f2aa05a807fec04c3bd092e8cbebd0c2349e0dc4950b329a88811b00151
 WHIRLPOOL 
59dc5f3457dc2a0c0c83a0128063da00d127cee13487b112064368de7d98438b7ffeb1dfe362080eca6a82af4834f3e27c6bd887e51b5d59c728ae124b26114d
 DIST gdata-provider-1.0.3.tar.xz 55860 SHA256 
2a6b8c1bed9c32dbb91bceadaf36986bffab4379ebf8ab1af83f9321b38f9cdd SHA512 
d1a99e179f4bc57c98beef80c27c5f774dffdd177a0ee0adf27441aaea27f96d61e723e592f9fa813b943acb34f572d5769622e2dd45c5befec762e0cbe013fb
 WHIRLPOOL 
2d896ae041ec8e6bd6f9474bf01ccc43925d89254cd6c719dfb70e1a5677f21fcc9536c2595f6b1b5823607d69248512d6dc9f5a1f208bd2e25a59f30a0c8c3f
 DIST lightning-3.3.xpi 4226096 SHA256 
eedaf565bc253a6bc21618dcc95eb2cef121745c249734514bf37ebd6abb3e5a SHA512 
c0ae9d259ec28eb6d7335426cbaeaf2701b4a1230de203a5bcccb86937cadca6622031e7a7de11fa5a733631d20a2362fbdc04a1ab649a9383a2ae9114ab9c34
 WHIRLPOOL 
abebc35ca3eaddd50e8660e647c6382943327237375e1c31c567d03b4a91ced37c55d3e5e41b88d252d5fa025c56147ecb53e20dba98c08a2134b38848ffe98a
-DIST thunderbird-31.3-patches-0.1.tar.xz 1612 SHA256 
ce8d0b822618381aac1b537ba9d5eb241e8429c02ea7031698ae5757b74cf30d SHA512 
cd4bb748fa9c68a02860a72cf46c408ddecfc1ff368f9dd52cf84137be173be198cf64eb7be4c9cedcd4effef3503613a1c4c97fe1dc2ac8ee4496eb8470a94f
 WHIRLPOOL 
1fc348cbf14ad68060d8e9c78ff064e91d1deede4fdba694c0aa00447621d1e01580f75f17aee9e117adb7fa1e34cdfbf3d6cca1851226532d9189a3674ff56e
+DIST thunderbird-31.0-patches-0.1.tar.xz 948 SHA256 
eec36d5cd4c384d4787ca034b2abd4aaa41e831fbb6988169f603703af2083a3 SHA512 
4a20f23bcc97c9b00fa461f7b0e3b7660ec39a99c16154a0d35d6048d72db2b8bdb1c82c81cdd75047ab4a11326173313b4a85733b8697d2febeae968a85b38d
 WHIRLPOOL 
921e21cc3451f0db19d1f891952b53f75da08ad9e2da6309cf3d29c1facc05b83c618b6ad0c01abb121ff29b7a65af140a7021d4c584827b81a4977c879f6df8
 DIST thunderbird-31.3.0-ar.xpi 472812 SHA256 
961c958edcb33301c6459c12a2589333c6e993cdd93be4511ecaf9ea575f8bf3 SHA512 
c92450f4cd11179b72cb3c797816fa56dc70dc858ae4e8c5ce9e8e96802f82d725dd6d4f9de2a9a05eb5e222e98123e4d545befe124ec85854da4160c644f66c
 WHIRLPOOL 
82df04fe1defa6a06d75250d165a7fff69d2de0e5f86b094ac9d44b9e1689ae845cad57ad99dcff78df7f709b07833ddac85330cbbf0191ed6463afdd6680c1a
 DIST thunderbird-31.3.0-ast.xpi 393049 SHA256 
1582a7be9ac87115d5866ca72559018b7ce93ef6ffc3accc6c347d38dbb22bc4 SHA512 
d392fbeeb0e75839b05ac548bec31c887793b327f820e477ba2f47d537775ab73291ee96e9eab9d688e6ab9fb039bfc80d5b0b56778c961cb8163a37b2f7a387
 WHIRLPOOL 
dfb118c7e7370917cf306538b64ee0abb37f33cb73d8c72e465e594eb35ae97c684894aedcee904e9192bf30663df66282ac16379303612348882d9f9878f13d
 DIST thunderbird-31.3.0-be.xpi 427488 SHA256 
e2c9c3d0ab8ce123d388aabe8b075805c95f4733dca1ae9eff7464eb23aed083 SHA512 
1231c40de68865d2f303a0afa97f4742ab26e3308158032edfc76606b6cecbc8bc93277dc195ca91ed623b5edd6d8d063f6a128076e6f7231fea7f546beca8f5
 WHIRLPOOL 
ea01a1fc73d8e5a7c1009d432f2dde0287dcc7db0a5d31cef23dae4c4b95f3b82a552d1d77e6ee0918c30db889dc80d21eb50de4ad91c5bcf5be27aa64468e5a

diff --git a/mail-client/thunderbird/thunderbird-31.3.0.ebuild 
b/mail-client/thunderbird/thunderbird-31.3.0.ebuild
index e6839d1..8dbf1e4 100644
--- a/mail-client/thunderbird/thunderbird-31.3.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-31.3.0.ebuild
@@ -41,8 +41,8 @@ SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt hardened ldap +lightning +minimal mozdom selinux"
 
-PATCH="thunderbird-31.3-patches-0.1"
-PATCHFF="firefox-31.3-patches-0.1"
+PATCH="thunderbird-31.0-patches-0.1"
+PATCHFF="firefox-31.0-patches-0.2"
 
 SRC_URI="${SRC_URI}
        ${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
@@ -205,8 +205,6 @@ src_configure() {
        # Add full relro support for hardened
        use hardened && append-ldflags "-Wl,-z,relro,-z,now"
 
-       mozconfig_annotate '' --enable-pie
-
        mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
        mozconfig_annotate '' --disable-mailnews
 

diff --git a/www-client/firefox/firefox-35.0_beta8.ebuild 
b/www-client/firefox/firefox-35.0_beta8.ebuild
index 0b6a0f5..4df2026 100644
--- a/www-client/firefox/firefox-35.0_beta8.ebuild
+++ b/www-client/firefox/firefox-35.0_beta8.ebuild
@@ -212,8 +212,6 @@ src_configure() {
        # Add full relro support for hardened
        use hardened && append-ldflags "-Wl,-z,relro,-z,now"
 
-       mozconfig_annotate '' --enable-pie
-
        # Setup api key for location services
        echo -n "${_google_api_key}" > "${S}"/google-api-key
        mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"

Reply via email to