Fix breakage in patchset and linguas xpi's install.

Package-Manager: portage-2.1.9.1/cvs/Linux x86_64

3 files changed, 11 insertions, 8 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index c8506ef7da8f..186423563ba4 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.7 2010/09/08 01:12:05 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.8 2010/09/08 04:26:57 anarchy Exp $
+
+  08 Sep 2010; Jory A. Pratt <anarchy@gentoo.org> firefox-3.6.9.ebuild:
+  Fix breakage in patchset and linguas install xpi's.
 
 *firefox-3.6.9 (08 Sep 2010)
 
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 629ba8267b6e..d80e3456cbe9 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -11,7 +11,7 @@ AUX icon/firefox-1.5.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958a3424bea
 AUX mozilla-filepicker.patch 722 RMD160 5d47c8d1c7f6288071295dadc0779b1eed13a2f2 SHA1 987535d45fbefd2ae0a3de4cc19e7fc86dc17c3e SHA256 f716c34efe691c8fe8924682b663670926614962bf782bac13e52fb77aeee13c
 AUX xulrunner-1.9.2-arm-fixes.patch 587 RMD160 495e8037785a1867fad0c088a4c834df6f02291c SHA1 5f08ef1f65771c2891a067c7baac8a4ef8466deb SHA256 a1b0aef546deecafe64c9ce70b08e7252a3eaf8d84a381a62b5edfaf1f735817
 AUX xulrunner-1.9.2-noalsa-fixup.patch 1031 RMD160 6eae45ee3e29fa47a7b31688cfcbfb594fcdd79b SHA1 845d4962708281bbd0cba45db82335739a50897b SHA256 1c4e017b6a8d81267a9d4b29b10cc4cfe69b090f8f8903a663f25b5e300eddd5
-DIST firefox-3.6-patches-0.1.tar.bz2 6342 RMD160 baeff28c7a14a992cac0b6a2e144c69c01ff7859 SHA1 a7be68843fd5f360403f8690a9f48c5dd2dd5ca1 SHA256 e6c1d36feff5ea15ef1ecf0a270666368b9c1825c3a737a877f24e5833825068
+DIST firefox-3.6-patches-0.2.tar.bz2 6335 RMD160 1f8297ad4279af70348a848349e75aa1a94c7372 SHA1 4c47c76fbdab937850558751ac73fe71e3269ece SHA256 1dc4278c143fa67c373a090f5698c4174d00aaa91ea63a444c2eca1cc328a523
 DIST firefox-3.6.8.source.tar.bz2 51238976 RMD160 14e245c643d41a1da25fe4dbc15d6ae466a19e5b SHA1 4936e543f6c7492c5954cbd5b30ddda6b20e3797 SHA256 fc609cc6a0ddaa2a9ebd8511ec39ae4a404e1107a12e07b233e2afca51d9a10e
 DIST firefox-3.6.9-af.xpi 121615 RMD160 ed0db63127dd7437212141fe7446ca5091247a8d SHA1 e37252d3feea8872fc2e1f8b0fc23bf4ac7af75b SHA256 b094471ecb9d3ecacc4d944e9c8c2ef39d7a836cc0adb966d38c2753ca45fa99
 DIST firefox-3.6.9-ar.xpi 132149 RMD160 8bebd266bff98328336fd0a44fbdf953b51fe676 SHA1 5aa70c40e6184a5f14f7d4d48f6717946998e8cb SHA256 1c89919dd0017e115a7640342b4f9f17497e659f5b88fabe62fd21c1911acb76
@@ -162,6 +162,6 @@ DIST mozilla-firefox-3.6.8-vi.xpi 129026 RMD160 48b6fccab58c18444e8618dd5e917cf1
 DIST mozilla-firefox-3.6.8-zh-CN.xpi 127101 RMD160 58aa997adb28a963f3c36fcb08b48f6c6654d49e SHA1 1d497484ccb381410947509d0413d76d2ca6e247 SHA256 0c66e888b740809a4062f0b833f3c137fca8fab884ff1fd2974f54873dede6f4
 DIST mozilla-firefox-3.6.8-zh-TW.xpi 128402 RMD160 db52c9fc22357f79970725db9a7b35d8b80ae6af SHA1 cb7f676b7279825ff3e24e24e3a3460729d2b0af SHA256 063ef6e1ad038a5e335960b5e21e1838c8afc098d5f7c0f3a7a432ebf28e821c
 EBUILD firefox-3.6.8.ebuild 9605 RMD160 9afd60ffe49b6eeed6fea47c1035c0158322b726 SHA1 7622ab6b84810d29e6d5c21319e77fffed00e10a SHA256 79813b64fa5e88be1fa36df65659e8ad2ede3f0943942995ebf8a2b6d44dbda4
-EBUILD firefox-3.6.9.ebuild 9320 RMD160 e076a528afee72a99069fc90b59df1f7dcb27959 SHA1 4eb2955d5fa02e94da4a34578758d002767fad3c SHA256 3b0696ab3e0948124878fd0c3fee88a564e466e69eb288ea7c1de8b966c58171
-MISC ChangeLog 118758 RMD160 8be44ac3e55959e4d11dfb3f8d74e6385556aab6 SHA1 9f953c27fb2e9fa6b8fa618835a993b7fcf58bbe SHA256 f0947595857103bac6f3679b12c8c9d548f6285a2da848a40d9eea4787d51ace
+EBUILD firefox-3.6.9.ebuild 9304 RMD160 efc944b1a2f89d2d36a46f041ed70bf56cb31d2c SHA1 526d2a27e917704508c64dc0944a754ce24057e5 SHA256 cf2f1062dde5e4b6011940b0911da2cde26d17077f9db8130aa805edc15af09b
+MISC ChangeLog 118885 RMD160 1b32389315e1da1a83abbb1ee7f2b3a0e39888be SHA1 b6f77a0600fead4b9345ddf52d2a2c6a638d9267 SHA256 0fbfbebf7c0784527cb16b35be4939b56617d5313a1db790ac9e520ab41d02fe
 MISC metadata.xml 518 RMD160 453a8e7c7b8a8163e6da7b60f5e00b6d8d90cc50 SHA1 7f063da31bd7d70ccc3888f34f419ed3eb4d4654 SHA256 14b5af9c304e7cddde11b784e1649daca82b8a628669c101b2b755f6fe2d67aa
diff --git a/www-client/firefox/firefox-3.6.9.ebuild b/www-client/firefox/firefox-3.6.9.ebuild
index e06fb3996ace..8640f6d6fa2d 100644
--- a/www-client/firefox/firefox-3.6.9.ebuild
+++ b/www-client/firefox/firefox-3.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.9.ebuild,v 1.1 2010/09/08 01:12:05 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.9.ebuild,v 1.2 2010/09/08 04:26:57 anarchy Exp $
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
@@ -17,7 +17,7 @@ MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
 DESKTOP_PV="3.6"
 MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
 XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s
-PATCH="${PN}-3.6-patches-0.1"
+PATCH="${PN}-3.6-patches-0.2"
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
@@ -124,7 +124,7 @@ src_unpack() {
 	linguas
 	for X in ${linguas}; do
 		# FIXME: Add support for unpacking xpis to portage
-		[[ ${X} != "en" ]] && xpi_unpack "mozilla-${P}-${X}.xpi"
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
 	done
 }
 
@@ -233,7 +233,7 @@ src_install() {
 
 	linguas
 	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"mozilla-${P}-${X}"
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
 	done
 
 	# Install icon and .desktop for menu entry