embeded patch renamed, will prevent conflict with stale distfiles

(Portage version: 2.0.53_rc7)

4 files changed, 12 insertions, 7 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 47a5ee9f610b..248188e36ccd 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.110 2005/11/29 22:04:37 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.111 2005/12/01 22:10:34 anarchy Exp $
+
+  01 Dec 2005; Jory A. Pratt <anarchy@gentoo.org>
+  mozilla-firefox-1.5.ebuild:
+  renamed embeded-typeaheadfind.patch so people do not have a conflict with
+  stale distfiles
 
 *mozilla-firefox-1.5 (29 Nov 2005)
 
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index a60a371c960c..271110639e2a 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -10,7 +10,7 @@ MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/1.5/mozilla-hppa.patch 7863
 MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32
 MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r2 231
 MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r3 231
-MD5 da6fa9b6eff15595e457c5a832f59700 files/digest-mozilla-firefox-1.5 289
+MD5 6cb9f61cd0ea68e525a6f3537a5c5563 files/digest-mozilla-firefox-1.5 291
 MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548
 MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
 MD5 2bd0dd9035dcb875b8340be358347e8d files/firefox-1.1-uriloader.patch 15300
@@ -43,4 +43,4 @@ MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 7ec6e77c0014718ffae4a55c76acd1db mozilla-firefox-1.0.7-r2.ebuild 8564
 MD5 b686423c9050edfcfd7ff72ea4081f09 mozilla-firefox-1.0.7-r3.ebuild 9734
-MD5 e9bb007872b93329e41374d4f2b93c9a mozilla-firefox-1.5.ebuild 8825
+MD5 7790074b469996941450490daaa6f093 mozilla-firefox-1.5.ebuild 8829
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5
index 30f96bfbebcc..394bdc1235e2 100644
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5
@@ -1,4 +1,4 @@
-MD5 cb90e9f6097b975187892682ed286544 embed-typeaheadfind.patch 41361
+MD5 cb90e9f6097b975187892682ed286544 embed-typeaheadfind-1.patch 41361
 MD5 fa915ddcadecda30ed3e13694f26a779 firefox-1.5-source.tar.bz2 34491496
 MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
 MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.ebuild
index a7a4ac90115f..97dbdbba1a2d 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.5.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.ebuild,v 1.4 2005/12/01 21:43:27 anarchy Exp ${PV}_rc3-r2.ebuild,v 1.1 2005/11/26 04:20:32 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.ebuild,v 1.5 2005/12/01 22:10:34 anarchy Exp ${PV}_rc3-r2.ebuild,v 1.1 2005/11/26 04:20:32 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
@@ -14,7 +14,7 @@ DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.org/projects/firefox/"
 SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2
 	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	mirror://gentoo/embed-typeaheadfind.patch
+	mirror://gentoo/embed-typeaheadfind-1.patch
 	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
 
 KEYWORDS="-* ~amd64 ~ppc ~x86"
@@ -91,7 +91,7 @@ src_unpack() {
 
 	# patch to fix typeahead find for browsers which embed Firefox
 	# http://bugzilla.gnome.org/show_bug.cgi?id=157435
-	epatch ${DISTDIR}/embed-typeaheadfind.patch
+	epatch ${DISTDIR}/embed-typeaheadfind-1.patch
 	epatch ${FILESDIR}/${PV}/${P}-gtk.patch
 
 	# rpath fix