1 |
commit: 9e48ffc86f2462bf97ac6ebb813a45e96d70eb18 |
2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 28 03:47:07 2012 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 28 03:47:07 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=9e48ffc8 |
7 |
|
8 |
Fix bindist support |
9 |
|
10 |
--- |
11 |
eclass/mozconfig-3.eclass | 3 +++ |
12 |
www-client/firefox/Manifest | 2 +- |
13 |
www-client/firefox/firefox-11.0_beta4.ebuild | 6 +++--- |
14 |
3 files changed, 7 insertions(+), 4 deletions(-) |
15 |
|
16 |
diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass |
17 |
index 2ba0542..ef81db5 100644 |
18 |
--- a/eclass/mozconfig-3.eclass |
19 |
+++ b/eclass/mozconfig-3.eclass |
20 |
@@ -34,6 +34,9 @@ mozconfig_config() { |
21 |
|
22 |
if has bindist ${IUSE}; then |
23 |
mozconfig_use_enable !bindist official-branding |
24 |
+ if [[ ${PN} == firefox ]] ; then |
25 |
+ mozconfig_annotate '' --with-branding=browser/branding/aurora |
26 |
+ fi |
27 |
fi |
28 |
|
29 |
mozconfig_use_enable alsa ogg |
30 |
|
31 |
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest |
32 |
index 947fa00..08f1bb9 100644 |
33 |
--- a/www-client/firefox/Manifest |
34 |
+++ b/www-client/firefox/Manifest |
35 |
@@ -2,4 +2,4 @@ AUX gentoo-default-prefs.js-1 821 RMD160 13a7be3a165b7059e51fab2cc7fc8d31a82260e |
36 |
AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5 |
37 |
DIST firefox-11.0-patches-0.1.tar.xz 12632 RMD160 2e579ed97910225eb42670b299177128374e9493 SHA1 c1a5a8cc3110406e7b1913cc99e7d1b601e88bf6 SHA256 0e073f0394d631346e273592e2c89879f6d47ecd58e7c8a25ff58d8510db4364 |
38 |
DIST firefox-11.0b4.source.tar.bz2 78524626 RMD160 4867f46179207cac2cf1195d62cfc59404598060 SHA1 2b06c9191e3e0a8187decb52dad89ea9154e1fc7 SHA256 7338ce84cf1695aef01d15f01c75754bddab2b9d26e2c8e0aa341bece9365a30 |
39 |
-EBUILD firefox-11.0_beta4.ebuild 10545 RMD160 097428136e9bf6f535463cd7e317dc9e9bbeb9bc SHA1 2d5134958fb2a8c1d5e560e04361d83969d8e118 SHA256 c479de822b5768e005222677f85ab21f627e3223ddafff621de67de54c1e0dc8 |
40 |
+EBUILD firefox-11.0_beta4.ebuild 10531 RMD160 f24601557f7ccce79d000aea79ade6f8132f97a2 SHA1 aa9160f9f6814e795492f2fb68c0424530aa91b2 SHA256 f63e1a85a8343d387c634d5b4b27ae4aa4b79606f357f71760b5c656f0beb036 |
41 |
|
42 |
diff --git a/www-client/firefox/firefox-11.0_beta4.ebuild b/www-client/firefox/firefox-11.0_beta4.ebuild |
43 |
index 27d99dc..01acfa7 100644 |
44 |
--- a/www-client/firefox/firefox-11.0_beta4.ebuild |
45 |
+++ b/www-client/firefox/firefox-11.0_beta4.ebuild |
46 |
@@ -273,11 +273,11 @@ src_install() { |
47 |
local size sizes icon_path icon name |
48 |
if use bindist; then |
49 |
sizes="16 32 48" |
50 |
- icon_path="${S}/browser/branding/unofficial" |
51 |
+ icon_path="${S}/browser/branding/aurora" |
52 |
# Firefox's new rapid release cycle means no more codenames |
53 |
# Let's just stick with this one... |
54 |
- icon="tumucumaque" |
55 |
- name="Tumucumaque" |
56 |
+ icon="aurora" |
57 |
+ name="Aurora" |
58 |
else |
59 |
sizes="16 22 24 32 256" |
60 |
icon_path="${S}/browser/branding/official" |