Don't bzip the patches inside the tarball

Package-Manager: portage-2.1.2-r11

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 0422928e350bae964c5bb2dae7dce94f17a2e13c..7e35e6d98bdfb8b34853aff1eb660a8fe7a34827 100644 (file)
--- 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/Manifest b/www-client/mozilla-firefox/Manifest
index 77f5deb24759ded7dbfb3daeae2431aed2494372..2d5a9daa18c5aeba92308b782c5a76dc343dac3c 100644 (file)
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -253,7 +253,7 @@ DIST mozilla-firefox-2.0.0.2-nb-NO.xpi 163827 RMD160 860a9173e13be00f36879c484fa
 DIST mozilla-firefox-2.0.0.2-nl.xpi 170129 RMD160 47d6dc62c63c8682a7ee2add1c5f60cc2d66d3f9 SHA1 232ed4da57364eac61dfe607ee7d470db3bf0127 SHA256 784570aa4566a18dbd55ea4f9aced8111aa60a453cd20a6401f7d5e932350e97
 DIST mozilla-firefox-2.0.0.2-nn-NO.xpi 160799 RMD160 5dc1fc3c9d66168df205b5422d3264b3a868771f SHA1 45db2061ed064b600ee6b54390631c0155cf5a81 SHA256 f00a7dc68a9c5acfaeeacde2e4f9b793e881aef31bea4e08bbe457e80b706de9
 DIST mozilla-firefox-2.0.0.2-pa-IN.xpi 161687 RMD160 1769ce9ed7bf4bef6eab87b3d15c405115ca658c SHA1 e37dd8318f904eda7e447c8c691127a49e2832b0 SHA256 7b33224aa5c596cd8dfc34405633ad203af692918a0a7044ad45a6f31b4c9607
-DIST mozilla-firefox-2.0.0.2-patches-0.1.tar.bz2 43107 RMD160 d465696eb202f83d35bc023026b5baac19b7f29d SHA1 4ec1f130c70dedd71b34676c42decab31f90851b SHA256 581c14a99d183d96e7c13b9efbe025bbb8331e8c9a2e11c11c5d6a0b8ec23b2e
+DIST mozilla-firefox-2.0.0.2-patches-0.2.tar.bz2 33251 RMD160 e77dbaae72f9338787950795865f7eb3e65a5308 SHA1 4fd7c7f33772af661c9965bec03bee88df4cf672 SHA256 21477893947da0c011ca599f2f8929a45fcb272b8587c10e57fe1b2c2e76b467
 DIST mozilla-firefox-2.0.0.2-pl.xpi 171089 RMD160 fb82e0af5db5150cfdccde1146a1d853b798f7f5 SHA1 d5de6bd2a96c5568c642b2b727576b0df83043cc SHA256 031d59a207a30b677c296e67ef5265936662315937f169caab62801359bcd855
 DIST mozilla-firefox-2.0.0.2-pt-BR.xpi 153380 RMD160 1c60bf641ee3f5c98ae12e8bd3d6dff6e1d326ba SHA1 ba556769b4fd268532c1279c5f1a3ff25d12abd8 SHA256 294a8bd38e33daad4d89ddfae44ad70843a13ddeb7cd1b65ab15eec00bbd6a4d
 DIST mozilla-firefox-2.0.0.2-pt-PT.xpi 153607 RMD160 593b0088f0b820790f9ec8d1ce42386fdaee37c5 SHA1 f3c48a93ad3e656412b6f9374a24cdfd34d7d43e SHA256 c45f4e178d6d69a3b4fc0d20c114ed7c755e6871caa1e6cb4a3d81bebd5563ad
@@ -296,14 +296,14 @@ EBUILD mozilla-firefox-2.0.0.1.ebuild 8880 RMD160 77d6fa2f47c693d090ac92dca6dd0e
 MD5 54b29b50efaa9bfc295ac8f1e63d849e mozilla-firefox-2.0.0.1.ebuild 8880
 RMD160 77d6fa2f47c693d090ac92dca6dd0e3ddbdae5d6 mozilla-firefox-2.0.0.1.ebuild 8880
 SHA256 dae02725d82f6b76c1ab0eb795a23e611697dd07e9d77be6eab98f7208905d01 mozilla-firefox-2.0.0.1.ebuild 8880
-EBUILD mozilla-firefox-2.0.0.2.ebuild 8829 RMD160 d3a3d4edc1f558662dbfadb9e94abca47a268950 SHA1 27594cf40e37f4fc96911f5b4438cf39e0698d78 SHA256 093da4109e41bf84994f79cd554b015ad5c4099c99e3d06a29d6f442570fcfcc
-MD5 6e6eaa100532efd485e5d0cd46ba732e mozilla-firefox-2.0.0.2.ebuild 8829
-RMD160 d3a3d4edc1f558662dbfadb9e94abca47a268950 mozilla-firefox-2.0.0.2.ebuild 8829
-SHA256 093da4109e41bf84994f79cd554b015ad5c4099c99e3d06a29d6f442570fcfcc mozilla-firefox-2.0.0.2.ebuild 8829
-MISC ChangeLog 61972 RMD160 ab01ce9b554b22ef60d7832cc3ccee08833e754c SHA1 80ee882a9587905354d79631e09fc510daf55240 SHA256 6a8920b0073bb624e5d2e07d9fb2f74950b18e9ad9d52d787d7a1208852fc450
-MD5 48ce6e0073933203a9ef730eb9f4c751 ChangeLog 61972
-RMD160 ab01ce9b554b22ef60d7832cc3ccee08833e754c ChangeLog 61972
-SHA256 6a8920b0073bb624e5d2e07d9fb2f74950b18e9ad9d52d787d7a1208852fc450 ChangeLog 61972
+EBUILD mozilla-firefox-2.0.0.2.ebuild 8910 RMD160 5ed9e4c5ed88d46fc26b0942eaa133efc8e0df4f SHA1 5efb62d3f4a5d6dde55fb7da009a6013d62604bd SHA256 3e76780cb9d1120d7043964c11f4d3c351b523f8b467571961bc4c3c9ba86dd7
+MD5 1d4812a2fcc1b1a423561d6e809ad6aa mozilla-firefox-2.0.0.2.ebuild 8910
+RMD160 5ed9e4c5ed88d46fc26b0942eaa133efc8e0df4f mozilla-firefox-2.0.0.2.ebuild 8910
+SHA256 3e76780cb9d1120d7043964c11f4d3c351b523f8b467571961bc4c3c9ba86dd7 mozilla-firefox-2.0.0.2.ebuild 8910
+MISC ChangeLog 62100 RMD160 1d0423175c3a98edae57c7ba9343bea084907e1d SHA1 92e047fd56dc827156e681a1e85f905b087581a7 SHA256 1d672f0efb754165dac29b89104113cbc8ee41b0bc263a87c6075bdd0cff466a
+MD5 347cf8937bd88d5f05753998cc8d2309 ChangeLog 62100
+RMD160 1d0423175c3a98edae57c7ba9343bea084907e1d ChangeLog 62100
+SHA256 1d672f0efb754165dac29b89104113cbc8ee41b0bc263a87c6075bdd0cff466a ChangeLog 62100
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -332,6 +332,6 @@ SHA256 a5f2ab7aa56bde6b81a2dd74d09e98fb6f66da0007e3bd5b69a54624e39da940 files/di
 MD5 f6c73fab83cc9c3f805b3c2064143779 files/digest-mozilla-firefox-2.0.0.1-r4 11550
 RMD160 8b983801dfe1a22211c9d3ea57a377585f1722fa files/digest-mozilla-firefox-2.0.0.1-r4 11550
 SHA256 a198fdcc398feb415e06c32dce2eea69449ad8274a3d855ffd1942a5a4ad546a files/digest-mozilla-firefox-2.0.0.1-r4 11550
-MD5 80c00674320763e40315ee022f7db8e9 files/digest-mozilla-firefox-2.0.0.2 12092
-RMD160 b9bf25a9ea04a01f6314495cf0c22cd0f61d14ba files/digest-mozilla-firefox-2.0.0.2 12092
-SHA256 c251207ede33ca8303437fbb8e2d0e9babf5233eed5c342f3c287923656c28c3 files/digest-mozilla-firefox-2.0.0.2 12092
+MD5 be04d89650e4d275a468b106bb6da630 files/digest-mozilla-firefox-2.0.0.2 12092
+RMD160 d110b61a997f954ad45e50b46243fd255dcb77c5 files/digest-mozilla-firefox-2.0.0.2 12092
+SHA256 364f07ea7b8fa0451600b832e62e5d5cc49b9f5abbef7caacb362658561be80c files/digest-mozilla-firefox-2.0.0.2 12092

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 c23eca6cd4794a48da95a8cf2e210e62fa60b904..b93d7517476904ea8bd35fe8cf9d5402e327098e 100644 (file)
--- 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 3018e5a1ac62928a19121e4f162f60bf5bab3fe0..b2ea2a12dbe8b37de42a4106552526f817d48a8e 100644 (file)
--- 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