Update uriloader patch. Install 2.0b1's .desktop with 2.0 suffix.

Package-Manager: portage-2.1.1_pre3-r1

4 files changed, 28 insertions, 27 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index d1a0707c484f..385a920c1f55 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.163 2006/07/20 16:28:04 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.164 2006/07/20 17:41:22 azarah Exp $
+
+  20 Jul 2006; Martin Schlemmer <azarah@gentoo.org>
+  mozilla-firefox-2.0_beta1.ebuild:
+  Update uriloader patch.  Install 2.0b1's .desktop with 2.0 suffix.
 
 *mozilla-firefox-2.0_beta1 (20 Jul 2006)
 
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 1636b2900f82..1d4a2ba6ef7f 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -95,7 +95,7 @@ DIST mozilla-firefox-2.0_beta1-mn.xpi 156792 RMD160 d6b45d1119b3e2498b0166ba4631
 DIST mozilla-firefox-2.0_beta1-nb-NO.xpi 160628 RMD160 05e7a59e4ae968c30919281e3da565c8223d0a8d SHA1 2bea3ee6fb8ba0ff3780dc5d6465fb87c39be78d SHA256 868c9c98dad00ae9bd1fc816c68f9372ee0cf622b8d29d80d728da5785583db4
 DIST mozilla-firefox-2.0_beta1-nl.xpi 160862 RMD160 f09115a9c5c268a1bbba3561eb08241d82ca2e9b SHA1 164309e538e20a0a50a7c44d206907e8e2fb09b0 SHA256 6a577665512713ab78c98ada0b07385fa7be8dbed62c9efee193f4b7d09eeca7
 DIST mozilla-firefox-2.0_beta1-nn-NO.xpi 161949 RMD160 f14ce49cbdfcfb7cf14e47a3ec0eac6a996fc62a SHA1 b98bb817e261e9ceb50abcda1d64c9e53cc6209c SHA256 499f906a076e8b3529a63099a98a2a827f033e838c2f1ad7bea35b0341d0b559
-DIST mozilla-firefox-2.0_beta1-patches-1.0.tar.bz2 25574 RMD160 e3438e90c0be38a0eb8021abe986b73cf3c68948 SHA1 8f6d81c7e76acad6d0e342098e639aeae0fdbad1 SHA256 83f53f45d4fee9ec1bb79d354d650c39491dd8ef3ef2acf1bdbe4c2d60a65cbb
+DIST mozilla-firefox-2.0_beta1-patches-1.2.tar.bz2 26036 RMD160 490458ebe895d2e6ac8e83e0364ce6f025d153c7 SHA1 4a84dc12f35d5dd468cf5323db09322d298df060 SHA256 f4938ee53e88b2913b68000beba6fd8c4a6e9b4acce6b2a5778cef5dc5d74aaf
 DIST mozilla-firefox-2.0_beta1-pl.xpi 256842 RMD160 00c3b92ef39975ef26fe214a74c4bbb794f709c7 SHA1 79677fad110f29c9fb819085d6ee1b46c127d10a SHA256 ccab2784a33fa3102716bfe6a127c19a228c0b3db2525f66e82f8e9e75eb94eb
 DIST mozilla-firefox-2.0_beta1-pt-PT.xpi 152648 RMD160 5f3fdb31f05fb1e799686fc416439179b1dbd21f SHA1 3c074c44f88ecc9cce0a0732ef25e0a637ad788a SHA256 709a5ca6edc99dfa49335b579ff87ce8b1576de060d517c2a2da26f7438c9bab
 DIST mozilla-firefox-2.0_beta1-ru.xpi 161616 RMD160 d65f439f4ebd109506f2d179b779d7b13ef00175 SHA1 8d8522982ff801c2d251da7937a7ea13c05a82b3 SHA256 8caecb51c04b3d05f4720115585b30c9e24c2003b808ca727d7a576a88c7a70e
@@ -113,35 +113,31 @@ EBUILD mozilla-firefox-1.5.0.4.ebuild 9279 RMD160 2afce326fc4d0ff63547e64d72225a
 MD5 d12305269228bc11fa5012a182ba948e mozilla-firefox-1.5.0.4.ebuild 9279
 RMD160 2afce326fc4d0ff63547e64d72225a7488030435 mozilla-firefox-1.5.0.4.ebuild 9279
 SHA256 fac96cb4565fb914aec19427387943e2f6947c8367c069a37aaf72050a7c5984 mozilla-firefox-1.5.0.4.ebuild 9279
-EBUILD mozilla-firefox-2.0_beta1.ebuild 7486 RMD160 63b3bc7e6e757d60722dc1b01133c80f1780fb25 SHA1 8373280fd0eddcfe102da511045d33e1853ad0d9 SHA256 366b7b5202cd02cf7304b7077122e3ffca4a0be0311f749788d61a4ce88b4f75
-MD5 b8919064070ff97d8ad38702a33f1ae6 mozilla-firefox-2.0_beta1.ebuild 7486
-RMD160 63b3bc7e6e757d60722dc1b01133c80f1780fb25 mozilla-firefox-2.0_beta1.ebuild 7486
-SHA256 366b7b5202cd02cf7304b7077122e3ffca4a0be0311f749788d61a4ce88b4f75 mozilla-firefox-2.0_beta1.ebuild 7486
-MISC ChangeLog 46912 RMD160 a07861984fe6224f9264ffdadc60fbeb3b581fcb SHA1 538ed1855c9e37b5e17981b82ed1a956675300a0 SHA256 24877095204056d083531ae84a7b0a16eee6ab5b5a02a5320b676514e2815ab2
-MD5 902857b2e3097f69a54289c84a85f121 ChangeLog 46912
-RMD160 a07861984fe6224f9264ffdadc60fbeb3b581fcb ChangeLog 46912
-SHA256 24877095204056d083531ae84a7b0a16eee6ab5b5a02a5320b676514e2815ab2 ChangeLog 46912
+EBUILD mozilla-firefox-2.0_beta1.ebuild 7520 RMD160 555db401ae850c51975fe3437c79e26e9fb673ac SHA1 5c248111f55466a9966845d132cefbc41c5cf274 SHA256 149723d1cf232927abf8621eae906a492726553c2e3360bda724b75dab4b262c
+MD5 df2cfb29a453045af9fd8d0c11d0090d mozilla-firefox-2.0_beta1.ebuild 7520
+RMD160 555db401ae850c51975fe3437c79e26e9fb673ac mozilla-firefox-2.0_beta1.ebuild 7520
+SHA256 149723d1cf232927abf8621eae906a492726553c2e3360bda724b75dab4b262c mozilla-firefox-2.0_beta1.ebuild 7520
+MISC ChangeLog 47070 RMD160 55f48ac912a66efd282a1f7caa3a3d75a2fbbc54 SHA1 324be16c7f4d4531debfffd7537f4d1aacbb903a SHA256 e8bd38e5186ac37f4497e4c15751e2f9f7aad99d8637df86fff60cc94c930a5b
+MD5 39f6c96638c2ddcbb4bb1d7973747e37 ChangeLog 47070
+RMD160 55f48ac912a66efd282a1f7caa3a3d75a2fbbc54 ChangeLog 47070
+SHA256 e8bd38e5186ac37f4497e4c15751e2f9f7aad99d8637df86fff60cc94c930a5b ChangeLog 47070
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata.xml 160
-MISC mozilla-firefox-2.0_beta1.ebuild.old 7262 RMD160 a8e447f0cc4f1fce59360258e918ad7eba670174 SHA1 56ea8db2779af3d340c76160885df9ae67fb1d12 SHA256 51f9e65d11503c56f5758a78b68663e8cfbcae4c3286db87c3ec01b550619890
-MD5 28bd5fb87725ab9e70bcf3fdb89df5df mozilla-firefox-2.0_beta1.ebuild.old 7262
-RMD160 a8e447f0cc4f1fce59360258e918ad7eba670174 mozilla-firefox-2.0_beta1.ebuild.old 7262
-SHA256 51f9e65d11503c56f5758a78b68663e8cfbcae4c3286db87c3ec01b550619890 mozilla-firefox-2.0_beta1.ebuild.old 7262
 MD5 98150cff97ddd25ba15797a2d6c811db files/digest-mozilla-firefox-1.0.7-r4 831
 RMD160 50126eac778e9731ac4c37c9ca9cfa57eabf1aee files/digest-mozilla-firefox-1.0.7-r4 831
 SHA256 5dea84c9617a7246126afd7ceca9d9a8038d7db8fda4b10dff91dfb77abbff07 files/digest-mozilla-firefox-1.0.7-r4 831
 MD5 aee7595871dce2209b5cb5a682cc6631 files/digest-mozilla-firefox-1.5.0.4 8075
 RMD160 7d5ff0c74c2f6cdb84f0ff1f317d356fdb53491a files/digest-mozilla-firefox-1.5.0.4 8075
 SHA256 16e3db3c6995745c09eeac8bb1432730dec0c55a7cfb445c762fda5348174074 files/digest-mozilla-firefox-1.5.0.4 8075
-MD5 13d7e0bad28ac0609c40f8f03c236a03 files/digest-mozilla-firefox-2.0_beta1 8144
-RMD160 69a7ac23c16f8133070f319a3e0d1d9a7c427e12 files/digest-mozilla-firefox-2.0_beta1 8144
-SHA256 f0302e59a3f44d01bb474ac7f8535876e36e2a848537fdf0a93b3d930b6a6cce files/digest-mozilla-firefox-2.0_beta1 8144
+MD5 281ba60b49b1ffdcacc3841837d02c05 files/digest-mozilla-firefox-2.0_beta1 8144
+RMD160 5cd0bf12dc91b3112c6dc60d0c3ca234613cd50f files/digest-mozilla-firefox-2.0_beta1 8144
+SHA256 1c29587cea51a4c75200f5a40e42b4dddb9eef735440e19f90499703656d31a2 files/digest-mozilla-firefox-2.0_beta1 8144
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEv6+w1ZcsMnZjRyIRApRFAJwLpFIPm0zxzrnvh0fjSZ+2hUkhNQCcCW5I
-sj5dDfFLp1Di8L9SjwNQWZ8=
-=LHWQ
+iD8DBQFEv8De1ZcsMnZjRyIRAsaDAJ44cPPYNLmNzueF2ehFx7GsmwOAAgCfYE50
+nIane+kl3KnvDL2QwuCXG+Q=
+=Pco8
 -----END PGP SIGNATURE-----
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0_beta1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0_beta1
index abd55e3d8790..e801a6a21105 100644
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0_beta1
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0_beta1
@@ -55,9 +55,9 @@ SHA256 6a577665512713ab78c98ada0b07385fa7be8dbed62c9efee193f4b7d09eeca7 mozilla-
 MD5 42cab7e0a8bf0fa36c8f4e1238bd20da mozilla-firefox-2.0_beta1-nn-NO.xpi 161949
 RMD160 f14ce49cbdfcfb7cf14e47a3ec0eac6a996fc62a mozilla-firefox-2.0_beta1-nn-NO.xpi 161949
 SHA256 499f906a076e8b3529a63099a98a2a827f033e838c2f1ad7bea35b0341d0b559 mozilla-firefox-2.0_beta1-nn-NO.xpi 161949
-MD5 92c28b3be7148eeb0df39e650d8cfba6 mozilla-firefox-2.0_beta1-patches-1.0.tar.bz2 25574
-RMD160 e3438e90c0be38a0eb8021abe986b73cf3c68948 mozilla-firefox-2.0_beta1-patches-1.0.tar.bz2 25574
-SHA256 83f53f45d4fee9ec1bb79d354d650c39491dd8ef3ef2acf1bdbe4c2d60a65cbb mozilla-firefox-2.0_beta1-patches-1.0.tar.bz2 25574
+MD5 7d5fc716f730c237b2b1af2d077f925b mozilla-firefox-2.0_beta1-patches-1.2.tar.bz2 26036
+RMD160 490458ebe895d2e6ac8e83e0364ce6f025d153c7 mozilla-firefox-2.0_beta1-patches-1.2.tar.bz2 26036
+SHA256 f4938ee53e88b2913b68000beba6fd8c4a6e9b4acce6b2a5778cef5dc5d74aaf mozilla-firefox-2.0_beta1-patches-1.2.tar.bz2 26036
 MD5 23ec84bf3d17c5c844da34f1da542503 mozilla-firefox-2.0_beta1-pl.xpi 256842
 RMD160 00c3b92ef39975ef26fe214a74c4bbb794f709c7 mozilla-firefox-2.0_beta1-pl.xpi 256842
 SHA256 ccab2784a33fa3102716bfe6a127c19a228c0b3db2525f66e82f8e9e75eb94eb mozilla-firefox-2.0_beta1-pl.xpi 256842
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0_beta1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0_beta1.ebuild
index a7ec1608ebfa..a29a7ec4f7e2 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0_beta1.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0_beta1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0_beta1.ebuild,v 1.1 2006/07/20 16:28:04 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0_beta1.ebuild,v 1.2 2006/07/20 17:41:22 azarah Exp $
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
-PVER="1.0"
+PVER="1.2"
 LANGS="ca cs da de el en-GB es-AR es-ES fi fr hu it ja lt mn nb-NO nl pl ru sk sl sv-SE tr zh-CN zh-TW"
 SHORTLANGS="pt-PT nn-NO"
 MY_PV=${PV/_beta/b}
@@ -99,7 +99,7 @@ src_unpack() {
 }
 
 src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 
 	mozconfig_init
 	mozconfig_config
@@ -183,7 +183,8 @@ src_install() {
 
 	# Install icon and .desktop for menu entry
 	doicon "${FILESDIR}"/icon/firefox-icon.png
-	domenu "${FILESDIR}"/icon/mozillafirefox-1.5.desktop
+	newmenu "${FILESDIR}"/icon/mozillafirefox-1.5.desktop \
+		mozillafirefox-2.0.desktop
 
 	# Fix icons to look the same everywhere
 	insinto "${MOZILLA_FIVE_HOME}"/icons