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.

(Portage version: 2.1.1_pre2-r8)

3 files changed, 26 insertions, 20 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/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() {