Update to enigmail-0.85 for thunderbird-0.7.1; older versions of enigmail don't work #56814 #57250

9 files changed, 86 insertions, 504 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index e55bb4d31b07..80be5b00c7f5 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.18 2004/07/29 18:20:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.19 2004/08/03 13:26:27 agriffis Exp $
+
+*mozilla-thunderbird-0.7.1-r1 (03 Aug 2004)
+
+  03 Aug 2004; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-thunderbird-0.5-r1.ebuild, -mozilla-thunderbird-0.5.ebuild,
+  -mozilla-thunderbird-0.6.ebuild, +mozilla-thunderbird-0.7.1-r1.ebuild:
+  Update to enigmail-0.85 for thunderbird-0.7.1; older versions of enigmail
+  don't work #56814 #57250
 
   29 Jul 2004; Aron Griffis <agriffis@gentoo.org>
   mozilla-thunderbird-0.7.1.ebuild:
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 5c6e4dba9647..c1a9ab467b47 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,25 +1,21 @@
-MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
-MD5 cf2e0158ce7d242f2920d849ba17ac23 mozilla-thunderbird-0.5-r1.ebuild 6450
-MD5 c0b048d0e97adf8a98d2bc92f1d12be7 mozilla-thunderbird-0.5.ebuild 6281
-MD5 7bb30b61e2e9161924ef4716efaa9ccf mozilla-thunderbird-0.6-r1.ebuild 8173
-MD5 99ad4c4b51c09d9cf63a79b908fc0fdb mozilla-thunderbird-0.6.ebuild 7896
-MD5 0c306f55804cc4922b77c9012c691818 mozilla-thunderbird-0.7.ebuild 9379
-MD5 38a48c5b590d633452aee131c5872d3e ChangeLog 9466
 MD5 581fe6cf90a85277fa118f7461b82612 mozilla-thunderbird-0.6-r2.ebuild 8561
+MD5 0c306f55804cc4922b77c9012c691818 mozilla-thunderbird-0.7.ebuild 9379
 MD5 1b054041bb468363ea7cab2006758510 mozilla-thunderbird-0.7.1.ebuild 8938
-MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
-MD5 157a0b64fbfa81bff58ed90c9590ae79 files/digest-mozilla-thunderbird-0.5 205
-MD5 f981a963a4840e1880440f1f77ea54b2 files/digest-mozilla-thunderbird-0.5-r1 205
-MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6 205
-MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r1 205
-MD5 01baaec335e2ea398d435042e5f32f88 files/digest-mozilla-thunderbird-0.7 208
-MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
+MD5 7bb30b61e2e9161924ef4716efaa9ccf mozilla-thunderbird-0.6-r1.ebuild 8173
+MD5 658015fd2e271c24a6133a1f4525d22c mozilla-thunderbird-0.7.1-r1.ebuild 8943
+MD5 d1d8a9d497921cf19aa7db2bfe7465a3 ChangeLog 9809
+MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
+MD5 b8e2d94130909e157cb9797c7bad7807 files/digest-mozilla-thunderbird-0.7.1-r1 207
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-thunderbird-amd64.patch 35052
+MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r1 205
+MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r2 205
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
 MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
+MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
+MD5 01baaec335e2ea398d435042e5f32f88 files/digest-mozilla-thunderbird-0.7 208
 MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
-MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r2 205
 MD5 6efbd38338dcc7e43d21b85ae1990422 files/digest-mozilla-thunderbird-0.7.1 207
+MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
+MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
-MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
-MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5
deleted file mode 100644
index bdef69336f56..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-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/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5-r1
deleted file mode 100644
index 75dca779af64..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dbbb30f8e6976fbc716c377182e5a11e thunderbird-0.5-source.tar.bz2 31180197
-MD5 70d1b085d8b2ed7c82b6666fa1d537af enigmail-0.83.3.tar.gz 325747
-MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6
deleted file mode 100644
index fb2fb7c743e6..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1096cea8373f94636a4b2fdeb7c13a4f thunderbird-source-0.6.tar.bz2 32442259
-MD5 fe851d3a95cb32a906a3e6cb6b4b5552 enigmail-0.83.6.tar.gz 281677
-MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.7.1-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.7.1-r1
new file mode 100644
index 000000000000..70dad0dddbd3
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.7.1-r1
@@ -0,0 +1,3 @@
+MD5 e1c2f1a3663d42b4e4d61547aa6a592c thunderbird-0.7.1-source.tar.bz2 33974414
+MD5 7ad587bba6bdb002be2670ac94b09139 enigmail-0.85.0.tar.gz 326337
+MD5 f605ba029ff4c71dcc10c29635c1c79e ipc-1.0.7.tar.gz 104193
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild
deleted file mode 100644
index 25fe98416581..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild,v 1.5 2004/07/01 19:48:57 eradicator Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins eutils
-
-S=${WORKDIR}/mozilla
-
-EMVER="0.83.3"
-IPCVER="1.0.5"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="mirror://gentoo/thunderbird-${PV}-source.tar.bz2
-	 crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
-	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-SLOT="0"
-LICENSE="MPL-1.1 | NPL-1.1"
-IUSE="gnome gtk2 ipv6 crypt xinerama"
-
-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 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )"
-
-DEPEND="${RDEPEND}
-	virtual/libc
-	dev-util/pkgconfig
-	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-${PV}-source.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
-
-	use amd64 && epatch ${FILESDIR}/mozilla-thunderbird-amd64.patch
-}
-
-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 \
-		--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,spellcheck \
-		--enable-necko-protocols=http,file,jar,viewsource,res,data \
-		--enable-image-decoders=png,gif,jpeg"
-
-	if 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 use ipv6 ; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	# Check for xinerama - closes #19369
-	if use xinerama ; then
-		myconf="${myconf} --enable-xinerama=yes"
-	else
-		myconf="${myconf} --enable-xinerama=no"
-	fi
-
-	# Crashes on start when compiled with -fomit-frame-pointer
-	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
-	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
-
-	# Added to get thunderbird to compile on sparc.
-	replace-sparc64-flags
-
-	if use ppc && [[ $(gcc-major-version) == 3 && $(gcc-minor-version) == 3 ]]
-	then
-		append-flags -fno-strict-aliasing
-	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}/thunderbird
-
-	# 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/thunderbird:' 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"
-
-	# 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=${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'."
-}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild
deleted file mode 100644
index 0e93fe0f8ebe..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild,v 1.6 2004/07/01 19:48:57 eradicator Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins eutils
-
-# Added to get thunderbird to compile on sparc.
-replace-sparc64-flags
-if use ppc && [ "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -eq "3" ]
-then
-
-append-flags -fno-strict-aliasing
-
-fi
-
-
-S=${WORKDIR}/mozilla
-
-EMVER="0.83.2"
-IPCVER="1.0.5"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-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 amd64"
-SLOT="0"
-LICENSE="MPL-1.1 | NPL-1.1"
-IUSE="gnome 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 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )"
-
-DEPEND="${RDEPEND}
-	virtual/libc
-	dev-util/pkgconfig
-	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-${PV}-source.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
-
-	use amd64 && epatch ${FILESDIR}/mozilla-thunderbird-amd64.patch
-}
-
-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,spellcheck \
-		--enable-necko-protocols=http,file,jar,viewsource,res,data \
-		--enable-image-decoders=png,gif,jpeg"
-
-	if 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 use ipv6 ; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	# Crashes on start when compiled with -fomit-frame-pointer
-	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
-	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}/thunderbird
-
-	# 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/thunderbird:' 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"
-
-	# 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=${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'."
-}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.1-r1.ebuild
index 4de0a63d0de5..99cb3434dead 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.1-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6.ebuild,v 1.5 2004/07/14 16:20:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.1-r1.ebuild,v 1.1 2004/08/03 13:26:27 agriffis Exp $
 
-IUSE="crypt debug gnome gtk2 ipv6 ldap xinerama"
+IUSE="crypt debug gtk2 ipv6 ldap xinerama"
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic gcc eutils nsplugins
+inherit flag-o-matic gcc eutils nsplugins mozilla-launcher
 
-EMVER="0.83.6"
-IPCVER="1.0.5"
+EMVER="0.85.0"
+IPCVER="1.0.7"
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thunderbird-source-${PV}.tar.bz2
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thunderbird-${PV}-source.tar.bz2
 	 crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
 	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
 
@@ -36,31 +36,43 @@ RDEPEND="virtual/x11
 	!gtk2? (
 		=x11-libs/gtk+-1.2*
 		>=gnome-base/ORBit-0.5.10-r1 )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )"
+	crypt? ( >=app-crypt/gnupg-1.2.1 )
+	>=net-www/mozilla-launcher-1.7-r1"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-lang/perl"
+	dev-util/pkgconfig"
 
 S=${WORKDIR}/mozilla
 
-# needed by src_compile() and src_install()
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
 export MOZ_THUNDERBIRD=1
 export MOZ_ENABLE_XFT=1
 
+# Simulate the silly csh makemake script
+makemake() {
+	typeset m topdir
+
+	for m in $(find . -name Makefile.in); do
+		topdir=$(echo "$m" | sed -r 's:[^/]+:..:g')
+		sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \
+			< ${m} > ${m%.in} || die "sed ${m} failed"
+	done
+}
+
 src_unpack() {
 	unpack ${A} || die "unpack failed"
 	cd ${S} || die
 
 	# Unpack the enigmail plugin
 	if use crypt; then
-		mv -f ${WORKDIR}/ipc ${S}/extensions/
-		mv -f ${WORKDIR}/enigmail ${S}/extensions/
-		cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
-		cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
+		for x in ipc enigmail; do
+			mv ${WORKDIR}/${x} ${S}/extensions || die
+			cd ${S}/extensions/${x} || die
+			makemake	# see function above
+		done
 	fi
-
-	#use amd64 && epatch ${FILESDIR}/mozilla-thunderbird-amd64.patch
 }
 
 src_compile() {
@@ -248,17 +260,25 @@ src_install() {
 	# fix permissions
 	chown -R root:root ${D}/usr/lib/MozillaThunderbird
 
-	dobin ${FILESDIR}/thunderbird
+	# use mozilla-launcher which supports thunderbird as of version 1.6.
+	# version 1.7-r1 moved the script to /usr/libexec
+	dodir /usr/bin
+	dosym /usr/libexec/mozilla-launcher /usr/bin/thunderbird
 
 	# Install icon and .desktop for menu entry
-	if use gnome; then
-		insinto /usr/share/pixmaps
-		doins ${FILESDIR}/icon/thunderbird-icon.png
-
-		# Fix comment of menu entry
-		insinto /usr/share/gnome/apps/Internet
-		doins ${FILESDIR}/icon/mozillathunderbird.desktop
-	fi
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/thunderbird-icon.png
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillathunderbird.desktop
+
+	# Normally thunderbird-0.7.1 must be run as root once before it can
+	# be run as a normal user.  Drop in some initialized files to
+	# avoid this.
+	einfo "Extracting thunderbird-${PV} initialization files"
+	tar xjpf ${FILESDIR}/thunderbird-0.7-init.tar.bz2 \
+		-C ${D}/usr/lib/MozillaThunderbird
 }
 
 pkg_preinst() {
@@ -276,17 +296,32 @@ pkg_postinst() {
 	# 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=${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 {} \; || :
 
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+
+	einfo
 	einfo "Please note that the binary name has changed from MozillaThunderbird"
-	einfo "to simply 'thunderbird'."
+	einfo "to simply thunderbird"
+	einfo
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
 }