Fix bug 54158: enigmail upstream changed the tarball content without bumping the version. Use the new tarball on mirror://gentoo to solve the problem. When the next version of enigmail is released, plan to switch back to the upstream tarball.

5 files changed, 48 insertions, 33 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index e2eef74bc527..6bcbebb64268 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.171 2004/06/09 21:48:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.172 2004/06/17 21:18:42 agriffis Exp $
+
+  17 Jun 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7_rc2.ebuild,
+  mozilla-1.7_rc3.ebuild:
+  Fix bug 54158: enigmail upstream changed the tarball content without bumping
+  the version. Use the new tarball on mirror://gentoo to solve the problem. When
+  the next version of enigmail is released, plan to switch back to the upstream
+  tarball.
 
 *mozilla-1.7_rc3 (09 Jun 2004)
 
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 350e731f451f..d9e358320b55 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,44 +1,44 @@
-MD5 8d067ab8fe4012f38deea5ed347ae12a mozilla-1.7_rc1-r1.ebuild 15734
-MD5 21432acc215ab3f984be026e4b4d05a1 mozilla-1.7_rc2.ebuild 16103
-MD5 7379576ce2f1d449416cf3286c18200e mozilla-1.6-r1.ebuild 17203
-MD5 0cdea70bd20552e3ab116f4e4b078bc6 ChangeLog 30162
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 c23ca63ab025010cf6fe252af0189637 mozilla-1.7_rc3.ebuild 16103
-MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433
+MD5 7379576ce2f1d449416cf3286c18200e mozilla-1.6-r1.ebuild 17203
+MD5 8d067ab8fe4012f38deea5ed347ae12a mozilla-1.7_rc1-r1.ebuild 15734
+MD5 3527fffac3a11d6971f192b3ce80d813 mozilla-1.7_rc2.ebuild 16337
+MD5 e28b86274c58ec63673c723cacded640 mozilla-1.7_rc3.ebuild 16337
+MD5 11243f718d49c10c778fa19f8111f80a ChangeLog 30514
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
+MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
+MD5 fd25ae9f126eecac401987c2c84fe136 files/digest-mozilla-1.7_rc1-r1 204
+MD5 6ad8ad7f83c525040d7211ec7fc33d01 files/digest-mozilla-1.7_rc2 204
+MD5 6b463df2a6fd5694f4988508ae5baca6 files/digest-mozilla-1.7_rc3 207
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
+MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
+MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
 MD5 3ad7410bd680964096c84eee3fa21abf files/mozilla-1.6-gcc-3.4.patch 460
-MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
-MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
-MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
+MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 6ad8ad7f83c525040d7211ec7fc33d01 files/digest-mozilla-1.7_rc2 204
-MD5 a13337cca950846a84e505b064d9a085 files/digest-mozilla-1.7_rc3 204
-MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
-MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
-MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
 MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
-MD5 fd25ae9f126eecac401987c2c84fe136 files/digest-mozilla-1.7_rc1-r1 204
-MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
 MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
-MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
-MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
+MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
+MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
+MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
+MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
-MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
+MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
 MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
-MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
 MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
-MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
-MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
+MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
+MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
 MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
+MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
+MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
-MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
-MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
-MD5 ba7b561abda8274253ec38859a8797fc files/icon/mozilla.desktop 121
+MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
+MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+MD5 ba7b561abda8274253ec38859a8797fc files/icon/mozilla.desktop 121
diff --git a/net-www/mozilla/files/digest-mozilla-1.7_rc3 b/net-www/mozilla/files/digest-mozilla-1.7_rc3
index aba81977ef54..d6f191a0b8e1 100644
--- a/net-www/mozilla/files/digest-mozilla-1.7_rc3
+++ b/net-www/mozilla/files/digest-mozilla-1.7_rc3
@@ -1,3 +1,3 @@
 MD5 8dfee28c027db903aab8f826ee594f75 mozilla-source-1.7rc3.tar.bz2 35170922
-MD5 437fa8f2aaeade178760acea20bc62b4 enigmail-0.84.1.tar.gz 309380
 MD5 e4c79a7bb5ac7428dfef767e835fc770 ipc-1.0.6.tar.gz 116519
+MD5 b8bc2517de376a99b6ad7a9ad96747d2 enigmail-0.84.1-r1.tar.gz 309440
diff --git a/net-www/mozilla/mozilla-1.7_rc2.ebuild b/net-www/mozilla/mozilla-1.7_rc2.ebuild
index 88b9fbfd9920..f8ced677ceb7 100644
--- a/net-www/mozilla/mozilla-1.7_rc2.ebuild
+++ b/net-www/mozilla/mozilla-1.7_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc2.ebuild,v 1.1 2004/06/09 19:21:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc2.ebuild,v 1.2 2004/06/17 21:18:42 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint"
 # Internal USE flags that I do not really want to advertise ...
@@ -22,9 +22,13 @@ DESCRIPTION="The Mozilla Web Browser"
 HOMEPAGE="http://www.mozilla.org"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
 	crypt? ( !moznomail? (
-		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
 		http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz
+		mirror://gentoo/enigmail-${EMVER}-r1.tar.gz
 	) )"
+# Normally the following would be used instead of the mirror://gentoo/
+# reference above, but the upstream source tarball changed without
+# changing the filename.  (17 Jun 2004 agriffis)
+#		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
 
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
 SLOT="0"
diff --git a/net-www/mozilla/mozilla-1.7_rc3.ebuild b/net-www/mozilla/mozilla-1.7_rc3.ebuild
index fe433d636b0b..44524003501e 100644
--- a/net-www/mozilla/mozilla-1.7_rc3.ebuild
+++ b/net-www/mozilla/mozilla-1.7_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc3.ebuild,v 1.1 2004/06/09 21:48:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc3.ebuild,v 1.2 2004/06/17 21:18:42 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint"
 # Internal USE flags that I do not really want to advertise ...
@@ -22,9 +22,13 @@ DESCRIPTION="The Mozilla Web Browser"
 HOMEPAGE="http://www.mozilla.org"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
 	crypt? ( !moznomail? (
-		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
 		http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz
+		mirror://gentoo/enigmail-${EMVER}-r1.tar.gz
 	) )"
+# Normally the following would be used instead of the mirror://gentoo/
+# reference above, but the upstream source tarball changed without
+# changing the filename.  (17 Jun 2004 agriffis)
+#		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
 
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
 SLOT="0"