Update to mozilla-thunderbird 0.5, at last

8 files changed, 59 insertions, 255 deletions

diff --git a/net-mail/mozilla-thunderbird/ChangeLog b/net-mail/mozilla-thunderbird/ChangeLog
index ea4a7b4a5a02..70292984d7bd 100644
--- a/net-mail/mozilla-thunderbird/ChangeLog
+++ b/net-mail/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mozilla-thunderbird
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/ChangeLog,v 1.18 2003/12/25 02:00:40 bazik Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/ChangeLog,v 1.19 2004/02/15 16:12:33 brad Exp $
+
+*mozilla-thunderbird-0.5 (15 Feb 2004)
+
+  15 Feb 2004; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.5.ebuild,
+  files/thunderbird:
+  Bump to version 0.5.
 
   25 Dec 2003; Sven Blumenstein <bazik@gentoo.org>
   mozilla-thunderbird-0.4.ebuild:
diff --git a/net-mail/mozilla-thunderbird/Manifest b/net-mail/mozilla-thunderbird/Manifest
index 68d07a903dae..0b7ecbe9c780 100644
--- a/net-mail/mozilla-thunderbird/Manifest
+++ b/net-mail/mozilla-thunderbird/Manifest
@@ -1,14 +1,13 @@
-MD5 c8e397d15650bbf3e0e82b220e7865f1 mozilla-thunderbird-0.3.ebuild 6011
-MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-thunderbird-amd64.patch 35052
-MD5 beae854b9d4ea6dd5507f36d8ceaf4a6 files/digest-mozilla-thunderbird-0.3-r1 205
+MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
+MD5 149b75bd986e9e61881379c64fb0652c mozilla-thunderbird-0.3-r1.ebuild 6026
+MD5 63bedca71944049de67d31f067e02013 mozilla-thunderbird-0.4.ebuild 6104
+MD5 3bf937f9edc01281564f191409b97ec7 ChangeLog 3770
+MD5 d0313eaf4d4cd9dd1cc330bc1646d0ec mozilla-thunderbird-0.5.ebuild 6279
 MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
+MD5 beae854b9d4ea6dd5507f36d8ceaf4a6 files/digest-mozilla-thunderbird-0.3-r1 205
+MD5 64eb8d1ba171c75896ced1eddd4e42ba files/digest-mozilla-thunderbird-0.4 205
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
+MD5 157a0b64fbfa81bff58ed90c9590ae79 files/digest-mozilla-thunderbird-0.5 205
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-thunderbird-amd64.patch 35052
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
-MD5 eb197ecfcac1795c503ccfeb7d010075 files/digest-mozilla-thunderbird-0.2 210
-MD5 3c9eed139081937f636a51ff6e950852 files/digest-mozilla-thunderbird-0.3 210
-MD5 64eb8d1ba171c75896ced1eddd4e42ba files/digest-mozilla-thunderbird-0.4 205
-MD5 149b75bd986e9e61881379c64fb0652c mozilla-thunderbird-0.3-r1.ebuild 6026
-MD5 d966f170d2b4694e6f5e979bbc8b87bf mozilla-thunderbird-0.2.ebuild 5994
-MD5 63bedca71944049de67d31f067e02013 mozilla-thunderbird-0.4.ebuild 6104
-MD5 66bf87bab7b38f0ae4a03ebe056cc058 ChangeLog 3611
-MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
diff --git a/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.2 b/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.2
deleted file mode 100644
index 156f422d252f..000000000000
--- a/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 424889127818a4db06f06edd62448a4a thunderbird-source-0.2.tar.bz2 30494929
-MD5 b50e80300a73a6e470fb286a24c31130 enigmail-0.81.latest.tar.gz 252121
-MD5 6cd6efb8cea6bb24fde3e02ba7f46676 ipc-1.0.4.tar.gz 134269
diff --git a/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.3 b/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.3
deleted file mode 100644
index 03ff70603241..000000000000
--- a/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63bfc18db94e605a25a222e417d3a69d thunderbird-source-0.3.tar.bz2 30518769
-MD5 b50e80300a73a6e470fb286a24c31130 enigmail-0.81.latest.tar.gz 252121
-MD5 6cd6efb8cea6bb24fde3e02ba7f46676 ipc-1.0.4.tar.gz 134269
diff --git a/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5 b/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5
new file mode 100644
index 000000000000..bdef69336f56
--- /dev/null
+++ b/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5
@@ -0,0 +1,3 @@
+MD5 dbbb30f8e6976fbc716c377182e5a11e thunderbird-0.5-source.tar.bz2 31180197
+MD5 de3f63e322c5dbc50783adf21d3caf00 enigmail-0.83.2.tar.gz 287436
+MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/net-mail/mozilla-thunderbird/files/thunderbird b/net-mail/mozilla-thunderbird/files/thunderbird
new file mode 100644
index 000000000000..fe77f36ced8d
--- /dev/null
+++ b/net-mail/mozilla-thunderbird/files/thunderbird
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This is the Gentoo Thunderbird startup script
+# Additions, suggestions?
+# contact astralstorm <astralstorm@gorzow.mm.pl>
+
+export MOZILLA_FIVE_HOME="/usr/lib/MozillaThunderbird"
+THUNDERBIRD_PATH="/usr/lib/MozillaThunderbird"
+
+# No MozillaFirebird running
+${THUNDERBIRD_PATH}/thunderbird $@
diff --git a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2.ebuild b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2.ebuild
deleted file mode 100644
index c5fccef354b7..000000000000
--- a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2.ebuild,v 1.5 2003/12/08 06:28:34 brad Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins
-
-# Added to get thunderbird to compile on sparc.
-replace-sparc64-flags
-if [ "`use ppc`" -a "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -eq "3" ]
-then
-
-append-flags -fno-strict-aliasing
-
-fi
-
-
-S=${WORKDIR}/mozilla
-
-EMVER="0.81.latest"
-IPCVER="1.0.4"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/thunderbird/releases/0.2/thunderbird-source-0.2.tar.bz2
-	 crypt? ( mirror://gentoo/enigmail-${EMVER}.tar.gz
-	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-SLOT="0"
-LICENSE="MPL-1.1 | NPL-1.1"
-IUSE="gtk2 ipv6 crypt"
-
-RDEPEND="virtual/x11
-	>=dev-libs/libIDL-0.8.0
-	>=gnome-base/ORBit-0.5.10-r1
-	virtual/xft
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.36
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	( gtk2? >=x11-libs/gtk+-2.1.1 :
-		=x11-libs/gtk+-1.2* )
-		crypt? ( >=app-crypt/gnupg-1.2.1 )"
-
-DEPEND="${RDEPEND}
-	virtual/glibc
-	dev-lang/perl"
-
-# needed by src_compile() and src_install()
-export MOZ_THUNDERBIRD=1
-export MOZ_ENABLE_XFT=1
-
-pkg_setup() {
-	einfo "Please unmerge previous installs of Mozilla Thunderbird before"
-	einfo "merging this. Running emerge unmerge mozilla-thunderbird && rm -rf"
-	einfo "/usr/lib/MozillaThunderbird will ensure that all files are"
-	einfo "removed. If you need to do this, please press ctrl-c now and"
-	einfo "resume emerging once you're done."
-	sleep 5
-}
-
-src_unpack() {
-
-	unpack thunderbird-source-0.2.tar.bz2
-
-	# Unpack the enigmail plugin
-	if use crypt
-		then
-			unpack ipc-${IPCVER}.tar.gz
-			unpack enigmail-${EMVER}.tar.gz
-
-			mv -f ${WORKDIR}/ipc ${S}/extensions/
-			mv -f ${WORKDIR}/enigmail ${S}/extensions/
-			cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
-			cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
-	fi
-
-}
-
-src_compile() {
-	local myconf="--with-x \
-		--with-system-jpeg \
-		--with-system-zlib \
-		--with-system-png \
-		--with-system-mng \
-		--disable-calendar \
-		--enable-xft \
-		--disable-pedantic \
-		--disable-svg \
-		--enable-mathml \
-		--without-system-nspr \
-		--enable-nspr-autoconf \
-		--enable-xsl \
-		--enable-crypto \
-		--enable-xinerama=no \
-		--with-pthreads \
-		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
-		--with-user-appdir=.thunderbird \
-		--disable-jsd \
-		--disable-accessibility \
-		--disable-profilesharing \
-		--disable-necko-disk-cache \
-		--disable-activex-scripting \
-		--disable-installer \
-		--disable-activex \
-		--disable-tests \
-		--disable-debug \
-		--disable-dtd-debug \
-		--disable-logging \
-		--enable-reorder \
-		--enable-optimize="-O2" \
-		--enable-strip \
-		--enable-strip-libs \
-		--enable-cpp-rtti \
-		--enable-xterm-updates \
-		--disable-toolkit-qt \
-		--disable-toolkit-xlib \
-		--enable-extensions=wallet \
-		--enable-necko-protocols=http,file,jar,viewsource,res,data \
-		--enable-image-decoders=png,gif,jpeg"
-
-	if [ -n "`use gtk2`" ] ; then
-		myconf="${myconf} --enable-toolkit-gtk2 \
-							--enable-default-toolkit=gtk2 \
-							--disable-toolkit-gtk"
-	else
-		myconf="${myconf} --enable-toolkit-gtk \
-							--enable-default-toolkit=gtk \
-							--disable-toolkit-gtk2"
-	fi
-
-	if [ -n "`use ipv6`" ] ; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	# Crashes on start when compiled with -fomit-frame-pointer
-	filter-flags -fomit-frame-pointer
-	filter-flags -ffast-math
-	append-flags -s -fforce-addr
-
-	if [ "$(gcc-major-version)" -eq "3" ]; then
-		# Currently gcc-3.2 or older do not work well if we specify "-march"
-		# and other optimizations for pentium4.
-		if [ "$(gcc-minor-version)" -lt "3" ]; then
-			replace-flags -march=pentium4 -march=pentium3
-			filter-flags -msse2
-		fi
-
-	fi
-
-	econf ${myconf} || die
-
-	edit_makefiles
-	emake MOZ_THUNDERBIRD=1 || die
-
-	# Build the enigmail plugin
-	if use crypt
-	then
-		einfo "Building Enigmail plugin..."
-		cd ${S}/extensions/ipc
-		make || die
-
-		cd ${S}/extensions/enigmail
-		make || die
-	fi
-}
-
-src_install() {
-	dodir /usr/lib
-	dodir /usr/lib/MozillaThunderbird
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
-
-	#fix permissions
-	chown -R root:root ${D}/usr/lib/MozillaThunderbird
-
-	dobin ${FILESDIR}/MozillaThunderbird
-
-	# Install icon and .desktop for menu entry
-	if [ "`use gnome`" ]
-	then
-		insinto /usr/share/pixmaps
-		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
-
-		# Fix comment of menu entry
-		cd ${S}/build/package/rpm/SOURCES
-		cp mozilla.desktop mozillathunderbird.desktop
-		perl -pi -e 's:Name=Mozilla:Name=Mozilla Thunderbird:' mozillathunderbird.desktop
-		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Thunderbird Mail Client:' mozillathunderbird.desktop
-		perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/MozillaThunderbird:' mozillathunderbird.desktop
-		cd ${S}
-		insinto /usr/share/gnome/apps/Internet
-		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
-	fi
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-	# Register Components and Chrome
-	einfo "Registering Components and Chrome..."
-	LD_LIBRARY_PATH=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
-	LD_LIBRARY_PATH=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regchrome
-	# Fix permissions of component registry
-	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
-	# Fix directory permissions
-	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
-	# Fix permissions on chrome files
-	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
-}
diff --git a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.3.ebuild b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild
index 95685698930c..81ef43aab84f 100644
--- a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.3.ebuild
+++ b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.3.ebuild,v 1.4 2003/12/22 21:48:07 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild,v 1.1 2004/02/15 16:12:33 brad Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins
 
@@ -16,16 +16,16 @@ fi
 
 S=${WORKDIR}/mozilla
 
-EMVER="0.81.latest"
-IPCVER="1.0.4"
+EMVER="0.83.2"
+IPCVER="1.0.5"
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/thunderbird/releases/${PV}/thunderbird-source-${PV}.tar.bz2
+SRC_URI="mirror://gentoo/thunderbird-${PV}-source.tar.bz2
 	 crypt? ( mirror://gentoo/enigmail-${EMVER}.tar.gz
 	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
 
-KEYWORDS="~x86 ~ppc sparc ~alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 SLOT="0"
 LICENSE="MPL-1.1 | NPL-1.1"
 IUSE="gtk2 ipv6 crypt"
@@ -54,18 +54,18 @@ DEPEND="${RDEPEND}
 export MOZ_THUNDERBIRD=1
 export MOZ_ENABLE_XFT=1
 
-pkg_setup() {
-	einfo "Please unmerge previous installs of Mozilla Thunderbird before"
-	einfo "merging this. Running emerge unmerge mozilla-thunderbird && rm -rf"
-	einfo "/usr/lib/MozillaThunderbird will ensure that all files are"
-	einfo "removed. If you need to do this, please press ctrl-c now and"
-	einfo "resume emerging once you're done."
-	sleep 5
-}
+#pkg_setup() {
+#	einfo "Please unmerge previous installs of Mozilla Thunderbird before"
+#	einfo "merging this. Running emerge unmerge mozilla-thunderbird && rm -rf"
+#	einfo "/usr/lib/MozillaThunderbird will ensure that all files are"
+#	einfo "removed. If you need to do this, please press ctrl-c now and"
+#	einfo "resume emerging once you're done."
+#	sleep 5
+#}
 
 src_unpack() {
 
-	unpack thunderbird-source-${PV}.tar.bz2
+	unpack thunderbird-${PV}-source.tar.bz2
 
 	# Unpack the enigmail plugin
 	if use crypt
@@ -79,6 +79,7 @@ src_unpack() {
 			cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
 	fi
 
+	use amd64 && epatch ${FILESDIR}/mozilla-thunderbird-amd64.patch
 }
 
 src_compile() {
@@ -138,7 +139,7 @@ src_compile() {
 	fi
 
 	# Crashes on start when compiled with -fomit-frame-pointer
-	filter-flags -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
 	filter-flags -ffast-math
 	append-flags -s -fforce-addr
 
@@ -177,7 +178,7 @@ src_install() {
 	#fix permissions
 	chown -R root:root ${D}/usr/lib/MozillaThunderbird
 
-	dobin ${FILESDIR}/MozillaThunderbird
+	dobin ${FILESDIR}/thunderbird
 
 	# Install icon and .desktop for menu entry
 	if [ "`use gnome`" ]
@@ -190,7 +191,7 @@ src_install() {
 		cp mozilla.desktop mozillathunderbird.desktop
 		perl -pi -e 's:Name=Mozilla:Name=Mozilla Thunderbird:' mozillathunderbird.desktop
 		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Thunderbird Mail Client:' mozillathunderbird.desktop
-		perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/MozillaThunderbird:' mozillathunderbird.desktop
+		perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/thunderbird:' mozillathunderbird.desktop
 		cd ${S}
 		insinto /usr/share/gnome/apps/Internet
 		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
@@ -200,17 +201,23 @@ src_install() {
 pkg_postinst() {
 	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
 
+	# Fix permissions on misc files
+	find ${MOZILLA_FIVE_HOME}/ -perm 0700 -exec chmod 0755 {} \; || :
+
 	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register Components and Chrome
 	einfo "Registering Components and Chrome..."
-	LD_LIBRARY_PATH=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
-	LD_LIBRARY_PATH=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regchrome
+	LD_LIBRARY_PATH=${ROOT}/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
+	LD_LIBRARY_PATH=${ROOT}/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regchrome
 	# Fix permissions of component registry
 	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
 	# Fix directory permissions
 	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
 	# Fix permissions on chrome files
 	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
+
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply 'thunderbird'."
 }