Bump patchset to fix bug 165777 and bug 168893

Package-Manager: portage-2.1.2.1-r1

4 files changed, 27 insertions, 22 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index e642915808e4..de2b2e864fc4 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.7 2007/01/11 15:59:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.8 2007/03/07 10:40:14 armin76 Exp $
+
+  07 Mar 2007; Raúl Porcel <armin76@gentoo.org> xulrunner-1.8.0.4.ebuild:
+  Bump patchset to fix bug 165777 and bug 168893
 
   11 Jan 2007; Raúl Porcel <armin76@gentoo.org> xulrunner-1.8.0.4.ebuild:
   license change, bug 150118
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 6d9117ff42ce..a9524a2280ec 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -2,20 +2,20 @@ AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cc
 MD5 1047668b701935bb42659431038d325a files/xulrunner.conf 113
 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 files/xulrunner.conf 113
 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3 files/xulrunner.conf 113
-DIST xulrunner-1.8.0.4-patches-0.8.tar.bz2 62419 RMD160 6285a67d3d94038e90749833e1eb83b423efd1da SHA1 e8dca7c469fbe278580fc378728cf686573168e2 SHA256 96ba130e3ba0315878adc43e12d9c326028b4f583382e9f2eb5ba5824ce0c02c
+DIST xulrunner-1.8.0.4-patches-0.9.tar.bz2 48226 RMD160 587e2087c341a2824616e19a3c9bcec69d8c38d3 SHA1 9b662162aec2f079d5380c61633238fd3e89fe98 SHA256 2b6a85e8c8c8a18028f17d32ea4d1ed11b42c07f3587fbeb05110874467572db
 DIST xulrunner-1.8.0.4-source.tar.bz2 33846136 RMD160 7979de9b3bc85a6b44367283e343cddd12e70bdb SHA1 9484a4783b86c6dc1cb9b99331791be079b8697e SHA256 193825593ef37e29d82f8bcbff3119caf131390a0369709c1667b509f774ffa9
-EBUILD xulrunner-1.8.0.4.ebuild 4918 RMD160 9ea5b5ff5d37bae93c913f8fbf0c263ef5c525e1 SHA1 24c8b3abd509a6dd1e5c98bf0e9f60b51e0bf5cf SHA256 04da08b724b3e398349fa0fbfac7aa8b7fbc06c635dab686f31c92e541403a82
-MD5 d997616297b62527208a727a2dc97fc0 xulrunner-1.8.0.4.ebuild 4918
-RMD160 9ea5b5ff5d37bae93c913f8fbf0c263ef5c525e1 xulrunner-1.8.0.4.ebuild 4918
-SHA256 04da08b724b3e398349fa0fbfac7aa8b7fbc06c635dab686f31c92e541403a82 xulrunner-1.8.0.4.ebuild 4918
-MISC ChangeLog 1271 RMD160 f165671373684eb4c955ea0ef0ded7aac62be1bf SHA1 193f81f5c6a562686e9213adcefa1f54a897b52f SHA256 9449261857a5deced6b739b79e377aabcb46a66c05d193659d7b1d37e13c4bbd
-MD5 a088a152db9880721ef77a7db2c00b6b ChangeLog 1271
-RMD160 f165671373684eb4c955ea0ef0ded7aac62be1bf ChangeLog 1271
-SHA256 9449261857a5deced6b739b79e377aabcb46a66c05d193659d7b1d37e13c4bbd ChangeLog 1271
+EBUILD xulrunner-1.8.0.4.ebuild 4916 RMD160 60d1c847be2c7a60b0c6b7978a93bb1eb9a5f0d6 SHA1 d35987a817692cde99e57ed00f232969c8d7a81a SHA256 2cf30d68c5ceaa0b896f9328ed6f90c0ed1c38a30b7bdbf4acf06b52c6f0fd57
+MD5 30ceb608b31c2b2d783877455fe940ba xulrunner-1.8.0.4.ebuild 4916
+RMD160 60d1c847be2c7a60b0c6b7978a93bb1eb9a5f0d6 xulrunner-1.8.0.4.ebuild 4916
+SHA256 2cf30d68c5ceaa0b896f9328ed6f90c0ed1c38a30b7bdbf4acf06b52c6f0fd57 xulrunner-1.8.0.4.ebuild 4916
+MISC ChangeLog 1396 RMD160 1db1d6b9b4d5aa8fd424e08825fb78498bc0d72c SHA1 a7dcb95fe93736981ad64ae6379769869cb4ba62 SHA256 223532016906a9cf78e3156735fec1c7cfd0d061e89680ef78ae7386d5d98eaf
+MD5 f2c2c12b11846e2d929e3f646a111de2 ChangeLog 1396
+RMD160 1db1d6b9b4d5aa8fd424e08825fb78498bc0d72c ChangeLog 1396
+SHA256 223532016906a9cf78e3156735fec1c7cfd0d061e89680ef78ae7386d5d98eaf ChangeLog 1396
 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
-MD5 1aea79de4dfd93b41d1f877aa3c6d5e4 files/digest-xulrunner-1.8.0.4 572
-RMD160 a69a7f8d7fea8ffe24e14884ec6aeb9986504edc files/digest-xulrunner-1.8.0.4 572
-SHA256 fe21c5f02d4111da20fb08b34a049ae368a91121d60be619d4296ef2934cefd2 files/digest-xulrunner-1.8.0.4 572
+MD5 40af158485ce0a6a6fbcacfed74e0058 files/digest-xulrunner-1.8.0.4 572
+RMD160 ccb1fb9ae94379ed2cb22fd53ddf4e0d6c828c4e files/digest-xulrunner-1.8.0.4 572
+SHA256 ab147974b688781afe02cf54c21076bed02cf7f86f7fee5a38b74062854a599f files/digest-xulrunner-1.8.0.4 572
diff --git a/net-libs/xulrunner/files/digest-xulrunner-1.8.0.4 b/net-libs/xulrunner/files/digest-xulrunner-1.8.0.4
index 6992554d03ba..05218c273cbf 100644
--- a/net-libs/xulrunner/files/digest-xulrunner-1.8.0.4
+++ b/net-libs/xulrunner/files/digest-xulrunner-1.8.0.4
@@ -1,6 +1,6 @@
-MD5 ca039de090e8ed299a72c04e015b9cf2 xulrunner-1.8.0.4-patches-0.8.tar.bz2 62419
-RMD160 6285a67d3d94038e90749833e1eb83b423efd1da xulrunner-1.8.0.4-patches-0.8.tar.bz2 62419
-SHA256 96ba130e3ba0315878adc43e12d9c326028b4f583382e9f2eb5ba5824ce0c02c xulrunner-1.8.0.4-patches-0.8.tar.bz2 62419
+MD5 59e181b7c8bc13316e7b37e7806ff5c1 xulrunner-1.8.0.4-patches-0.9.tar.bz2 48226
+RMD160 587e2087c341a2824616e19a3c9bcec69d8c38d3 xulrunner-1.8.0.4-patches-0.9.tar.bz2 48226
+SHA256 2b6a85e8c8c8a18028f17d32ea4d1ed11b42c07f3587fbeb05110874467572db xulrunner-1.8.0.4-patches-0.9.tar.bz2 48226
 MD5 4dc09831aa4e94fda5182a4897ed08e9 xulrunner-1.8.0.4-source.tar.bz2 33846136
 RMD160 7979de9b3bc85a6b44367283e343cddd12e70bdb xulrunner-1.8.0.4-source.tar.bz2 33846136
 SHA256 193825593ef37e29d82f8bcbff3119caf131390a0369709c1667b509f774ffa9 xulrunner-1.8.0.4-source.tar.bz2 33846136
diff --git a/net-libs/xulrunner/xulrunner-1.8.0.4.ebuild b/net-libs/xulrunner/xulrunner-1.8.0.4.ebuild
index 8dffe4450e2d..e40f11e88ec3 100644
--- a/net-libs/xulrunner/xulrunner-1.8.0.4.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.8.0.4.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.8.0.4.ebuild,v 1.6 2007/01/11 15:59:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.8.0.4.ebuild,v 1.7 2007/03/07 10:40:14 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils makeedit multilib autotools mozconfig-2 java-pkg-opt-2
-PVER="0.8"
+PATCH="${P}-patches-0.9"
 
 DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
 HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/releases/${PV}/source/${P}-source.tar.bz2
-	http://gentooexperimental.org/~genstef/dist/${P}-patches-${PVER}.tar.bz2"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${PV}/source/${P}-source.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2"
 
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 SLOT="0"
@@ -36,7 +36,7 @@ export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 
 src_unpack() {
-	unpack ${P}-source.tar.bz2  ${P}-patches-${PVER}.tar.bz2
+	unpack ${P}-source.tar.bz2  ${PATCH}.tar.bz2
 
 	# Apply our patches
 	cd ${S} || die "cd failed"
@@ -45,7 +45,9 @@ src_unpack() {
 	# until we figured out if we need also the versioning patch
 	EPATCH_EXCLUDE="030_pango-cairo-1.patch.bz2"
 
-	EPATCH_FORCE="yes" epatch ${WORKDIR}/patch
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
 
 	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
 	# PowerPC, because with that configuration, it detects a ppc64 system.