Bump the patch version up to 0.2 because we added two mips patches that allows thunderbird to work on mips. Also, the patches are now stored in CVS, and are no longer individually compressed (*.patch vs. *.patch.bz2). See gentoo/src/patchsets for more info, plus the make-tarball.sh script that can generate new patchballs. Oh, and add unstable mips to keywords for a few days.

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 38 insertions, 42 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 83c7a2566250..8860af74bb12 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.120 2006/07/20 20:27:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.121 2006/07/26 05:07:02 kumba Exp $
+
+  26 Jul 2006; Joshua Kinard <kumba@gentoo.org>
+  mozilla-thunderbird-1.5.0.4.ebuild:
+  Bump the patch version up to 0.2 because we added two mips patches that
+  allows thunderbird to work on mips. Also, the patches are now stored in CVS,
+  and are no longer individually compressed (*.patch vs. *.patch.bz2). See
+  gentoo/src/patchsets for more info, plus the make-tarball.sh script that can
+  generate new patchballs. Oh, and add unstable mips to keywords for a few
+  days.
 
   20 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   mozilla-thunderbird-1.5.0.4.ebuild:
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 4322d5139018..fa59ebccfe1a 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX firefox-1.1-uriloader-1.patch 13902 RMD160 cb816967a91e0a60a238ad11736eec5ac5da3754 SHA1 cbb5303137bf7f94ff1cfae760d5a64a810b3021 SHA256 ac9ef7ec790856d35609a051596579b0cc5a327542614ab420505a2669b388bb
 MD5 b92734c051b7734d459e23f7c4a01b63 files/firefox-1.1-uriloader-1.patch 13902
 RMD160 cb816967a91e0a60a238ad11736eec5ac5da3754 files/firefox-1.1-uriloader-1.patch 13902
@@ -72,21 +69,21 @@ SHA256 e34d5bae7787b76253add7ec03de19a85919d42dd949f6dd4d8e0fe3ed7fc620 files/th
 DIST mozilla-1.7.10-nsplugins-v2.patch 1968 RMD160 42f20651c93d904829fd80d4bf6bf8f07456124d SHA256 bd5ce9f3b58496ce66852f7decec1e9531966568c9530bf4d7c1cc6d97ea0a06
 DIST mozilla-firefox-1.0-4ft2.patch.bz2 5601 RMD160 b3ea2512d641d4aa0af4925ddab75351889c3c35 SHA256 10b20c0acf58650992c01e5481478304ebb709298d42748033cb252b40525b7f
 DIST mozilla-jslibmath-alpha.patch 625 RMD160 25215a45e8c97259666252dcfb3ad90c547d632f SHA256 5b2b47453bdcaba6970d3773a2d9882688c3e26e2f6d5a96192977c8b3cd5569
-DIST mozilla-thunderbird-1.5.0.4-patches-0.1.tar.bz2 33086 RMD160 9b97f3844cdc82f0488a5ee7e1ed6d28cfd0eeca SHA1 c8206bd45df2ca28d559310db096327749690bce SHA256 3120bfd43d5960a5be9f2be9e59d082d8397620a7c11a335a7a2faaecf068a2c
+DIST mozilla-thunderbird-1.5.0.4-patches-0.2.tar.bz2 30684 RMD160 82a4da8cf5dad04c1bedc9425d31f33a8eedf31f SHA1 2fa562bbd2ad69a56af57e02e85c2bc697c29ec6 SHA256 6f707b64a4e1ca1b36287f45f018cb70b6e04d7e0580cba7805b403ae1092f93
 DIST thunderbird-1.0.7-source.tar.bz2 33385665 RMD160 4f040dfe2468ee33d69ccffe3abc31eccc59899e SHA256 6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f
 DIST thunderbird-1.5.0.4-source.tar.bz2 35872600 RMD160 27e88578d8857e48b46ee4dff2900f27b8a0f447 SHA1 492dd76460fc14543a70349263b64b0a2803bee9 SHA256 b665c89bfc18a84c57d85370889973cfc547e1e942aba5798321ea34e4ddbca7
 EBUILD mozilla-thunderbird-1.0.7.ebuild 5632 RMD160 8bd50c2ff4f286eb3d8712bfe438ec9c9ef17864 SHA1 c907a58139164d0dee1586bfc6f44c5ef7ec3295 SHA256 72668acde3d6f126b387f99b6ec45e23721618b4d1cd96dc728165d2f9a288c0
 MD5 55697b53bd932c2ea9c20d3d5e3b771e mozilla-thunderbird-1.0.7.ebuild 5632
 RMD160 8bd50c2ff4f286eb3d8712bfe438ec9c9ef17864 mozilla-thunderbird-1.0.7.ebuild 5632
 SHA256 72668acde3d6f126b387f99b6ec45e23721618b4d1cd96dc728165d2f9a288c0 mozilla-thunderbird-1.0.7.ebuild 5632
-EBUILD mozilla-thunderbird-1.5.0.4.ebuild 5838 RMD160 5b26058750669c2ae200d77ab3923a0d115daa28 SHA1 0a457bd19cdb4ba28a2a80cfd63d12f23f1ebe08 SHA256 a0f9f8b3a3f6538adefcd6448e467426449b4e389aac578a3b84e05860477f04
-MD5 c63d9ea388a9c97de13c6d69fd55f323 mozilla-thunderbird-1.5.0.4.ebuild 5838
-RMD160 5b26058750669c2ae200d77ab3923a0d115daa28 mozilla-thunderbird-1.5.0.4.ebuild 5838
-SHA256 a0f9f8b3a3f6538adefcd6448e467426449b4e389aac578a3b84e05860477f04 mozilla-thunderbird-1.5.0.4.ebuild 5838
-MISC ChangeLog 18955 RMD160 4c93bf93a5b4e270f2a1115586492280659e7b34 SHA1 8a518feaae7f1876b0d27dbb11088b71e9f7ec96 SHA256 480cf51e45d9f50c2a6f599628d86e011819e48d6d8cb204dae17b1b33a9cc4a
-MD5 753ced97ab8cf8e153d9607ec4479e23 ChangeLog 18955
-RMD160 4c93bf93a5b4e270f2a1115586492280659e7b34 ChangeLog 18955
-SHA256 480cf51e45d9f50c2a6f599628d86e011819e48d6d8cb204dae17b1b33a9cc4a ChangeLog 18955
+EBUILD mozilla-thunderbird-1.5.0.4.ebuild 5673 RMD160 73293c8de63cd0cf922a8aa22846c9c7ffb63294 SHA1 3493173e9a81acfa70a6b5583e6dc9af209a6b24 SHA256 f1e5e9932a196388c3da645231f39b678088c58c0d0ac84cd1f6773f9f8c8812
+MD5 8991d4e0a0796d86621d466a7240ffe8 mozilla-thunderbird-1.5.0.4.ebuild 5673
+RMD160 73293c8de63cd0cf922a8aa22846c9c7ffb63294 mozilla-thunderbird-1.5.0.4.ebuild 5673
+SHA256 f1e5e9932a196388c3da645231f39b678088c58c0d0ac84cd1f6773f9f8c8812 mozilla-thunderbird-1.5.0.4.ebuild 5673
+MISC ChangeLog 19428 RMD160 fa949b054aea741e8cb47e5f17ecd5e70d91b8df SHA1 df853ce9590d99abe3d020f1839a7243f7d927b9 SHA256 cc11dd3b59c697e41e264576f271562825b5ef0f1aa48ba9b5d66e8ff7421eb9
+MD5 32e78de393d64b964863852b7d14e9d3 ChangeLog 19428
+RMD160 fa949b054aea741e8cb47e5f17ecd5e70d91b8df ChangeLog 19428
+SHA256 cc11dd3b59c697e41e264576f271562825b5ef0f1aa48ba9b5d66e8ff7421eb9 ChangeLog 19428
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -94,13 +91,6 @@ SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata
 MD5 56fbb889c56c6882123dbb546dd6dd49 files/digest-mozilla-thunderbird-1.0.7 1093
 RMD160 e17fac29791c7681f5242fba554af205ed605aad files/digest-mozilla-thunderbird-1.0.7 1093
 SHA256 92e7f2e3654ca7df333c04e2e5adb9577746008bc13502f4eef6f4b47d2941fa files/digest-mozilla-thunderbird-1.0.7 1093
-MD5 6440010a598af488eaa541c614ce5bf3 files/digest-mozilla-thunderbird-1.5.0.4 608
-RMD160 5ed57d893dddc84d4191c8c0c104ca182d96459c files/digest-mozilla-thunderbird-1.5.0.4 608
-SHA256 48c008994d82d1d4e0d9989be8dcb540777146738599f3180c55dd398cbe4182 files/digest-mozilla-thunderbird-1.5.0.4 608
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEv+coAiZjviIA2XgRAjUgAJ9NfVZimLfW5p3DtfxqLhJ5m4g+EwCgqbnP
-nFvFNHVDBDpmzLyTID5+49c=
-=sawV
------END PGP SIGNATURE-----
+MD5 8529c30c10be147c2f1d7689b9554a58 files/digest-mozilla-thunderbird-1.5.0.4 608
+RMD160 83746cd207a110a6685835d0a2ecb54060712a5a files/digest-mozilla-thunderbird-1.5.0.4 608
+SHA256 840f839bd1d811ac0d414187866e5f4d0e579aa91c5e1e001dafcf6effae6ea0 files/digest-mozilla-thunderbird-1.5.0.4 608
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5.0.4 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5.0.4
index d27377e1b797..bae92b36e50d 100644
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5.0.4
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5.0.4
@@ -1,6 +1,6 @@
-MD5 de966648efd10ee705453bad81f557fc mozilla-thunderbird-1.5.0.4-patches-0.1.tar.bz2 33086
-RMD160 9b97f3844cdc82f0488a5ee7e1ed6d28cfd0eeca mozilla-thunderbird-1.5.0.4-patches-0.1.tar.bz2 33086
-SHA256 3120bfd43d5960a5be9f2be9e59d082d8397620a7c11a335a7a2faaecf068a2c mozilla-thunderbird-1.5.0.4-patches-0.1.tar.bz2 33086
+MD5 1a7192b65d270b4249558a1f32f191bf mozilla-thunderbird-1.5.0.4-patches-0.2.tar.bz2 30684
+RMD160 82a4da8cf5dad04c1bedc9425d31f33a8eedf31f mozilla-thunderbird-1.5.0.4-patches-0.2.tar.bz2 30684
+SHA256 6f707b64a4e1ca1b36287f45f018cb70b6e04d7e0580cba7805b403ae1092f93 mozilla-thunderbird-1.5.0.4-patches-0.2.tar.bz2 30684
 MD5 ada9c163f5b26fe81958e7a85340811e thunderbird-1.5.0.4-source.tar.bz2 35872600
 RMD160 27e88578d8857e48b46ee4dff2900f27b8a0f447 thunderbird-1.5.0.4-source.tar.bz2 35872600
 SHA256 b665c89bfc18a84c57d85370889973cfc547e1e942aba5798321ea34e4ddbca7 thunderbird-1.5.0.4-source.tar.bz2 35872600
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.4.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.4.ebuild
index 18b4d240c102..12cd336a6eb7 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.4.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.4.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.4.ebuild,v 1.7 2006/07/20 20:27:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.4.ebuild,v 1.8 2006/07/26 05:07:02 kumba Exp $
 
 unset ALLOWED_FLAGS	 # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools
 
-PVER="0.1"
+PVER="0.2"
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2
-	http://dev.gentoo.org/~anarchy/dist/${P}-patches-${PVER}.tar.bz2"
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
 
-KEYWORDS="amd64 ~ia64 ppc sparc x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86 ~mips"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 IUSE="ldap crypt"
@@ -35,16 +34,13 @@ export MOZILLA_OFFICIAL=1
 export MOZ_CO_PROJECT=mail
 
 src_unpack() {
-	declare x
-
-	for x in ${A}; do
-		[[ $x == *.tar.* ]] || continue
-		unpack $x || die "unpack failed"
-	done
+	unpack ${A}
 	cd ${S} || die "cd failed"
 
 	# Apply our patches
-	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.
@@ -121,11 +117,12 @@ pkg_preinst() {
 	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
 
 	echo ""
-	einfo "We are removing old install before we continue. This is to help"
-	einfo "eliminate any problems during the install, sorry for those of you"
-	einfo "who disagree with this but this will ensure a sane build for everyone"
-	einfo "Comments and suggestion should be addressed to mozilla@gentoo.org"
+	einfo "Removing old installs though some really ugly code.  It potentially"
+	einfo "eliminates any problems during the install, however suggestions to"
+	einfo "replace this are highly welcome.  Send comments and suggestions to"
+	einfo "mozilla@gentoo.org"
 	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+	echo ""
 }
 
 src_install() {