- Fix bug 54100: export MOZ_THUNDERBIRD=1 at the top level instead of in pkg_setup so that thunderbird will build. - Fix bug 53092: Update 0.6 to -r2 to backport makemake from 0.7 ebuild. Also use mozilla-launcher eclass for compatibility with the -bin-0.7 release. - 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.

6 files changed, 357 insertions, 13 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index c0f8f14ec0cf..19fc20f9d700 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-mail/mozilla-thunderbird
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.8 2004/06/17 03:01:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.9 2004/06/17 23:25:21 agriffis Exp $
+
+*mozilla-thunderbird-0.6-r2 (17 Jun 2004)
+
+  17 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-thunderbird-0.6-r2.ebuild, mozilla-thunderbird-0.7.ebuild:
+  - Fix bug 54100: export MOZ_THUNDERBIRD=1 at the top level instead
+    of in pkg_setup so that thunderbird will build.
+  - Fix bug 53092: Update 0.6 to -r2 to backport makemake from 0.7
+    ebuild.  Also use mozilla-launcher eclass for compatibility with the
+    -bin-0.7 release.
+  - 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-thunderbird-0.7 (16 Jun 2004)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index d8f356d6d6cd..9f3dc4d2f31d 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,19 +1,21 @@
+MD5 d4e071db4b4e0650576aba13b96a6dd4 mozilla-thunderbird-0.6-r2.ebuild 8565
 MD5 72cdf4b68ad1d964be5ba1a52b3a34f2 mozilla-thunderbird-0.5.ebuild 6288
-MD5 06dbe13b8bbdb3fe0a5a46cbcaf18933 mozilla-thunderbird-0.7.ebuild 8955
+MD5 bb1352170de426509f1f49463e1122fc mozilla-thunderbird-0.7.ebuild 9252
 MD5 8df9c881865e6daae60a81ebf5c86515 mozilla-thunderbird-0.6-r1.ebuild 8171
 MD5 fe7e73947f7cb03aced08404acd6cac9 mozilla-thunderbird-0.6.ebuild 7894
 MD5 384de207a85049304ceb08370d1a05fb mozilla-thunderbird-0.5-r1.ebuild 6453
-MD5 82bea9abc2223995543385904706b17b ChangeLog 7098
+MD5 7f25c7cb7cb0b51abc0272d7a2884d00 ChangeLog 7804
 MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-thunderbird-amd64.patch 35052
 MD5 f981a963a4840e1880440f1f77ea54b2 files/digest-mozilla-thunderbird-0.5-r1 205
 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 157a0b64fbfa81bff58ed90c9590ae79 files/digest-mozilla-thunderbird-0.5 205
 MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6 205
-MD5 2d1d2182769c6e8fba7ffe4d2c92ae53 files/digest-mozilla-thunderbird-0.7 205
+MD5 01baaec335e2ea398d435042e5f32f88 files/digest-mozilla-thunderbird-0.7 208
 MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
 MD5 bb431eebb28f85d1c07957846fd3e4d2 files/icon/mozillathunderbird.desktop 148
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6-r2 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6-r2
new file mode 100644
index 000000000000..fb2fb7c743e6
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6-r2
@@ -0,0 +1,3 @@
+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 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.7
index 38c1c0a934fe..1c92ec54a394 100644
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.7
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.7
@@ -1,3 +1,3 @@
 MD5 e2aa59b7d35abdda0b0f7631f1eecf11 thunderbird-0.7-source.tar.bz2 32523616
-MD5 437fa8f2aaeade178760acea20bc62b4 enigmail-0.84.1.tar.gz 309380
+MD5 b8bc2517de376a99b6ad7a9ad96747d2 enigmail-0.84.1-r1.tar.gz 309440
 MD5 e4c79a7bb5ac7428dfef767e835fc770 ipc-1.0.6.tar.gz 116519
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6-r2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6-r2.ebuild
new file mode 100644
index 000000000000..b0e17b0a65ef
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6-r2.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6-r2.ebuild,v 1.1 2004/06/17 23:25:21 agriffis Exp $
+
+IUSE="gnome gtk2 ipv6 ldap crypt xinerama"
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic gcc eutils nsplugins mozilla-launcher
+
+EMVER="0.83.6"
+IPCVER="1.0.5"
+
+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
+	 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 ~ia64"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+
+RDEPEND="virtual/x11
+	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.2.0
+		>=dev-libs/libIDL-0.8.0 )
+	!gtk2? (
+		=x11-libs/gtk+-1.2*
+		>=gnome-base/ORBit-0.5.10-r1 )
+	crypt? ( >=app-crypt/gnupg-1.2.1 )
+	>=net-www/mozilla-launcher-1.7-r1"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-lang/perl"
+
+S=${WORKDIR}/mozilla
+
+# 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
+		for x in ipc enigmail; do
+			mv ${WORKDIR}/${x} ${S}/extensions || die
+			cd ${S}/extensions/${x} || die
+			makemake	# see function above
+		done
+	fi
+}
+
+src_compile() {
+	####################################
+	#
+	# myconf setup
+	#
+	####################################
+
+	local myconf
+
+	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
+	#       tested ok -- azarah
+	if use gtk2; then
+		myconf="${myconf}
+			--enable-toolkit-gtk2 \
+			--enable-default-toolkit=gtk2 \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk"
+	else
+		myconf="${myconf}
+			--enable-toolkit-gtk \
+			--enable-default-toolkit=gtk \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk2"
+	fi
+
+	if ! use debug; then
+		myconf="${myconf} \
+			--disable-dtd-debug \
+			--disable-debug \
+			--disable-tests \
+			--enable-reorder \
+			--enable-strip \
+			--enable-strip-libs"
+#			--enable-cpp-rtti"
+
+		# Currently --enable-elf-dynstr-gc only works for x86 and ppc,
+		# thanks to Jason Wever <weeve@gentoo.org> for the fix.
+		if use x86 || use ppc; then
+			myconf="${myconf} --enable-elf-dynstr-gc"
+		fi
+	fi
+
+	####################################
+	#
+	# CFLAGS setup and ARCH support
+	#
+	####################################
+
+	local enable_optimize
+
+	# Set optimization level based on CFLAGS
+	if is-flag -O0; then
+		enable_optimize=-O0
+	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then
+		# Anything more than this causes segfaults on startup on 64-bit
+		# (bug 33767)
+		enable_optimize=-O1
+		append-flags -fPIC
+	elif is-flag -O1; then
+		enable_optimize=-O1
+	else
+		enable_optimize=-O2
+	fi
+
+	# Now strip optimization from CFLAGS so it doesn't end up in the
+	# compile string
+	filter-flags '-O*'
+
+	# Strip over-aggressive CFLAGS - Mozilla supplies its own
+	# fine-tuned CFLAGS and shouldn't be interfered with..  Do this
+	# AFTER setting optimization above since strip-flags only allows
+	# -O -O1 and -O2
+	strip-flags
+
+	# Who added the following line and why?  It doesn't really hurt
+	# anything, but is it necessary??  (28 Apr 2004 agriffis)
+	append-flags -fforce-addr
+
+	# Additional ARCH support
+	case "${ARCH}" in
+	alpha)
+		# Mozilla won't link with X11 on alpha, for some crazy reason.
+		# set it to link explicitly here.
+		sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \
+			${S}/gfx/src/gtk/Makefile.in
+		;;
+
+	ppc)
+		# Fix to avoid gcc-3.3.x micompilation issues.
+		if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then
+			append-flags -fno-strict-aliasing
+		fi
+		;;
+
+	sparc)
+		# Sparc support ...
+		replace-sparc64-flags
+		;;
+
+	x86)
+		if [[ $(gcc-major-version) -eq 3 ]]; then
+			# gcc-3 prior to 3.2.3 doesn't work well for pentium4
+			# see bug 25332
+			if [[ $(gcc-minor-version) -lt 2 ||
+				( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]]
+			then
+				replace-flags -march=pentium4 -march=pentium3
+				filter-flags -msse2
+			fi
+			# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+			myconf="${myconf} --enable-old-abi-compat-wrappers"
+		fi
+		;;
+	esac
+
+	# Needed to build without warnings on gcc-3
+	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
+
+	####################################
+	#
+	#  Configure and build Thunderbird
+	#
+	####################################
+
+	cd ${S}
+	einfo "Configuring Thunderbird..."
+	econf \
+		--with-x \
+		--with-system-jpeg \
+		--with-system-mng \
+		--with-system-png \
+		--with-system-zlib \
+		--enable-xft \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		--disable-calendar \
+		$(use_enable xinerama) \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-extensions=wallet,spellcheck \
+		--enable-optimize="${enable_optimize}" \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-pthreads \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-logging \
+		--enable-xterm-updates \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg \
+		${myconf} || die
+
+	emake MOZ_THUNDERBIRD=1 || die
+
+	# Build the enigmail plugin
+	if use crypt; then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc || die "cd ipc failed"
+		make || die "make ipc failed"
+
+		cd ${S}/extensions/enigmail || die "cd enigmail failed"
+		make || die "make enigmail failed"
+	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
+
+	# 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
+		insinto /usr/share/gnome/apps/Internet
+		doins ${FILESDIR}/icon/mozillathunderbird.desktop
+	fi
+}
+
+pkg_preinst() {
+	# Remove entire installed instance to solve various
+	# problems, for example see bug 27719
+	rm -rf ${ROOT}/usr/lib/MozillaThunderbird
+}
+
+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 {} \; || :
+
+	# 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
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.ebuild
index e8e56d1b2f01..bc1e03615dbc 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.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/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.ebuild,v 1.1 2004/06/17 03:01:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.ebuild,v 1.2 2004/06/17 23:25:21 agriffis Exp $
 
 IUSE="gnome gtk2 ipv6 ldap crypt xinerama"
 
@@ -13,8 +13,12 @@ IPCVER="1.0.6"
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
 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
+	 crypt? ( mirror://gentoo/enigmail-${EMVER}-r1.tar.gz
 	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.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"
@@ -45,11 +49,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/mozilla
 
-pkg_setup() {
-	# needed by src_compile() and src_install()
-	export MOZ_THUNDERBIRD=1
-	export MOZ_ENABLE_XFT=1
-}
+# 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() {
@@ -67,7 +71,7 @@ src_unpack() {
 	cd ${S} || die
 
 	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
+	if use crypt; then
 		for x in ipc enigmail; do
 			mv ${WORKDIR}/${x} ${S}/extensions || die
 			cd ${S}/extensions/${x} || die