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

["Jory Pratt" <anarchy@gentoo.org>]

commit:     15e7b32be5b033e4c8cf1599a95cd80f60c11f12
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 01:45:04 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri May 17 01:45:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=15e7b32b

Firefox-21.0 - Refix preferences

---
 www-client/firefox/Manifest            |    4 ++--
 www-client/firefox/firefox-21.0.ebuild |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index b4c88ca..75955c0 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -153,7 +153,7 @@ DIST firefox-21.0-nn-NO.xpi 321067 SHA256 b1ffef0b121dae5d7f7af773a7b447d364ef2b
 DIST firefox-21.0-nso.xpi 326539 SHA256 a4a8d95e903bc3a24210034459333db08f5485f09ac207569ef74918aefff8d8 SHA512 d3e5246931cdaebaf48848eb73dad30296533730e39c2c3ea79c41701920782fa377fdf787ed71e4d1e50768e6f4daf8a427397801d74fccc8e23e14bfa14758 WHIRLPOOL 6c512956c1ac383137581d454cbf1f270952f15531d46badaddc8568a603151b555795431d304f857293868613271debf0a856dae063e758c56e6076d61acec2
 DIST firefox-21.0-or.xpi 368889 SHA256 f915a2831675202ecc44f3cbf0c55eac90c0259234f1fb31b90c5f4eba6f595b SHA512 b8e1cea465774534e7e519b497ddd59d6269a0c5954a6afabc3981d7a18988d707ad3c927f324de249cbdac4fbc46a0ff2ccceb982250e831484d7e6249537ed WHIRLPOOL 38df1b04ec1151a757936a87714a44473e02e7286dca29ddadf732bb712dc247df56eacc681d0c099da1f818826c73dc7e9edf125ef515047afe8ed2803ab14a
 DIST firefox-21.0-pa-IN.xpi 355004 SHA256 8ff787f43910d4096f8d140af416f63887923fa11597c7791d86bafcbb36cd18 SHA512 5139cc13f32adadef3f61c37bf67673512251e29d5db6d95c4850956837a1655bc9eeb3a970db96208abaf47c37cfa548a39e831bb6e1b91245b9e6605d55dd0 WHIRLPOOL d7b141672c3a06cfe74996d5e182653e9ddfd40cfd6ecb1f6beee443aa7e9d4288b2d8f4c26c378357c7b2b0ae60c50a77a166335d248957e1c4b6a379d3e302
-DIST firefox-21.0-patches-0.2.tar.xz 7060 SHA256 5faf818b4b044bfa53cc4c86820d1897ef4fed3cb86bc6f18ab67a12627ddc4a SHA512 532850802d08fe455999ad8916bd842ac88ac339a38b3667f6240743e82b4b52e5b46333b056d44342afae7c5fe85ecea0ea5574c70902592f3da6496c8264dc WHIRLPOOL 5968ca97d450f3f2441561e185ff9c794d7786ef09583587b2a928d3d4c0d87320863a583c5e72fe45ff8e9800c8f74bd23181a7c3750bdcc5bc981ca89efd81
+DIST firefox-21.0-patches-0.1.tar.xz 7056 SHA256 b4c1c796da7ac15edda87160a6d2f6db02d089c5119e6882570c7cfd2c62875a SHA512 2b9b1dd1d29a4ec6b1787b1bef8e74f4669022b574536f25aed327b55051c38100f7bf389bd70c5b4f2c5997f94f0c2f03ff6a3f074d8ee2417880a3520c69cc WHIRLPOOL f92027b3cb4d80b30ec9cd6f21204f0a38706fe7a8c7a29a75a7781450a0f2da56a42d393133c473c7a2fdcf218a552cab14fff769642df9544acf11a0594477
 DIST firefox-21.0-pl.xpi 333450 SHA256 16f3192cf1f8cd3eea87e7bf9514fbb2cf6d775272a68c23d9d25b1289586496 SHA512 e0cc7abb660ba95b9503874610c26bc33153f7b261bde009b7c9312e949c77ffde8bdb8b75fd54ff0cc0fddc77f3acabf788f2ce84105fa70fdfef0e3d771125 WHIRLPOOL 1e89c2e2c257cb7be599928838e5d96d70683ef6ea3731575e58bd0df3bb1878c3fca799ab0ead6ec355a9f4e7f20fb0501433fa8f82d1b4ba222533ea618920
 DIST firefox-21.0-pt-BR.xpi 324499 SHA256 fe55931120c4de4c84ff66ca0f7699e26060120e92e0056df5ea9e7f2d1908ce SHA512 f16bedce70298356a4402bee28fa1c88913aed8697e49bf326d7580c736030c239c884a98059c0bc2ac4c06fd6a5feb14a2385be1afca7600452cb14ead6dbf4 WHIRLPOOL 0f6998f1a08b2662bf1530421fe46a4e630471db23028961d2f0e926392e749f222c057a301d4f8be870a66f45df9e8172bd5321370dd68833b9da0f1d7fe9bf
 DIST firefox-21.0-pt-PT.xpi 323613 SHA256 dd84a0c02aae2114fa4c2d453616a974faa1f2ea6341b38a302ad691ef5ff58d SHA512 0539997be0facb7013c446be3b31a1b70df1aff8f4f03ba79fc33e71a8d17195fe19e596c500b38d821f532c73d221643a5c7fb00e71885d5fffddcf8322d8b8 WHIRLPOOL 80d31c0a04968161658c2902f49816e02ab9a52d83c2e8996db9edf652d548d866ac06dff21be7e117fc7378c42950a3936215260e8dfad86408add5e4c766b5
@@ -179,4 +179,4 @@ DIST firefox-21.0-zh-TW.xpi 341743 SHA256 aaffd78b270c95f941bcadf719db8e45e5b4db
 DIST firefox-21.0-zu.xpi 333719 SHA256 1ec202d0bffa5c7e0715087eb25266fa54cfba543c4677ce234a0e26d9629e99 SHA512 94a8ddbb260ff891be65b190587057d81de1971ed1dadaf678ee7e97d46ff30219014f81be7d35628985c2ec9a98a3717ffc3f8cf3117a404b7a687c5204a0b5 WHIRLPOOL 71f7c8aab5bc3f6088dbdede6da327c407398914ca37a30eae4775a45f924e19f047cddd4e01a2fe29edb3e0886d214b1ff52a158c94bb56b86a26e47c045291
 DIST firefox-21.0.source.tar.bz2 105558931 SHA256 3909031cb5d403b12c796afb7775b4950f0347786ffd06028761852a1074d91c SHA512 0607e587a03c7402b186bc6e254f79a6cc29dfdd1836d3857233a0175e0d7e9f03ab69261e98b503ae6b5b47deac8ebbb982649729e3ed4d9e646f13073e0822 WHIRLPOOL 5b0413dfa40c34447bd566a26f3f0d79bf51d4fa15d493e5d327c3dc87491848944d80b7477585a730f2a78862d7df95b1bcf1a36eb8f5a6f2935707c295beb5
 EBUILD firefox-17.0.5-r1.ebuild 11995 SHA256 56bda12b3558a84d8b2de4b2cfc9f80f0134d35c3fe45a0e23f9115b625ca29b SHA512 b23b3279032a6031855240cbe251a07bc738f0fd54824d6689b67639c54d464a54084c9fd1c27d96e257bf4cda54e19dfc37011e4780582e6dbede2848225f8e WHIRLPOOL 08b2b681e816b6a7b9d204da97a84280e59359ba6ede6287c9582ef843937a51e3b49d8c1090c55e9c643bfbde214fb9d2c599b6a3f4f97bf48a2626d6d3d917
-EBUILD firefox-21.0.ebuild 11949 SHA256 377a58abc8759a4d535cc46e9dc2d18504772af0bc3698193a834e24f929466d SHA512 ee807e9ab416aae90c070ae2ed6da9ee781c7d05d91e013dc8dfb249027b094f091cf1e06d3e34bfab35c824fc02899d5a9ca7086f85d282d6cde532c93ca9af WHIRLPOOL d30e446985163cacf5986a3edaace56faede6236318003956e5d655e91d315a3f8d8bb2580a9167f20e09bec7ac11366db2a725b127cc2952685caedca9a7161
+EBUILD firefox-21.0.ebuild 12009 SHA256 d86fe4740a41f2040966be5f93745977d652127ab92d37e873f5cc4261380166 SHA512 4694a4e528bac485f2cf17126bacb73c92027e02202f2fe4aa16e22ed0ca67e3d0bba21a7be58b8e17b94b5970dcee4a38811ac8042b86fc0bff7b2c8f487cbb WHIRLPOOL dc86a7deaefcff70de30f96ef96730c4163b4ab880594619e09db324bf7b07be69d71ff182cc950dcd04a7c7906740add92229884d8303ce74584075fb3ea7d7

diff --git a/www-client/firefox/firefox-21.0.ebuild b/www-client/firefox/firefox-21.0.ebuild
index dff3517..98396f9 100644
--- a/www-client/firefox/firefox-21.0.ebuild
+++ b/www-client/firefox/firefox-21.0.ebuild
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-21.0-patches-0.2"
+PATCH="${PN}-21.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/"
@@ -296,19 +296,19 @@ src_install() {
 
 	# Add our default prefs for firefox
 	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
+		"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
 
 	# Set default path to search for dictionaries.
 	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
+		>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
 
 	if ! use libnotify; then
 		echo "pref(\"browser.download.manager.showAlertOnComplete\", false);" \
-			>> "${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
+			>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
 	fi
 
 	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
+		"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
 
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
 	emake DESTDIR="${D}" install || die "emake install failed"