Recent mozilla-thunderbird ebuilds were inadvertently based on my

experimental pmasked 1.0.2-r10, which included calling mozilla-launcher
-register, which was not ready for production. The result was that
thunderbird would be installed to /usr/lib/thunderbird and some stuff would
be moved to /var. This commit bumps the rev to -r1, which moves thunderbird
to /usr/lib/mozilla-thunderbird, requires the latest mozilla-launcher which
handles registration correctly, and doesn't put anything in /var
(Portage version: 2.0.51.22-r2)

7 files changed, 47 insertions, 170 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index f41f6c495f29..50ae677af478 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.73 2005/07/20 03:57:59 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.74 2005/07/21 15:30:57 agriffis Exp $
+
+*mozilla-thunderbird-1.0.6-r1 (21 Jul 2005)
+
+  21 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-thunderbird-1.0.2-r10.ebuild, -mozilla-thunderbird-1.0.6.ebuild,
+  +mozilla-thunderbird-1.0.6-r1.ebuild:
+  Recent mozilla-thunderbird ebuilds were inadvertently based on my
+  experimental pmasked 1.0.2-r10, which included calling mozilla-launcher
+  -register, which was not ready for production. The result was that
+  thunderbird would be installed to /usr/lib/thunderbird and some stuff would
+  be moved to /var. This commit bumps the rev to -r1, which moves thunderbird
+  to /usr/lib/mozilla-thunderbird, requires the latest mozilla-launcher which
+  handles registration correctly, and doesn't put anything in /var
 
 *mozilla-thunderbird-1.0.6 (20 Jul 2005)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 3c93fbef41da..d421ed2e8cb2 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,16 +1,14 @@
+MD5 d26ec0c78b836d1aa484fc4cc4d71152 mozilla-thunderbird-1.0.5-r1.ebuild 4270
+MD5 ea0f38433a6bf55556b77e719de82178 mozilla-thunderbird-1.0.5.ebuild 4208
 MD5 1b23dafb9b910959f5a70fc0f8877f8d ChangeLog 9169
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 988cdabe4b288a0ace4b12d1815b667e mozilla-thunderbird-1.0.2-r10.ebuild 3964
-MD5 ea0f38433a6bf55556b77e719de82178 mozilla-thunderbird-1.0.5.ebuild 4208
-MD5 d26ec0c78b836d1aa484fc4cc4d71152 mozilla-thunderbird-1.0.5-r1.ebuild 4270
-MD5 8cd927d3418018c20c689e8c1d2a143d mozilla-thunderbird-1.0.6.ebuild 4267
-MD5 99df508a69b6283098fcf48cc2dd2456 files/digest-mozilla-thunderbird-1.0.2-r10 79
-MD5 a7504ac2a67cca6f3732cdaa3fd17711 files/digest-mozilla-thunderbird-1.0.5 79
+MD5 69dad227a410881c51e75af4cefeeb6c mozilla-thunderbird-1.0.6-r1.ebuild 4435
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-thunderbird-0.9-4ft2.patch 22360
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818
-MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
 MD5 a7504ac2a67cca6f3732cdaa3fd17711 files/digest-mozilla-thunderbird-1.0.5-r1 79
-MD5 0fddca71336af76c879a9c3901dfb696 files/digest-mozilla-thunderbird-1.0.6 79
-MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
+MD5 a3e105f581342bc2ad6e81463ce2989c files/digest-mozilla-thunderbird-1.0.6-r1 227
+MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
+MD5 a7504ac2a67cca6f3732cdaa3fd17711 files/digest-mozilla-thunderbird-1.0.5 79
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
+MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2-r10 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2-r10
deleted file mode 100644
index 9f09bd532176..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2-r10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e5b8a3edb3ced400e769dc2faa45317 thunderbird-1.0.2-source.tar.bz2 33354397
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6
deleted file mode 100644
index acce6294ac3a..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0ddcc8bd5ee2c9be724b6963ad27111 thunderbird-1.0.6-source.tar.bz2 33366077
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r1
new file mode 100644
index 000000000000..9f4daad3fbaa
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r1
@@ -0,0 +1,3 @@
+MD5 a0ddcc8bd5ee2c9be724b6963ad27111 thunderbird-1.0.6-source.tar.bz2 33366077
+MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
+MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r10.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r10.ebuild
deleted file mode 100644
index 5ec1e24f028e..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r10.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2005 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.0.2-r10.ebuild,v 1.3 2005/07/06 18:56:17 agriffis Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozconfig mozilla-launcher makeedit multilib
-
-EMVER="0.92.0"
-IPCVER="1.1.3"
-
-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"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="ldap"
-
-RDEPEND=">=www-client/mozilla-launcher-1.34"
-
-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 BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export MOZ_THUNDERBIRD=1
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/mozilla-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${FILESDIR}/mozilla-thunderbird-0.9-4ft2.patch
-
-	# GCC 4 compile patch ; bug #87800
-	epatch ${FILESDIR}/${P}-gcc4.patch
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# tb-specific settings
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_annotate '' \
-		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
-		--with-user-appdir=.thunderbird
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# thunderbird
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build Thunderbird
-	#
-	####################################
-
-	econf || die "econf failed"
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Chromes will live in /var, registered in pkg_postinst
-	keepdir ${MOZILLA_FIVE_HOME/usr/var}
-
-	# Create /usr/bin/thunderbird
-	install_mozilla_launcher_stub thunderbird $MOZILLA_FIVE_HOME
-
-	# Install icon and .desktop for menu entry
-	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
-}
-
-pkg_preinst() {
-	# Remove entire installed instance to solve various
-	# problems, for example see bug 27719
-	rm -rf ${ROOT}/usr/$(get_libdir)/thunderbird
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/thunderbird"
-
-	# Update the component registry
-	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=thunderbird \
-		/usr/libexec/mozilla-launcher -register
-
-	# 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
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r1.ebuild
index e77ec2d9ec4e..fdcccb72638f 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r1.ebuild
@@ -1,20 +1,22 @@
 # Copyright 1999-2005 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.0.6.ebuild,v 1.1 2005/07/20 03:57:59 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r1.ebuild,v 1.1 2005/07/21 15:30:57 agriffis Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils nsplugins mozconfig mozilla-launcher makeedit multilib
 
 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"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
+	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
+	mirror://gentoo/mozilla-jslibmath-alpha.patch"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 IUSE="mozcalendar ldap"
 
-RDEPEND=">=www-client/mozilla-launcher-1.35"
+RDEPEND=">=www-client/mozilla-launcher-1.39"
 
 S=${WORKDIR}/mozilla
 
@@ -26,7 +28,7 @@ export MOZILLA_OFFICIAL=1
 export MOZ_THUNDERBIRD=1
 
 src_unpack() {
-	unpack ${A} || die "unpack failed"
+	unpack thunderbird-${PV}-source.tar.bz2 || die "unpack failed"
 	cd ${S} || die "cd failed"
 
 	if [[ $(gcc-major-version) -eq 3 ]]; then
@@ -36,17 +38,20 @@ src_unpack() {
 		fi
 	fi
 
+	# patch to fix math operations on alpha, makes maps.google.com work!
+	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
+
 	# patch out ft caching code since the API changed between releases of
 	# freetype; this enables freetype-2.1.8+ compat.
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${FILESDIR}/mozilla-thunderbird-0.9-4ft2.patch
+	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
 
 	# GCC 4 compile patch ; bug #87800
 	epatch ${FILESDIR}/${PN}-1.0.2-gcc4.patch
 }
 
 src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/mozilla-thunderbird
 
 	####################################
 	#
@@ -57,46 +62,42 @@ src_compile() {
 	mozconfig_init
 
 	# tb-specific settings
-	mozconfig_use_enable mozcalendar calendar
 	mozconfig_use_enable ldap
 	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_annotate '' \
-		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
-		--with-user-appdir=.thunderbird
+	mozconfig_use_enable mozcalendar calendar
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
 
 	# Finalize and report settings
 	mozconfig_final
 
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# thunderbird
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
 	has_hardened && append-flags -fno-stack-protector-all
 	replace-flags -fstack-protector-all -fstack-protector
 
 	####################################
 	#
-	#  Configure and build Thunderbird
+	#  Configure and build
 	#
 	####################################
 
-	econf || die "econf failed"
+	LD="$(tc-getLD)" CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+	econf || die
 
 	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
 	# requirements while compiling
 	edit_makefiles
 
-	emake || die "emake failed"
+	emake || die
 }
 
 src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/mozilla-thunderbird
 
 	# Most of the installation happens here
 	dodir ${MOZILLA_FIVE_HOME}
 	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
 
-	# Chromes will live in /var, registered in pkg_postinst
-	keepdir ${MOZILLA_FIVE_HOME/usr/var}
-
 	# Create /usr/bin/thunderbird
 	install_mozilla_launcher_stub thunderbird $MOZILLA_FIVE_HOME
 
@@ -113,11 +114,11 @@ src_install() {
 pkg_preinst() {
 	# Remove entire installed instance to solve various
 	# problems, for example see bug 27719
-	rm -rf ${ROOT}/usr/$(get_libdir)/thunderbird
+	rm -rf ${ROOT}/usr/$(get_libdir)/mozilla-thunderbird
 }
 
 pkg_postinst() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/thunderbird"
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
 
 	# Update the component registry
 	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=thunderbird \