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

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     294ef67fb2557d6f87eea525aedf93ad82f526d6
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 13 14:01:31 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 14:01:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=294ef67f

Update firefox beta and aurora builds

* Aurora build doesn't have the FreeBSD patches yet, they collide with the
  NetBSD patches upstream

---
 profiles/package.mask                              |    2 +-
 www-client/firefox/Manifest                        |   13 ++++++++-----
 ....patch => firefox-14.0_beta7-gst-aac-mp3.patch} |    0
 ...h => firefox-14.0_beta7-gst-youtube-h264.patch} |    0
 ..._alpha2-r1.ebuild => firefox-14.0_beta7.ebuild} |   10 +++++-----
 ...alpha2-r1.ebuild => firefox-15.0_alpha2.ebuild} |    9 +++++----
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index f713ac0..6c713b6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -9,4 +9,4 @@
 =www-client/seamonkey-2.7*
 
 # Mask nightlies
-=www-client/firefox-14*
+=www-client/firefox-15*

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 974f369..d66d1a0 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,5 +1,5 @@
-AUX firefox-14.0_alpha2-gst-aac-mp3.patch 2454 RMD160 47fe9e90b2d5acf6f25d4641b983a5a077d89a57 SHA1 234ccafcb7df3f55d4cee6f776a01987068bb685 SHA256 ef3e6539d292629a52a592cecd90a23562480d7280cfd3883d4407ad06e418a7
-AUX firefox-14.0_alpha2-gst-youtube-h264.patch 1437 RMD160 48daef08188b9862cef5af9192f029347a7a0a9b SHA1 03bde68c29b6acd50e4b6b6eac5fa2c12053b216 SHA256 9b871769727e6d16939c55695b4f08c6b460c3f6cf5bce46ce429f40c4801669
+AUX firefox-14.0_beta7-gst-aac-mp3.patch 2454 RMD160 47fe9e90b2d5acf6f25d4641b983a5a077d89a57 SHA1 234ccafcb7df3f55d4cee6f776a01987068bb685 SHA256 ef3e6539d292629a52a592cecd90a23562480d7280cfd3883d4407ad06e418a7
+AUX firefox-14.0_beta7-gst-youtube-h264.patch 1437 RMD160 48daef08188b9862cef5af9192f029347a7a0a9b SHA1 03bde68c29b6acd50e4b6b6eac5fa2c12053b216 SHA256 9b871769727e6d16939c55695b4f08c6b460c3f6cf5bce46ce429f40c4801669
 AUX gentoo-default-prefs.js-1 821 RMD160 13a7be3a165b7059e51fab2cc7fc8d31a82260eb SHA1 333339c4deb4fd41527fd87e1acf0af12cf1007c SHA256 16259ec24a231d1d60097c8d892caa80d2703ba5be72304f6da55cfce1b329de
 AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
 DIST firefox-10.0-patches-0.8.tar.xz 18456 RMD160 bdd93792d2f95b049de82f3f71108f098c4a167a SHA1 faedecffae34df7ca2086ffae7cb1a25f3ae76a4 SHA256 ec333d90aed209e22a2b2049b8483e8fac62b7ed5b664a0b6255769c4bb90e5d
@@ -174,8 +174,11 @@ DIST firefox-13.0-zh-CN.xpi 273138 RMD160 8bfcbf511e4c899767021091a463ee6dbc5742
 DIST firefox-13.0-zh-TW.xpi 274059 RMD160 3b98f036f4e21ab941aabd0d78a896b51626336e SHA1 65dbca96ac33b1c4f6c15ff8c40a04d5c8a397db SHA256 20af0bdeac9fc590cbef9334261d5e82f72ea9945bc872f0825a7a83a86aa6f0
 DIST firefox-13.0-zu.xpi 261910 RMD160 cc5892e61c30e38aaadcffda0cf0239a74711514 SHA1 eaa135f95e99d60b80b464811d04b831bf414bb5 SHA256 fd120c3d6092288b8c0f70bc37de9d719f7faa515ac46cd9ea0ac963c7aaebe6
 DIST firefox-13.0.source.tar.bz2 79605635 RMD160 8dbb9ef17fb5a47f3ae53ae9626e7668116111c7 SHA1 f90608874a54883b9fbb90b8d6dd3dc75a305572 SHA256 dc801286e752ba3c2006caa0728024cb5b92460d9a3a1636c111c1f4f4f50b55
-DIST firefox-14.0-patches-0.1.tar.xz 9832 RMD160 70d23bc9e3860c405126bcb3a1365e81fd46fce6 SHA1 71a3c33ffa4423db46c4758690424e33a7f386da SHA256 9490723fc44e89dbf541d3427796cdab1a9398e43f869a30e35455c7fb5ee8b5
-DIST firefox-14.0a2_7f3c5dd8e78f.source.tar.bz2 81112940 RMD160 e5412ebb1fbe471b04aeba1ad18b579224c9e2b4 SHA1 8ba004b4b6a8b31fba50c12926113e141ac917fd SHA256 c02f8e267d61ad9be7837645bf02b71a3df125c681a4a639abbfdad73b75e466
+DIST firefox-14.0-patches-0.2.tar.xz 11904 RMD160 63951363d88da2c77ba6d6cdc52a7b2a0a76592f SHA1 5758f74c307d2059d6c54658136b6ccd484c3dac SHA256 0a056263037cc8481521948efb7a947d6ccefa35e945c899b426ae2d91ba02c0
+DIST firefox-14.0b7.source.tar.bz2 82426700 RMD160 55a7118b3213945677e8bf3d97a8869ab0be7211 SHA1 9550e9f30e1e967ae5c84bf2752640ed5b715850 SHA256 3eb9ed6b12c7d77dae55a942f0911e54c8bb4e86453a6c1b3308ba27ef0768a1
+DIST firefox-15.0-patches-0.1.tar.xz 6660 RMD160 e91cc5fcbe3fb35dc53e930d3b97bf5cd2b439b6 SHA1 2afbe928a25f75b65cd52eb9361460ab50da6b46 SHA256 04ed66367039f172dd72aca0c774eef6a016f8a1bd86b286997bee37430bbeee
+DIST firefox-15.0a2_8a3042764de7.source.tar.bz2 81578584 RMD160 fdd90c38615a47e46e824ef27b10fa1e945f8b71 SHA1 1734dafe9055f2788baee07cfbee4c60f94049e7 SHA256 c99631579a5e7ff7869e489e8d7e659652d448469d153ba5ecbe251c79168781
 EBUILD firefox-10.0.5.ebuild 10770 RMD160 7d64c4c002d67c3fe3a5e64894ac585a188a83f4 SHA1 ee4ad9e22a4fef64ea28742c5122bfaa06327f96 SHA256 9d26129721352967e0ed2560a475bfcf66e0531c135007b635f7efc8b72ba3f2
 EBUILD firefox-13.0.ebuild 11072 RMD160 33edb80cf6bfee4e0766004c3487238d64b3ca19 SHA1 ac77d0538582492768b0a45ce6b9aa6b445dda8c SHA256 24f9693228005257e5f95d2dabc23a6f8ef34d384c5345a4ea335255ea5cd8ff
-EBUILD firefox-14.0_alpha2-r1.ebuild 11475 RMD160 7a6d2b65f2698736aa1acf99dde3b00d4ea59bbf SHA1 1f87a0029232479a170a2d9e54ca4fe083cb7321 SHA256 cff2d627e28e6f2eacd4fe742dd93a98f23961dccd7f66b77dd0aa1d69892fea
+EBUILD firefox-14.0_beta7.ebuild 11491 RMD160 cae9405cce24bc75ad4123e16a1f8c56712aa35a SHA1 885764b07726d04692e86f4656622cad8c2f146e SHA256 015dac82f4d6aae751f440d053df7f749c448c8bc1be510924b62c69fb623853
+EBUILD firefox-15.0_alpha2.ebuild 11511 RMD160 1f0c51f97fe362c483a78928d3f15e5bc4aa7bab SHA1 108d9c0d4bc97917ff21fdec7d1580894e69d743 SHA256 7fc377d0da492e75186d0de9c9712dab354bfab9daf884c059707c3b8388f81d

diff --git a/www-client/firefox/files/firefox-14.0_alpha2-gst-aac-mp3.patch b/www-client/firefox/files/firefox-14.0_beta7-gst-aac-mp3.patch
similarity index 100%
rename from www-client/firefox/files/firefox-14.0_alpha2-gst-aac-mp3.patch
rename to www-client/firefox/files/firefox-14.0_beta7-gst-aac-mp3.patch

diff --git a/www-client/firefox/files/firefox-14.0_alpha2-gst-youtube-h264.patch b/www-client/firefox/files/firefox-14.0_beta7-gst-youtube-h264.patch
similarity index 100%
rename from www-client/firefox/files/firefox-14.0_alpha2-gst-youtube-h264.patch
rename to www-client/firefox/files/firefox-14.0_beta7-gst-youtube-h264.patch

diff --git a/www-client/firefox/firefox-14.0_alpha2-r1.ebuild b/www-client/firefox/firefox-14.0_beta7.ebuild
similarity index 97%
copy from www-client/firefox/firefox-14.0_alpha2-r1.ebuild
copy to www-client/firefox/firefox-14.0_beta7.ebuild
index b650d36..8549aa9 100644
--- a/www-client/firefox/firefox-14.0_alpha2-r1.ebuild
+++ b/www-client/firefox/firefox-14.0_beta7.ebuild
@@ -9,10 +9,10 @@ MOZ_ESR=""
 
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
 MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
-gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
-nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
-te th tr uk vi zh-CN zh-TW zu)
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl
+gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mn
+mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE
+sw ta ta-LK te th tr uk vi zh-CN zh-TW zu)
 
 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
 MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-14.0-patches-0.1"
+PATCH="${PN}-14.0-patches-0.2"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"

diff --git a/www-client/firefox/firefox-14.0_alpha2-r1.ebuild b/www-client/firefox/firefox-15.0_alpha2.ebuild
similarity index 98%
rename from www-client/firefox/firefox-14.0_alpha2-r1.ebuild
rename to www-client/firefox/firefox-15.0_alpha2.ebuild
index b650d36..2316d74 100644
--- a/www-client/firefox/firefox-14.0_alpha2-r1.ebuild
+++ b/www-client/firefox/firefox-15.0_alpha2.ebuild
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-14.0-patches-0.1"
+PATCH="${PN}-15.0-patches-0.1"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
@@ -58,7 +58,7 @@ RDEPEND="
 	gstreamer? (
 		>=media-libs/gstreamer-0.10.33:0.10
 		>=media-libs/gst-plugins-base-0.10.33:0.10 )
-	system-sqlite? ( >=dev-db/sqlite-3.7.11[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
+	system-sqlite? ( >=dev-db/sqlite-3.7.12.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
 	webm? ( >=media-libs/libvpx-1.0.0
 		media-libs/alsa-lib )
 	crashreporter? ( net-misc/curl )
@@ -75,7 +75,7 @@ DEPEND="${RDEPEND}
 
 # No source releases for alpha|beta
 if [[ ${PV} =~ alpha ]]; then
-	CHANGESET="7f3c5dd8e78f"
+	CHANGESET="8a3042764de7"
 	SRC_URI="${SRC_URI}
 		http://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
 	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
@@ -143,7 +143,7 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/firefox"
 
-	epatch "${FILESDIR}"/${P}-gst-*.patch
+	epatch "${FILESDIR}"/${PN}*-gst-*.patch
 
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
@@ -205,6 +205,7 @@ src_configure() {
 	mozconfig_annotate '' --enable-safe-browsing
 	mozconfig_annotate '' --with-system-png
 	mozconfig_annotate '' --enable-system-ffi
+	# TODO: --enable-system-pixman
 	mozconfig_annotate 'Missing features' --disable-system-cairo
 
 	# Other ff-specific settings