Don't bzip the patches inside the tarball

(Portage version: 2.1.2-r11)

3 files changed, 16 insertions, 12 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 0422928e350b..7e35e6d98bdf 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.259 2007/02/24 11:17:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.260 2007/02/24 11:28:18 armin76 Exp $
+
+  24 Feb 2007; Raúl Porcel <armin76@gentoo.org>
+  mozilla-firefox-2.0.0.2.ebuild:
+  Don't bzip the patches inside the tarball
 
   24 Feb 2007; Raúl Porcel <armin76@gentoo.org>
   mozilla-firefox-1.5.0.10.ebuild, mozilla-firefox-2.0.0.2.ebuild:
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.2 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.2
index c23eca6cd479..b93d75174769 100644
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.2
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.2
@@ -97,9 +97,9 @@ SHA256 f00a7dc68a9c5acfaeeacde2e4f9b793e881aef31bea4e08bbe457e80b706de9 mozilla-
 MD5 a17d963fa902fff1776c3d2f3b70e3c1 mozilla-firefox-2.0.0.2-pa-IN.xpi 161687
 RMD160 1769ce9ed7bf4bef6eab87b3d15c405115ca658c mozilla-firefox-2.0.0.2-pa-IN.xpi 161687
 SHA256 7b33224aa5c596cd8dfc34405633ad203af692918a0a7044ad45a6f31b4c9607 mozilla-firefox-2.0.0.2-pa-IN.xpi 161687
-MD5 a703616832e048a1e45aee84353a4478 mozilla-firefox-2.0.0.2-patches-0.1.tar.bz2 43107
-RMD160 d465696eb202f83d35bc023026b5baac19b7f29d mozilla-firefox-2.0.0.2-patches-0.1.tar.bz2 43107
-SHA256 581c14a99d183d96e7c13b9efbe025bbb8331e8c9a2e11c11c5d6a0b8ec23b2e mozilla-firefox-2.0.0.2-patches-0.1.tar.bz2 43107
+MD5 390743d59cde452fae028221c52d091f mozilla-firefox-2.0.0.2-patches-0.2.tar.bz2 33251
+RMD160 e77dbaae72f9338787950795865f7eb3e65a5308 mozilla-firefox-2.0.0.2-patches-0.2.tar.bz2 33251
+SHA256 21477893947da0c011ca599f2f8929a45fcb272b8587c10e57fe1b2c2e76b467 mozilla-firefox-2.0.0.2-patches-0.2.tar.bz2 33251
 MD5 53db0bc51f752f8c0e171f4a6dc143ad mozilla-firefox-2.0.0.2-pl.xpi 171089
 RMD160 fb82e0af5db5150cfdccde1146a1d853b798f7f5 mozilla-firefox-2.0.0.2-pl.xpi 171089
 SHA256 031d59a207a30b677c296e67ef5265936662315937f169caab62801359bcd855 mozilla-firefox-2.0.0.2-pl.xpi 171089
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild
index 3018e5a1ac62..b2ea2a12dbe8 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2007 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.0.2.ebuild,v 1.3 2007/02/24 11:17:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.2.ebuild,v 1.4 2007/02/24 11:28:18 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
-PATCH="${P}-patches-0.1"
+PATCH="${P}-patches-0.2"
 LANGS="af ar be bg ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr zh-CN zh-TW"
 NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.org/projects/firefox/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="java mozdevelop mozbranding xforms restrict-javascript filepicker"
@@ -92,18 +92,18 @@ pkg_setup(){
 }
 
 src_unpack() {
-
-	unpack ${A%bz2*}bz2
+	unpack firefox-${PV}-source.tar.bz2  ${PATCH}.tar.bz2
 
 	linguas
 	for X in ${linguas}; do
 		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
 	done
 
-	cd "${S}"
-
 	# Apply our patches
-	EPATCH_FORCE="yes" epatch "${WORKDIR}"/patch
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
 
 	if use filepicker; then
 		epatch ${FILESDIR}/mozilla-filepicker.patch